Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev (89f7afbf) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/policy/PhoneWindow.java

+17 −0

Original line number	Diff line number	Diff line
		@@ -3102,6 +3102,18 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		}
		}

		/**
		* Check if Setup or Post-Setup update is completed on TV
		* @return true if completed
		*/
		private boolean isTvUserSetupComplete() {
		boolean isTvSetupComplete = Settings.Secure.getInt(getContext().getContentResolver(),
		Settings.Secure.USER_SETUP_COMPLETE, 0) != 0;
		isTvSetupComplete &= Settings.Secure.getInt(getContext().getContentResolver(),
		Settings.Secure.TV_USER_SETUP_COMPLETE, 0) != 0;
		return isTvSetupComplete;
		}

		/**
		* Helper method for adding launch-search to most applications. Opens the
		* search window using default settings.
		@@ -3109,6 +3121,11 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		* @return true if search window opened
		*/
		private boolean launchDefaultSearch(KeyEvent event) {
		if (getContext().getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK)
		&& !isTvUserSetupComplete()) {
		// If we are in Setup or Post-Setup update mode on TV, consume the search key
		return false;
		}
		boolean result;
		final Callback cb = getCallback();
		if (cb == null \|\| isDestroyed()) {

+10 −1

Original line number	Diff line number	Diff line
		@@ -1689,8 +1689,17 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}

		boolean isUserSetupComplete() {
		return Settings.Secure.getIntForUser(mContext.getContentResolver(),
		boolean isSetupComplete = Settings.Secure.getIntForUser(mContext.getContentResolver(),
		Settings.Secure.USER_SETUP_COMPLETE, 0, UserHandle.USER_CURRENT) != 0;
		if (mHasFeatureLeanback) {
		isSetupComplete &= isTvUserSetupComplete();
		}
		return isSetupComplete;
		}

		private boolean isTvUserSetupComplete() {
		return Settings.Secure.getIntForUser(mContext.getContentResolver(),
		Settings.Secure.TV_USER_SETUP_COMPLETE, 0, UserHandle.USER_CURRENT) != 0;
		}

		private void handleShortPressOnHome() {