Merge "[51/n] Simplify Camera Overrides naming" into main (6fa98e4b) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/ActivityRecord.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -10082,7 +10082,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		proto.write(OVERRIDE_ORIENTATION, getOverrideOrientation());
		proto.write(SHOULD_SEND_COMPAT_FAKE_FOCUS, shouldSendCompatFakeFocus());
		final AppCompatCameraOverrides cameraOverrides =
		mAppCompatController.getAppCompatCameraOverrides();
		mAppCompatController.getCameraOverrides();
		proto.write(SHOULD_FORCE_ROTATE_FOR_CAMERA_COMPAT,
		cameraOverrides.shouldForceRotateForCameraCompat());
		proto.write(SHOULD_REFRESH_ACTIVITY_FOR_CAMERA_COMPAT,

services/core/java/com/android/server/wm/ActivityRefresher.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -77,10 +77,10 @@ class ActivityRefresher {
		final boolean cycleThroughStop =
		mWmService.mAppCompatConfiguration
		.isCameraCompatRefreshCycleThroughStopEnabled()
		&& !activity.mAppCompatController.getAppCompatCameraOverrides()
		&& !activity.mAppCompatController.getCameraOverrides()
		.shouldRefreshActivityViaPauseForCameraCompat();

		activity.mAppCompatController.getAppCompatCameraOverrides().setIsRefreshRequested(true);
		activity.mAppCompatController.getCameraOverrides().setIsRefreshRequested(true);
		ProtoLog.v(WM_DEBUG_STATES,
		"Refreshing activity for freeform camera compatibility treatment, "
		+ "activityRecord=%s", activity);
		@@ -97,25 +97,25 @@ class ActivityRefresher {
		}
		}, REFRESH_CALLBACK_TIMEOUT_MS);
		} catch (RemoteException e) {
		activity.mAppCompatController.getAppCompatCameraOverrides()
		activity.mAppCompatController.getCameraOverrides()
		.setIsRefreshRequested(false);
		}
		}

		boolean isActivityRefreshing(@NonNull ActivityRecord activity) {
		return activity.mAppCompatController.getAppCompatCameraOverrides().isRefreshRequested();
		return activity.mAppCompatController.getCameraOverrides().isRefreshRequested();
		}

		void onActivityRefreshed(@NonNull ActivityRecord activity) {
		// TODO(b/333060789): can we tell that refresh did not happen by observing the activity
		// state?
		activity.mAppCompatController.getAppCompatCameraOverrides().setIsRefreshRequested(false);
		activity.mAppCompatController.getCameraOverrides().setIsRefreshRequested(false);
		}

		private boolean shouldRefreshActivity(@NonNull ActivityRecord activity,
		@NonNull Configuration newConfig, @NonNull Configuration lastReportedConfig) {
		return mWmService.mAppCompatConfiguration.isCameraCompatRefreshEnabled()
		&& activity.mAppCompatController.getAppCompatCameraOverrides()
		&& activity.mAppCompatController.getCameraOverrides()
		.shouldRefreshActivityForCameraCompat()
		&& ArrayUtils.find(mEvaluators.toArray(), evaluator ->
		((Evaluator) evaluator)

services/core/java/com/android/server/wm/AppCompatAspectRatioOverrides.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -272,7 +272,7 @@ class AppCompatAspectRatioOverrides {
		final boolean isLandscape = isFixedOrientationLandscape(
		mActivityRecord.getOverrideOrientation());
		final AppCompatCameraOverrides cameraOverrides =
		mActivityRecord.mAppCompatController.getAppCompatCameraOverrides();
		mActivityRecord.mAppCompatController.getCameraOverrides();
		// Don't resize to split screen size when in book mode if letterbox position is centered
		return (isBookMode && isNotCenteredHorizontally \|\| isTabletopMode && isLandscape)
		\|\| cameraOverrides.isCameraCompatSplitScreenAspectRatioAllowed()

services/core/java/com/android/server/wm/AppCompatCameraPolicy.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -277,7 +277,7 @@ class AppCompatCameraPolicy {
		*/
		static boolean shouldOverrideMinAspectRatioForCamera(@NonNull ActivityRecord activityRecord) {
		return AppCompatCameraPolicy.isCameraRunningAndWindowingModeEligible(activityRecord)
		&& activityRecord.mAppCompatController.getAppCompatCameraOverrides()
		&& activityRecord.mAppCompatController.getCameraOverrides()
		.isOverrideMinAspectRatioForCameraEnabled();
		}
		}

services/core/java/com/android/server/wm/AppCompatController.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -94,8 +94,8 @@ class AppCompatController {
		}

		@NonNull
		AppCompatCameraOverrides getAppCompatCameraOverrides() {
		return mAppCompatOverrides.getAppCompatCameraOverrides();
		AppCompatCameraOverrides getCameraOverrides() {
		return mAppCompatOverrides.getCameraOverrides();
		}

		@NonNull