Bug 1106935 - Remove MOZ_ANDROID_NEW_TABLET_UI confvar. r=nalexander

This commit is contained in:
Michael Comella 2015-02-03 17:03:45 -08:00
parent dac6dd8301
commit 57f0c61232
2 changed files with 2 additions and 5 deletions

View File

@ -560,7 +560,7 @@ else:
# 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:
if max_sdk_version >= 11:
gbjar.sources += [
'tabs/TabStrip.java',
'tabs/TabStripAdapter.java',
@ -684,7 +684,7 @@ ANDROID_GENERATED_RESFILES += [
for var in ('MOZ_ANDROID_ANR_REPORTER', 'MOZ_LINKER_EXTRACT', 'MOZILLA_OFFICIAL', 'MOZ_DEBUG',
'MOZ_ANDROID_SEARCH_ACTIVITY', 'MOZ_NATIVE_DEVICES', 'MOZ_ANDROID_MLS_STUMBLER',
'MOZ_ANDROID_SHARE_OVERLAY', 'MOZ_ANDROID_DOWNLOADS_INTEGRATION',
'MOZ_ANDROID_NEW_TABLET_UI', 'MOZ_ANDROID_TAB_QUEUE'):
'MOZ_ANDROID_TAB_QUEUE'):
if CONFIG[var]:
DEFINES[var] = 1

View File

@ -76,9 +76,6 @@ MOZ_WEBGL_CONFORMANT=1
# Enable the Search Activity.
MOZ_ANDROID_SEARCH_ACTIVITY=1
# 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