Merge "Add metric logging for fake landscape usage" into main (1ee568bf) · Commits · e / os / android_packages_apps_Trebuchet

protos/launcher_atom.proto

+14 −0

Original line number	Diff line number	Diff line
		@@ -121,6 +121,20 @@ message SettingsContainer {
		}

		message TaskSwitcherContainer {
		/**
		* Indicates the current OrientationHandler in use in Overview.
		* In fake landscape, the value will be
		* {@link com.android.quickstep.orientation.LandscapePagedViewHandler} and in real landscape,
		* the value will be {@link com.android.quickstep.orientation.PortraitPagedViewHandler} for
		* example.
		*/
		optional OrientationHandler orientation_handler = 1;

		enum OrientationHandler {
		PORTRAIT = 0;
		LANDSCAPE = 1;
		SEASCAPE = 2;
		}
		}

		// Container for taskbar.

quickstep/src/com/android/launcher3/QuickstepTransitionManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -375,7 +375,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		*/
		protected boolean isLaunchingFromRecents(@NonNull View v,
		@Nullable RemoteAnimationTarget[] targets) {
		return mLauncher.getStateManager().getState().overviewUi
		return mLauncher.getStateManager().getState().isRecentsViewVisible
		&& findTaskViewToLaunch(mLauncher.getOverviewPanel(), v, targets) != null;
		}

quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -172,7 +172,7 @@ public class DesktopVisibilityController {
		}
		setBackgroundStateEnabled(state == BACKGROUND_APP);
		// Desktop visibility tracks overview and background state separately
		setOverviewStateEnabled(state != BACKGROUND_APP && state.overviewUi);
		setOverviewStateEnabled(state != BACKGROUND_APP && state.isRecentsViewVisible);
		}

		private void setOverviewStateEnabled(boolean overviewStateEnabled) {

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -669,7 +669,7 @@ public class TaskbarLauncherStateController {
		}

		boolean isInOverviewUi() {
		return mLauncherState.overviewUi;
		return mLauncherState.isRecentsViewVisible;
		}

		private void playStateTransitionAnim(AnimatorSet animatorSet, long duration,

quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView>
		ADJACENT_PAGE_HORIZONTAL_OFFSET.set(mRecentsView, scaleAndOffset[1]);
		TASK_SECONDARY_TRANSLATION.set(mRecentsView, 0f);

		getContentAlphaProperty().set(mRecentsView, state.overviewUi ? 1f : 0);
		getContentAlphaProperty().set(mRecentsView, state.isRecentsViewVisible ? 1f : 0);
		getTaskModalnessProperty().set(mRecentsView, state.getOverviewModalness());
		RECENTS_GRID_PROGRESS.set(mRecentsView,
		state.displayOverviewTasksAsGrid(mLauncher.getDeviceProfile()) ? 1f : 0f);
		@@ -109,7 +109,8 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView>
		setter.setFloat(mRecentsView, TASK_SECONDARY_TRANSLATION, 0f,
		config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, LINEAR));

		boolean exitingOverview = !FeatureFlags.enableSplitContextually() && !toState.overviewUi;
		boolean exitingOverview =
		!FeatureFlags.enableSplitContextually() && !toState.isRecentsViewVisible;
		if (mRecentsView.isSplitSelectionActive() && exitingOverview) {
		setter.add(mRecentsView.getSplitSelectController().getSplitAnimationController()
		.createPlaceholderDismissAnim(mLauncher, LAUNCHER_SPLIT_SELECTION_EXIT_HOME,
		@@ -124,7 +125,8 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView>
		);
		}

		setter.setFloat(mRecentsView, getContentAlphaProperty(), toState.overviewUi ? 1 : 0,
		setter.setFloat(mRecentsView, getContentAlphaProperty(),
		toState.isRecentsViewVisible ? 1 : 0,
		config.getInterpolator(ANIM_OVERVIEW_FADE, AGGRESSIVE_EASE_IN_OUT));

		setter.setFloat(
		@@ -145,7 +147,7 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView>
		private Interpolator getOverviewInterpolator(LauncherState fromState, LauncherState toState) {
		return fromState == QUICK_SWITCH_FROM_HOME
		? ACCELERATE_DECELERATE
		: toState.overviewUi ? INSTANT : FINAL_FRAME;
		: toState.isRecentsViewVisible ? INSTANT : FINAL_FRAME;
		}

		abstract FloatProperty getTaskModalnessProperty();