Merge "Simplify/correct Taskbar insetsRoundedCornerFrame calculation" into udc-dev (5e43031e) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

+0 −12

Original line number	Diff line number	Diff line
		@@ -673,18 +673,6 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
		return mIsFullscreen;
		}

		/**
		* Notify system to inset the rounded corner frame based on the task bar insets.
		*/
		public void updateInsetRoundedCornerFrame(boolean shouldInsetsRoundedCorner) {
		if (!mDragLayer.isAttachedToWindow()
		\|\| mWindowLayoutParams.insetsRoundedCornerFrame == shouldInsetsRoundedCorner) {
		return;
		}
		mWindowLayoutParams.insetsRoundedCornerFrame = shouldInsetsRoundedCorner;
		mWindowManager.updateViewLayout(mDragLayer, mWindowLayoutParams);
		}

		/**
		* Updates the TaskbarContainer height (pass {@link #getDefaultTaskbarWindowHeight()} to reset).
		*/

quickstep/src/com/android/launcher3/taskbar/TaskbarInsetsController.kt

+20 −16

Original line number	Diff line number	Diff line
		@@ -71,7 +71,6 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas
		fun init(controllers: TaskbarControllers) {
		this.controllers = controllers
		windowLayoutParams = context.windowLayoutParams
		windowLayoutParams.insetsRoundedCornerFrame = true
		onTaskbarWindowHeightOrInsetsChanged()

		context.addOnDeviceProfileChangeListener(deviceProfileChangeListener)
		@@ -162,6 +161,11 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas
		provider.insetsSizeOverrides = insetsSizeOverride
		}
		}

		// We only report tappableElement height for unstashed, persistent taskbar,
		// which is also when we draw the rounded corners above taskbar.
		windowLayoutParams.insetsRoundedCornerFrame = tappableHeight > 0

		context.notifyUpdateLayoutParams()
		}

quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java

+0 −15

Original line number	Diff line number	Diff line
		@@ -106,9 +106,6 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
		\| FLAG_STASHED_IN_APP_IME \| FLAG_STASHED_IN_TASKBAR_ALL_APPS
		\| FLAG_STASHED_SMALL_SCREEN \| FLAG_STASHED_IN_APP_AUTO;

		private static final int FLAGS_STASHED_IN_APP_IGNORING_IME =
		FLAGS_STASHED_IN_APP & ~FLAG_STASHED_IN_APP_IME;

		// If any of these flags are enabled, inset apps by our stashed height instead of our unstashed
		// height. This way the reported insets are consistent even during transitions out of the app.
		// Currently any flag that causes us to stash in an app is included, except for IME or All Apps
		@@ -413,13 +410,6 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
		return hasAnyFlag(FLAGS_STASHED_IN_APP);
		}

		/**
		* Returns whether the taskbar should be stashed in apps regardless of the IME visibility.
		*/
		public boolean isStashedInAppIgnoringIme() {
		return hasAnyFlag(FLAGS_STASHED_IN_APP_IGNORING_IME);
		}

		/**
		* Returns whether the taskbar should be stashed in the current LauncherState.
		*/
		@@ -1059,11 +1049,6 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
		private void notifyStashChange(boolean visible, boolean stashed) {
		mSystemUiProxy.notifyTaskbarStatus(visible, stashed);
		setUpTaskbarSystemAction(visible);
		// If stashing taskbar is caused by IME visibility, we could just skip updating rounded
		// corner insets since the rounded corners will be covered by IME during IME is showing and
		// taskbar will be restored back to unstashed when IME is hidden.
		mControllers.taskbarActivityContext.updateInsetRoundedCornerFrame(
		visible && !isStashedInAppIgnoringIme());
		mControllers.rotationButtonController.onTaskbarStateChange(visible, stashed);
		}