Merge "immersive mode: don't unconfirm a package, that's just dumb" into cm-11.0 (e803aa19) · Commits · e / os / android_frameworks_base

core/res/res/values/config.xml

+0 −4

Original line number	Diff line number	Diff line
		@@ -1375,10 +1375,6 @@
		<string-array translatable="false" name="config_operatorConsideredNonRoaming">
		</string-array>

		<!-- Threshold (in ms) under which a screen off / screen on will be considered a reset of the
		immersive mode confirmation prompt.-->
		<integer name="config_immersive_mode_confirmation_panic">5000</integer>

		<!-- For some operators, PDU has garbages. To fix it, need to use valid index -->
		<integer name="config_valid_wappush_index">-1</integer>

core/res/res/values/symbols.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -306,7 +306,6 @@
		<java-symbol type="integer" name="config_cursorWindowSize" />
		<java-symbol type="integer" name="config_extraFreeKbytesAdjust" />
		<java-symbol type="integer" name="config_extraFreeKbytesAbsolute" />
		<java-symbol type="integer" name="config_immersive_mode_confirmation_panic" />
		<java-symbol type="integer" name="config_longPressOnPowerBehavior" />
		<java-symbol type="integer" name="config_lowMemoryKillerMinFreeKbytesAdjust" />
		<java-symbol type="integer" name="config_lowMemoryKillerMinFreeKbytesAbsolute" />

policy/src/com/android/internal/policy/impl/ImmersiveModeConfirmation.java

+0 −28

Original line number	Diff line number	Diff line
		@@ -61,13 +61,10 @@ public class ImmersiveModeConfirmation {
		private final H mHandler;
		private final ArraySet<String> mConfirmedPackages = new ArraySet<String>();
		private final long mShowDelayMs;
		private final long mPanicThresholdMs;

		private ClingWindowView mClingWindow;
		private String mLastPackage;
		private String mPromptPackage;
		private long mPanicTime;
		private String mPanicPackage;
		private WindowManager mWindowManager;
		private boolean mStatusBarHidden;

		@@ -75,8 +72,6 @@ public class ImmersiveModeConfirmation {
		mContext = context;
		mHandler = new H();
		mShowDelayMs = getNavBarExitDuration() * 3;
		mPanicThresholdMs = context.getResources()
		.getInteger(R.integer.config_immersive_mode_confirmation_panic);
		mWindowManager = (WindowManager)
		mContext.getSystemService(Context.WINDOW_SERVICE);
		}
		@@ -134,33 +129,10 @@ public class ImmersiveModeConfirmation {
		}
		}

		public void onPowerKeyDown(boolean isScreenOn, long time, boolean inImmersiveMode) {
		if (mPanicPackage != null && !isScreenOn && (time - mPanicTime < mPanicThresholdMs)) {
		// turning the screen back on within the panic threshold
		unconfirmPackage(mPanicPackage);
		}
		if (isScreenOn && inImmersiveMode) {
		// turning the screen off, remember if we were in immersive mode
		mPanicTime = time;
		mPanicPackage = mLastPackage;
		} else {
		mPanicTime = 0;
		mPanicPackage = null;
		}
		}

		public void confirmCurrentPrompt() {
		mHandler.post(confirmAction(mPromptPackage));
		}

		private void unconfirmPackage(String pkg) {
		if (pkg != null) {
		if (DEBUG) Slog.d(TAG, "Unconfirming immersive mode confirmation for " + pkg);
		mConfirmedPackages.remove(pkg);
		saveSetting();
		}
		}

		private void handleHide() {
		if (mClingWindow != null) {
		if (DEBUG) Slog.d(TAG, "Hiding immersive mode confirmation for " + mPromptPackage);

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -4844,10 +4844,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}
		result &= ~ACTION_PASS_TO_USER;
		if (down) {
		if (mExpandedDesktopStyle == 0) {
		mImmersiveModeConfirmation.onPowerKeyDown(isScreenOn, event.getDownTime(),
		isImmersiveMode(mLastSystemUiFlags));
		}
		if (isScreenOn && !mPowerKeyTriggered
		&& (event.getFlags() & KeyEvent.FLAG_FALLBACK) == 0) {
		mPowerKeyTriggered = true;