Merge "Set inset in phone setup mode to setup inset" into main (ad26390e) · Commits · e / os / android_packages_apps_Trebuchet

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

+4 −3

Original line number	Diff line number	Diff line
		@@ -424,14 +424,15 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
		* @see android.view.WindowInsets.Type#systemBars()
		*/
		public int getContentHeightToReportToApps() {
		if ((mActivity.isPhoneMode() && !mActivity.isThreeButtonNav())
		\|\| DisplayController.isTransientTaskbar(mActivity)) {
		if (mActivity.isUserSetupComplete() && (mActivity.isPhoneGestureNavMode()
		\|\| DisplayController.isTransientTaskbar(mActivity))) {
		return getStashedHeight();
		}

		if (supportsVisualStashing() && hasAnyFlag(FLAGS_REPORT_STASHED_INSETS_TO_APP)) {
		DeviceProfile dp = mActivity.getDeviceProfile();
		if (hasAnyFlag(FLAG_STASHED_IN_APP_SETUP) && dp.isTaskbarPresent) {
		if (hasAnyFlag(FLAG_STASHED_IN_APP_SETUP) && (dp.isTaskbarPresent
		\|\| mActivity.isPhoneGestureNavMode())) {
		// We always show the back button in SUW but in portrait the SUW layout may not
		// be wide enough to support overlapping the nav bar with its content.
		// We're sending different res values in portrait vs landscape