Merge cherrypicks of ['googleplex-android-review.googlesource.com/33755447',... (ab5a90ab) · Commits · e / os / android_frameworks_base

core/java/android/inputmethodservice/InputMethodService.java

+8 −6

Original line number	Diff line number	Diff line
		@@ -913,8 +913,14 @@ public class InputMethodService extends AbstractInputMethodService {
		// {@link #restartInput(InputConnection, EditorInfo)}.
		mImeDispatcher = params.imeDispatcher;
		if (mWindow != null) {
		mWindow.getOnBackInvokedDispatcher().setImeOnBackInvokedDispatcher(
		params.imeDispatcher);
		mWindow.getOnBackInvokedDispatcher().setImeOnBackInvokedDispatcher(mImeDispatcher);
		if (mDecorViewVisible && mShowInputRequested) {
		// Back callback is typically registered in {@link #showWindow()}, but it's
		// possible for {@link #doStartInput()} to be called without
		// {@link #showWindow()} so we also register here, after setting the new
		// dispatcher.
		registerDefaultOnBackInvokedCallback();
		}
		}
		}

		@@ -3526,10 +3532,6 @@ public class InputMethodService extends AbstractInputMethodService {
		mInlineSuggestionSessionController.notifyOnStartInputView();
		onStartInputView(mInputEditorInfo, restarting);
		startExtractingText(true);
		// Back callback is typically registered in {@link #showWindow()}, but it's possible
		// for {@link #doStartInput()} to be called without {@link #showWindow()} so we also
		// register here.
		registerDefaultOnBackInvokedCallback();
		} else if (mCandidatesVisibility == View.VISIBLE) {
		if (DEBUG) Log.v(TAG, "CALL: onStartCandidatesView");
		mCandidatesViewStarted = true;

+1 −12

Original line number	Diff line number	Diff line
		@@ -447,17 +447,6 @@ flag {
		}
		}

		flag {
		name: "keep_app_window_hide_while_locked"
		namespace: "windowing_frontend"
		description: "Do not let app window visible while device is locked"
		is_fixed_read_only: true
		bug: "378088391"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "use_rt_frame_callback_for_splash_screen_transfer"
		namespace: "windowing_frontend"

+2 −1

Original line number	Diff line number	Diff line
		@@ -2707,7 +2707,8 @@ final class ActivityRecord extends WindowToken {
		* This prevents briefly appearing the app context and causing secure concern.
		*/
		void deferStartingWindowRemovalForKeyguardUnoccluding() {
		if (mStartingData.mRemoveAfterTransaction != AFTER_TRANSITION_FINISH
		if (mStartingData != null
		&& mStartingData.mRemoveAfterTransaction != AFTER_TRANSITION_FINISH
		&& isKeyguardLocked() && !canShowWhenLockedInner(this) && !isVisibleRequested()
		&& mTransitionController.inTransition(this)) {
		mStartingData.mRemoveAfterTransaction = AFTER_TRANSITION_FINISH;

+1 −1

Original line number	Diff line number	Diff line
		@@ -2774,7 +2774,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		final boolean wasShowWhenLocked = (sa.flags & FLAG_SHOW_WHEN_LOCKED) != 0;
		final boolean removeShowWhenLocked = (mAttrs.flags & FLAG_SHOW_WHEN_LOCKED) == 0;
		sa.flags = (sa.flags & ~mask) \| (mAttrs.flags & mask);
		if (Flags.keepAppWindowHideWhileLocked() && wasShowWhenLocked && removeShowWhenLocked) {
		if (wasShowWhenLocked && removeShowWhenLocked) {
		// Trigger unoccluding animation if needed.
		mActivityRecord.checkKeyguardFlagsChanged();
		mActivityRecord.deferStartingWindowRemovalForKeyguardUnoccluding();