Merge pull request #5377 from hieupham007/timob-16487

[TIMOB-16487] remove support for navbar-hidden
tidev · Mar 28, 2014 · dbe154c · dbe154c
2 parents 24113db + 7138cdb
commit dbe154c
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 62 deletions.
diff --git a/android/cli/commands/_build.js b/android/cli/commands/_build.js
@@ -2023,13 +2023,6 @@ AndroidBuilder.prototype.checkIfShouldForceRebuild = function checkIfShouldForce
 		return true;
 	}
 
-	if (this.tiapp['navbar-hidden'] != manifest['navbar-hidden']) {
-		this.logger.info(__('Forcing rebuild: tiapp.xml navbar-hidden changed since last build'));
-		this.logger.info('  ' + __('Was: %s', manifest['navbar-hidden']));
-		this.logger.info('  ' + __('Now: %s', this.tiapp['navbar-hidden']));
-		return true;
-	}
-
 	if (this.minSDK != manifest.minSDK) {
 		this.logger.info(__('Forcing rebuild: Android minimum SDK changed since last build'));
 		this.logger.info('  ' + __('Was: %s', manifest.minSDK));
@@ -3278,11 +3271,9 @@ AndroidBuilder.prototype.generateTheme = function generateTheme(next) {
 		this.logger.info(__('Generating %s', themeFile.cyan));
 
 		var flags = 'Theme.AppCompat';
-		if ((this.tiapp.fullscreen || this.tiapp['statusbar-hidden']) && this.tiapp['navbar-hidden']) {
-			flags += '.NoTitleBar.Fullscreen';
-		} else if (this.tiapp['navbar-hidden']) {
-			flags += '.NoTitleBar';
-		}
+		if (this.tiapp.fullscreen || this.tiapp['statusbar-hidden'] ) {
+			flags += '.Fullscreen';
+		} 
 
 		fs.writeFileSync(themeFile, ejs.render(fs.readFileSync(path.join(this.templatesDir, 'theme.xml')).toString(), {
 			flags: flags
@@ -3362,7 +3353,7 @@ AndroidBuilder.prototype.generateAndroidManifest = function generateAndroidManif
 				'activity': {
 					'name': 'ti.modules.titanium.media.TiVideoActivity',
 					'configChanges': ['keyboardHidden', 'orientation'],
-					'theme': '@style/Theme.AppCompat.NoTitleBar.Fullscreen',
+					'theme': '@style/Theme.AppCompat.Fullscreen',
 					'launchMode': 'singleTask'
 				}
 			},
@@ -4091,7 +4082,6 @@ AndroidBuilder.prototype.writeBuildManifest = function writeBuildManifest(callba
 		guid: this.tiapp.guid,
 		icon: this.tiapp.icon,
 		fullscreen: this.tiapp.fullscreen,
-		'navbar-hidden': this.tiapp['navbar-hidden'],
 		skipJSMinification: !!this.cli.argv['skip-js-minify'],
 		mergeCustomAndroidManifest: this.config.get('android.mergeCustomAndroidManifest', false),
 		encryptJS: this.encryptJS,

diff --git a/android/cli/locales/en.js b/android/cli/locales/en.js
@@ -194,7 +194,6 @@
 	"Forcing rebuild: tiapp.xml guid changed since last build": "Forcing rebuild: tiapp.xml guid changed since last build",
 	"Forcing rebuild: tiapp.xml icon changed since last build": "Forcing rebuild: tiapp.xml icon changed since last build",
 	"Forcing rebuild: tiapp.xml fullscreen changed since last build": "Forcing rebuild: tiapp.xml fullscreen changed since last build",
-	"Forcing rebuild: tiapp.xml navbar-hidden changed since last build": "Forcing rebuild: tiapp.xml navbar-hidden changed since last build",
 	"Forcing rebuild: Android minimum SDK changed since last build": "Forcing rebuild: Android minimum SDK changed since last build",
 	"Forcing rebuild: Android target SDK changed since last build": "Forcing rebuild: Android target SDK changed since last build",
 	"Forcing rebuild: tiapp.xml properties changed since last build": "Forcing rebuild: tiapp.xml properties changed since last build",

diff --git a/android/modules/media/src/java/ti/modules/titanium/media/TiCameraActivity.java b/android/modules/media/src/java/ti/modules/titanium/media/TiCameraActivity.java
@@ -133,7 +133,6 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec)
 	public void onCreate(Bundle savedInstanceState)
 	{
 		setFullscreen(true);
-		setNavBarHidden(true);
 
 		super.onCreate(savedInstanceState);
 

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/TabGroupProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/TabGroupProxy.java
@@ -461,9 +461,6 @@ private void fillIntent(ActionBarActivity activity, Intent intent)
 		if (hasProperty(TiC.PROPERTY_FULLSCREEN)) {
 			intent.putExtra(TiC.PROPERTY_FULLSCREEN, TiConvert.toBoolean(getProperty(TiC.PROPERTY_FULLSCREEN)));
 		}
-		if (hasProperty(TiC.PROPERTY_NAV_BAR_HIDDEN)) {
-			intent.putExtra(TiC.PROPERTY_NAV_BAR_HIDDEN, TiConvert.toBoolean(getProperty(TiC.PROPERTY_NAV_BAR_HIDDEN)));
-		}
 		if (hasProperty(TiC.PROPERTY_WINDOW_SOFT_INPUT_MODE)) {
 			intent.putExtra(TiC.PROPERTY_WINDOW_SOFT_INPUT_MODE, TiConvert.toInt(getProperty(TiC.PROPERTY_WINDOW_SOFT_INPUT_MODE)));
 		}

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/WindowProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/WindowProxy.java
@@ -157,10 +157,10 @@ public void open(@Kroll.argument(optional = true) Object arg)
 			lightweight = false;
 
 		// If "ti.android.useLegacyWindow" is set to true in the tiapp.xml, follow the old window behavior:
-		// create a HW window if any of the four properties, "fullscreen", "navBarHidden", "windowSoftInputMode" and
+		// create a HW window if any of the three properties, "fullscreen", "windowSoftInputMode" and
 		// "modal", is specified; otherwise create a LW window.
 		} else if (TiApplication.USE_LEGACY_WINDOW && !hasProperty(TiC.PROPERTY_FULLSCREEN)
-			&& !hasProperty(TiC.PROPERTY_NAV_BAR_HIDDEN) && !hasProperty(TiC.PROPERTY_WINDOW_SOFT_INPUT_MODE)
+			&& !hasProperty(TiC.PROPERTY_WINDOW_SOFT_INPUT_MODE)
 			&& !hasProperty(TiC.PROPERTY_MODAL)) {
 			lightweight = true;
 		}
@@ -341,9 +341,6 @@ private void fillIntent(Activity activity, Intent intent)
 		if (hasProperty(TiC.PROPERTY_FULLSCREEN)) {
 			intent.putExtra(TiC.PROPERTY_FULLSCREEN, TiConvert.toBoolean(getProperty(TiC.PROPERTY_FULLSCREEN), false));
 		}
-		if (hasProperty(TiC.PROPERTY_NAV_BAR_HIDDEN)) {
-			intent.putExtra(TiC.PROPERTY_NAV_BAR_HIDDEN, TiConvert.toBoolean(getProperty(TiC.PROPERTY_NAV_BAR_HIDDEN), false));
-		}
 		if (hasProperty(TiC.PROPERTY_WINDOW_SOFT_INPUT_MODE)) {
 			intent.putExtra(TiC.PROPERTY_WINDOW_SOFT_INPUT_MODE, TiConvert.toInt(getProperty(TiC.PROPERTY_WINDOW_SOFT_INPUT_MODE), -1));
 		}

diff --git a/android/templates/AppInfo.java b/android/templates/AppInfo.java
@@ -85,7 +85,4 @@ public boolean isFullscreen() {
 		return ${app_info['fullscreen']};
 	}
 
-	public boolean isNavBarHidden() {
-		return ${app_info['navbar-hidden']};
-	}
 }
diff --git a/android/templates/build/AppInfo.java b/android/templates/build/AppInfo.java
@@ -63,8 +63,4 @@ public String getGUID() {
 	public boolean isFullscreen() {
 		return <%- !!tiapp.fullscreen %>;
 	}
-
-	public boolean isNavBarHidden() {
-		return <%- !!tiapp['navbar-hidden'] %>;
-	}
 }
diff --git a/android/templates/build/theme.xml b/android/templates/build/theme.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<style name="Theme.AppCompat.NoTitleBar">
+	<style name="Theme.AppCompat.Fullscreen">
 		<item name="android:windowNoTitle">true</item>
-	</style>
-
-	<style name="Theme.AppCompat.NoTitleBar.Fullscreen">
 		<item name="android:windowFullscreen">true</item>
 		<item name="android:windowContentOverlay">@null</item>
 	</style>

diff --git a/android/titanium/src/java/org/appcelerator/titanium/ITiAppInfo.java b/android/titanium/src/java/org/appcelerator/titanium/ITiAppInfo.java
@@ -19,6 +19,5 @@ public interface ITiAppInfo
 	public boolean isAnalyticsEnabled();
 	public String getGUID();
 	public boolean isFullscreen();
-	public boolean isNavBarHidden();
 	public String getDeployType();
 }
diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiBaseActivity.java b/android/titanium/src/java/org/appcelerator/titanium/TiBaseActivity.java
@@ -406,35 +406,19 @@ protected void setFullscreen(boolean fullscreen)
 		}
 	}
 
-	protected void setNavBarHidden(boolean hidden)
-	{
-		if (!hidden) {
-			if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
-				// Do not enable these features on Honeycomb or later since it will break the action bar.
-				this.requestWindowFeature(Window.FEATURE_LEFT_ICON);
-				this.requestWindowFeature(Window.FEATURE_RIGHT_ICON);
-			}
-
-			this.requestWindowFeature(Window.FEATURE_PROGRESS);
-			this.requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-
-		} else {
-			this.requestWindowFeature(Window.FEATURE_NO_TITLE);
-		}
-	}
-
 	// Subclasses can override to handle post-creation (but pre-message fire) logic
 	protected void windowCreated()
 	{
 		boolean fullscreen = getIntentBoolean(TiC.PROPERTY_FULLSCREEN, false);
-		boolean navBarHidden = getIntentBoolean(TiC.PROPERTY_NAV_BAR_HIDDEN, false);
 		boolean modal = getIntentBoolean(TiC.PROPERTY_MODAL, false);
 		int softInputMode = getIntentInt(TiC.PROPERTY_WINDOW_SOFT_INPUT_MODE, -1);
 		boolean hasSoftInputMode = softInputMode != -1;
 
 		setFullscreen(fullscreen);
-		setNavBarHidden(navBarHidden);
 
+		this.requestWindowFeature(Window.FEATURE_PROGRESS);
+		this.requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
+
 		if (modal) {
 			if (Build.VERSION.SDK_INT < TiC.API_LEVEL_ICE_CREAM_SANDWICH) {
 				// This flag is deprecated in API 14. On ICS, the background is not blurred but straight black.

diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiC.java b/android/titanium/src/java/org/appcelerator/titanium/TiC.java
@@ -1590,11 +1590,6 @@ public class TiC
 	 * @module.api
 	 */
 	public static final String PROPERTY_NAME = "name";
-
-	/**
-	 * @module.api
-	 */
-	public static final String PROPERTY_NAV_BAR_HIDDEN = "navBarHidden";
 
 	/**
 	 * @module.api

diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiRootActivity.java b/android/titanium/src/java/org/appcelerator/titanium/TiRootActivity.java
@@ -105,7 +105,6 @@ protected void windowCreated()
 		// Use settings from tiapp.xml
 		ITiAppInfo appInfo = getTiApp().getAppInfo();
 		getIntent().putExtra(TiC.PROPERTY_FULLSCREEN, appInfo.isFullscreen());
-		getIntent().putExtra(TiC.PROPERTY_NAV_BAR_HIDDEN, appInfo.isNavBarHidden());
 		super.windowCreated();
 	}
 

diff --git a/android/titanium/src/java/org/appcelerator/titanium/proxy/TiWindowProxy.java b/android/titanium/src/java/org/appcelerator/titanium/proxy/TiWindowProxy.java
@@ -32,7 +32,6 @@
 @Kroll.proxy(propertyAccessors={
 	TiC.PROPERTY_EXIT_ON_CLOSE,
 	TiC.PROPERTY_FULLSCREEN,
-	TiC.PROPERTY_NAV_BAR_HIDDEN,
 	TiC.PROPERTY_TITLE,
 	TiC.PROPERTY_TITLEID,
 	TiC.PROPERTY_WINDOW_SOFT_INPUT_MODE