author Michael Kaply <mozilla@kaply.com>

Mon, 19 Jun 2017 13:12:46 -0500

changeset 596731 333ae1ead975a58d15f7c650d6a4549087c70ad2

parent 595682 58c5151bfd62de934b2286dbd664e69886270e28

child 634055 af5fb70999de8635e83a0618ab47fe30df076a12

push id 64741

push user mozilla@kaply.com

push date Mon, 19 Jun 2017 18:13:19 +0000

reviewers maliu

bugs 1372572

milestone 56.0a1

mobile/android/base/java/org/mozilla/gecko/Tabs.java file | annotate | diff | comparison | revisions

mobile/android/base/resources/drawable-hdpi/home.png file | annotate | diff | comparison | revisions

mobile/android/base/resources/drawable-xhdpi/home.png file | annotate | diff | comparison | revisions

mobile/android/chrome/content/browser.js file | annotate | diff | comparison | revisions

mobile/android/locales/en-US/chrome/browser.properties file | annotate | diff | comparison | revisions
--- a/mobile/android/base/java/org/mozilla/gecko/Tabs.java
+++ b/mobile/android/base/java/org/mozilla/gecko/Tabs.java
@@ -151,16 +151,17 @@ public class Tabs implements BundleEvent
             "Link:Touchicon",
             "Tab:Added",
             "Tab:AudioPlayingChange",
             "Tab:Close",
             "Tab:MediaPlaybackChange",
             "Tab:RecordingChange",
             "Tab:Select",
             "Tab:SetParentId",
+            "Tab:LoadHomepage",
             null);
 
         EventDispatcher.getInstance().registerBackgroundThreadListener(this,
             // BrowserApp already wants this on the background thread.
             "Sanitize:ClearHistory",
             null);
 
         mPrivateClearColor = Color.RED;
@@ -571,16 +572,21 @@ public class Tabs implements BundleEvent
                         tab.handleButtonStateChange(false, false);
                         notifyListeners(tab, TabEvents.LOCATION_CHANGE, tab.getURL());
                     }
                 }
             });
             return;
         }
 
+        if ("Tab:LoadHomepage".equals(event)) {
+            loadUrl(getHomepage(mAppContext), null, INVALID_TAB_ID, null, LOADURL_NONE);
+            return;
+        }
+
         // All other events handled below should contain a tabID property
         final int id = message.getInt("tabID", INVALID_TAB_ID);
         Tab tab = getTab(id);
 
         // "Tab:Added" is a special case because tab will be null if the tab was just added
         if ("Tab:Added".equals(event)) {
             String url = message.getString("uri");
 
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -3782,16 +3782,19 @@ Tab.prototype = {
       return;
 
     this.lastTouchedAt = Date.now();
 
     if (aActive) {
       this.browser.setAttribute("primary", "true");
       this.browser.focus();
       this.browser.docShellIsActive = true;
+      if (AppConstants.MOZ_ANDROID_MOZILLA_ONLINE) {
+        Homepage.updatePageAction();
+      }
       Reader.updatePageAction(this);
       ExternalApps.updatePageAction(this.browser.currentURI, this.browser.contentDocument);
     } else {
       this.browser.removeAttribute("primary");
       this.browser.docShellIsActive = false;
       this.browser.blur();
     }
   },
@@ -6662,16 +6665,44 @@ var ExternalApps = {
     if(!this._pageActionId)
       return;
 
     PageActions.remove(this._pageActionId);
     delete this._pageActionId;
   },
 };
 
+var Homepage = {
+  updatePageAction: function updatePageAction() {
+    // If the pageaction is already added, just return
+    if (this._pageActionId != undefined) {
+      return;
+    }
+    this._pageActionId = PageActions.add({
+      title: Strings.browser.GetStringFromName("home.pageAction"),
+      icon: "drawable://home",
+      important: true,
+
+      clickCallback: () => {
+        let message = {
+          type: "Tab:LoadHomepage"
+        };
+        GlobalEventDispatcher.sendRequest(message);
+      },
+    });
+  },
+  clearPageAction: function clearPageAction() {
+    if(!this._pageActionId)
+      return;
+
+    PageActions.remove(this._pageActionId);
+    delete this._pageActionId;
+  },
+};
+
 var Distribution = {
   // File used to store campaign data
   _file: null,
 
   _preferencesJSON: null,
 
   init: function dc_init() {
     GlobalEventDispatcher.registerListener(this, [
--- a/mobile/android/locales/en-US/chrome/browser.properties
+++ b/mobile/android/locales/en-US/chrome/browser.properties
@@ -432,8 +432,13 @@ feedHandler.subscribeWith=Subscribe with
 # %1$S=name of the api that's deprecated, %2$S=New API to use. This may be a url to
 # a file they should import or the name of an api.
 nativeWindow.deprecated=%1$S is deprecated. Please use %2$S instead
 
 # Vibration API permission prompt
 vibrationRequest.message = Allow this site to vibrate your device?
 vibrationRequest.denyButton = Don't allow
 vibrationRequest.allowButton = Allow
+
+# LOCALIZATION NOTE (home.pageAction):
+# This string is not shown in the UI, but it is read when TalkBack is activated.
+# It is only used in the Mozilla China version of Fennec at this time.
+home.pageAction = Open Homepage
author	Michael Kaply <mozilla@kaply.com>
	Mon, 19 Jun 2017 13:12:46 -0500
changeset 596731	333ae1ead975a58d15f7c650d6a4549087c70ad2
parent 595682	58c5151bfd62de934b2286dbd664e69886270e28
child 634055	af5fb70999de8635e83a0618ab47fe30df076a12
push id	64741
push user	mozilla@kaply.com
push date	Mon, 19 Jun 2017 18:13:19 +0000
reviewers	maliu
bugs	1372572
milestone	56.0a1
mobile/android/base/java/org/mozilla/gecko/Tabs.java		file \| annotate \| diff \| comparison \| revisions
mobile/android/base/resources/drawable-hdpi/home.png		file \| annotate \| diff \| comparison \| revisions
mobile/android/base/resources/drawable-xhdpi/home.png		file \| annotate \| diff \| comparison \| revisions
mobile/android/chrome/content/browser.js		file \| annotate \| diff \| comparison \| revisions
mobile/android/locales/en-US/chrome/browser.properties		file \| annotate \| diff \| comparison \| revisions