Merge "[47/n] Simplify AppCompatFocusOverride naming" into main (e1de2df4) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -10386,7 +10386,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
	* game engines wait to get focus before drawing the content of the app.		* game engines wait to get focus before drawing the content of the app.
	*/		*/
	boolean shouldSendCompatFakeFocus() {		boolean shouldSendCompatFakeFocus() {
	return mAppCompatController.getAppCompatFocusOverrides().shouldSendFakeFocus();		return mAppCompatController.getFocusOverrides().shouldSendFakeFocus();
	}		}

	boolean canCaptureSnapshot() {		boolean canCaptureSnapshot() {

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

+2 −2

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

	@NonNull		@NonNull
	AppCompatFocusOverrides getAppCompatFocusOverrides() {		AppCompatFocusOverrides getFocusOverrides() {
	return mAppCompatOverrides.getAppCompatFocusOverrides();		return mAppCompatOverrides.getFocusOverrides();
	}		}

	@NonNull		@NonNull

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

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -33,7 +33,7 @@ public class AppCompatOverrides {
	@NonNull		@NonNull
	private final AppCompatAspectRatioOverrides mAspectRatioOverrides;		private final AppCompatAspectRatioOverrides mAspectRatioOverrides;
	@NonNull		@NonNull
	private final AppCompatFocusOverrides mAppCompatFocusOverrides;		private final AppCompatFocusOverrides mFocusOverrides;
	@NonNull		@NonNull
	private final AppCompatResizeOverrides mResizeOverrides;		private final AppCompatResizeOverrides mResizeOverrides;
	@NonNull		@NonNull
	@@ -55,8 +55,8 @@ public class AppCompatOverrides {
	mAspectRatioOverrides = new AppCompatAspectRatioOverrides(activityRecord,		mAspectRatioOverrides = new AppCompatAspectRatioOverrides(activityRecord,
	appCompatConfiguration, optPropBuilder, appCompatDeviceStateQuery,		appCompatConfiguration, optPropBuilder, appCompatDeviceStateQuery,
	mReachabilityOverrides);		mReachabilityOverrides);
	mAppCompatFocusOverrides = new AppCompatFocusOverrides(activityRecord,		mFocusOverrides = new AppCompatFocusOverrides(activityRecord, appCompatConfiguration,
	appCompatConfiguration, optPropBuilder);		optPropBuilder);
	mResizeOverrides = new AppCompatResizeOverrides(activityRecord, packageManager,		mResizeOverrides = new AppCompatResizeOverrides(activityRecord, packageManager,
	optPropBuilder);		optPropBuilder);
	mAppCompatLetterboxOverrides = new AppCompatLetterboxOverrides(activityRecord,		mAppCompatLetterboxOverrides = new AppCompatLetterboxOverrides(activityRecord,
	@@ -79,8 +79,8 @@ public class AppCompatOverrides {
	}		}

	@NonNull		@NonNull
	AppCompatFocusOverrides getAppCompatFocusOverrides() {		AppCompatFocusOverrides getFocusOverrides() {
	return mAppCompatFocusOverrides;		return mFocusOverrides;
	}		}

	@NonNull		@NonNull

services/tests/wmtests/src/com/android/server/wm/AppCompatFocusOverridesTest.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -188,7 +188,7 @@ public class AppCompatFocusOverridesTest extends WindowTestsBase {
	}		}

	void checkShouldSendFakeFocusOnTopActivity(boolean expected) {		void checkShouldSendFakeFocusOnTopActivity(boolean expected) {
	Assert.assertEquals(activity().top().mAppCompatController.getAppCompatFocusOverrides()		Assert.assertEquals(activity().top().mAppCompatController.getFocusOverrides()
	.shouldSendFakeFocus(), expected);		.shouldSendFakeFocus(), expected);
	}		}
	}		}