Bug 802946 - Cleanup the 'Hide Apps/Promo' mess [remove the Apps menu and promo] r=blassey a=lsblakk
authorMark Finkle <mfinkle@mozilla.com>
Tue, 23 Oct 2012 01:37:13 -0400
changeset 109639 93ddc0acc7496b88e1bf59686f09cba201e26ddb
parent 109638 af3532b25ba63847610efd41cdefb156d6191e8b
child 109640 053399d34cf82c0866be4f15f4850554cb6f274f
push id1586
push usermfinkle@mozilla.com
push dateTue, 23 Oct 2012 05:37:39 +0000
treeherdermozilla-beta@93ddc0acc749 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersblassey, lsblakk
bugs802946
milestone17.0
Bug 802946 - Cleanup the 'Hide Apps/Promo' mess [remove the Apps menu and promo] r=blassey a=lsblakk
mobile/android/base/AboutHomeContent.java
mobile/android/base/BrowserApp.java
mobile/android/base/resources/menu-large-v11/browser_app_menu.xml.in
mobile/android/base/resources/menu-v11/browser_app_menu.xml.in
mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml.in
mobile/android/base/resources/menu/browser_app_menu.xml.in
--- a/mobile/android/base/AboutHomeContent.java
+++ b/mobile/android/base/AboutHomeContent.java
@@ -135,18 +135,17 @@ public class AboutHomeContent extends Sc
                     Log.e(LOGTAG, "error building JSON arguments");
                 }
     
                 Log.d(LOGTAG, "Sending message to Gecko: " + SystemClock.uptimeMillis() + " - Tab:Add");
                 GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Tab:Add", args.toString()));
             }
         };
 
-        mPrelimPromoBoxType = (new Random()).nextFloat() < 0.5 ? AboutHomePromoBox.Type.SYNC :
-                AboutHomePromoBox.Type.APPS;
+        mPrelimPromoBoxType = AboutHomePromoBox.Type.SYNC;
     }
 
     private void inflate() {
         mInflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         mInflater.inflate(R.layout.abouthome_content, this);
 
         mTopSitesGrid = (GridView)findViewById(R.id.top_sites_grid);
         mTopSitesGrid.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@@ -215,17 +214,17 @@ public class AboutHomeContent extends Sc
     }
 
     private void updateLayout(boolean syncIsSetup) {
         boolean hasTopSites = mTopSitesAdapter.getCount() > 0;
         setTopSitesVisibility(hasTopSites);
 
         AboutHomePromoBox.Type type = mPrelimPromoBoxType;
         if (syncIsSetup && type == AboutHomePromoBox.Type.SYNC)
-            type = AboutHomePromoBox.Type.APPS;
+            type = AboutHomePromoBox.Type.NONE;
 
         mPromoBox.show(type);
     }
 
     private void updateLayoutForSync() {
         final GeckoApp.StartupMode startupMode = mActivity.getStartupMode();
         final boolean syncIsSetup = SyncAccounts.syncAccountsExist(mContext);
 
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -860,19 +860,16 @@ abstract public class BrowserApp extends
                 startActivity(intent);
                 return true;
             case R.id.addons:
                 loadUrlInTab("about:addons");
                 return true;
             case R.id.downloads:
                 loadUrlInTab("about:downloads");
                 return true;
-            case R.id.apps:
-                loadUrlInTab("about:apps");
-                return true;
             case R.id.char_encoding:
                 GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("CharEncoding:Get", null));
                 return true;
             case R.id.find_in_page:
                 mFindInPageBar.show();
                 return true;
             case R.id.desktop_mode:
                 Tab selectedTab = Tabs.getInstance().getSelectedTab();
--- a/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml.in
+++ b/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml.in
@@ -42,19 +42,16 @@
           gecko:checkable="true" />
 
     <item gecko:id="@+id/addons"
           gecko:title="@string/addons"/>
 
     <item gecko:id="@+id/downloads"
           gecko:title="@string/downloads"/>
 
-    <item gecko:id="@+id/apps"
-          gecko:title="@string/apps"/>
-
     <item gecko:id="@+id/char_encoding"
           gecko:visible="false"
           gecko:title="@string/char_encoding"/>
 
     <item gecko:id="@+id/settings"
           gecko:title="@string/settings" />
 
 #ifdef MOZ_PROFILING
--- a/mobile/android/base/resources/menu-v11/browser_app_menu.xml.in
+++ b/mobile/android/base/resources/menu-v11/browser_app_menu.xml.in
@@ -40,19 +40,16 @@
           gecko:checkable="true" />
 
     <item gecko:id="@+id/addons"
           gecko:title="@string/addons"/>
 
     <item gecko:id="@+id/downloads"
           gecko:title="@string/downloads"/>
 
-    <item gecko:id="@+id/apps"
-          gecko:title="@string/apps"/>
-
     <item gecko:id="@+id/char_encoding"
           gecko:visible="false"
           gecko:title="@string/char_encoding"/>
 
     <item gecko:id="@+id/settings"
           gecko:title="@string/settings" />
 
 #ifdef MOZ_PROFILING
--- a/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml.in
+++ b/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml.in
@@ -43,19 +43,16 @@
           gecko:checkable="true" />
 
     <item gecko:id="@+id/addons"
           gecko:title="@string/addons"/>
 
     <item gecko:id="@+id/downloads"
           gecko:title="@string/downloads"/>
 
-    <item gecko:id="@+id/apps"
-          gecko:title="@string/apps"/>
-
     <item gecko:id="@+id/char_encoding"
           gecko:visible="false"
           gecko:title="@string/char_encoding"/>
 
     <item gecko:id="@+id/settings"
           gecko:title="@string/settings" />
 
 #ifdef MOZ_PROFILING
--- a/mobile/android/base/resources/menu/browser_app_menu.xml.in
+++ b/mobile/android/base/resources/menu/browser_app_menu.xml.in
@@ -37,19 +37,16 @@
           android:checkable="true" />
 
     <item android:id="@+id/addons"
           android:title="@string/addons"/>
 
     <item android:id="@+id/downloads"
           android:title="@string/downloads"/>
 
-    <item android:id="@+id/apps"
-          android:title="@string/apps"/>
-
     <item android:id="@+id/char_encoding"
           android:visible="false"
           android:title="@string/char_encoding"/>
 
     <item android:id="@+id/settings"
           android:title="@string/settings" />
 
 #ifdef MOZ_PROFILING