Bug 1095278 - Allow new tablet UI to ride the trains. r=mfinkle, a=sledru
authorRichard Newman <rnewman@mozilla.com>
Mon, 15 Dec 2014 17:13:42 +0000
changeset 242671 aaa8e2cd46e462e417c575691ad70e6df19a34fb
parent 242670 f92070ac5632068579f5e1b96ecb92a49465e1b0
child 242672 ce13de5c49b4388746661950644e202930ee3ed7
push id4311
push userraliiev@mozilla.com
push dateMon, 12 Jan 2015 19:37:41 +0000
treeherdermozilla-beta@150c9fed433b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle, sledru
bugs1095278
milestone36.0a2
Bug 1095278 - Allow new tablet UI to ride the trains. r=mfinkle, a=sledru
mobile/android/base/moz.build
mobile/android/confvars.sh
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -535,16 +535,18 @@ if CONFIG['MOZ_ANDROID_SHARE_OVERLAY']:
         'overlays/ui/ShareDialog.java',
     ]
 
 if (CONFIG['MOZ_ANDROID_MAX_SDK_VERSION']):
     max_sdk_version = int(CONFIG['MOZ_ANDROID_MAX_SDK_VERSION'])
 else:
     max_sdk_version = 999
 
+# Only bother to include new tablet code if we're building for tablet-capable
+# OS releases.
 if CONFIG['MOZ_ANDROID_NEW_TABLET_UI'] and max_sdk_version >= 11:
     gbjar.sources += [
         'tabs/TabStrip.java',
         'tabs/TabStripAdapter.java',
         'tabs/TabStripItemView.java',
         'tabs/TabStripView.java'
     ]
     ANDROID_RES_DIRS += [ SRCDIR + '/newtablet/res' ]
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -68,21 +68,18 @@ if test -z "$MOZ_ANDROID_RESOURCE_CONSTR
 fi
 
 # Mark as WebGL conformant
 MOZ_WEBGL_CONFORMANT=1
 
 # Enable the Search Activity.
 MOZ_ANDROID_SEARCH_ACTIVITY=1
 
-# Enable the new tablet UI in pre-release builds
-# if the max Android sdk is undefined or at least 11.
-if test ! "$RELEASE_BUILD"; then
-  MOZ_ANDROID_NEW_TABLET_UI=1
-fi
+# Use the new tablet UI. This will go away in Bug 1106935.
+MOZ_ANDROID_NEW_TABLET_UI=1
 
 # Enable the share handler.
 MOZ_ANDROID_SHARE_OVERLAY=1
 
 # Enable the Mozilla Location Service stumbler.
 MOZ_ANDROID_MLS_STUMBLER=1
 
 # Enable adding to the system downloads list in pre-release builds.