diff options
4 files changed, 9 insertions, 9 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index dca65a183f18..327813dce613 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -10384,7 +10384,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A * game engines wait to get focus before drawing the content of the app. */ boolean shouldSendCompatFakeFocus() { - return mAppCompatController.getAppCompatFocusOverrides().shouldSendFakeFocus(); + return mAppCompatController.getFocusOverrides().shouldSendFakeFocus(); } boolean canCaptureSnapshot() { diff --git a/services/core/java/com/android/server/wm/AppCompatController.java b/services/core/java/com/android/server/wm/AppCompatController.java index 1a6c9a1a8797..a94f6252cd68 100644 --- a/services/core/java/com/android/server/wm/AppCompatController.java +++ b/services/core/java/com/android/server/wm/AppCompatController.java @@ -119,8 +119,8 @@ class AppCompatController { } @NonNull - AppCompatFocusOverrides getAppCompatFocusOverrides() { - return mAppCompatOverrides.getAppCompatFocusOverrides(); + AppCompatFocusOverrides getFocusOverrides() { + return mAppCompatOverrides.getFocusOverrides(); } @NonNull diff --git a/services/core/java/com/android/server/wm/AppCompatOverrides.java b/services/core/java/com/android/server/wm/AppCompatOverrides.java index f8002a589eef..2d0ff9be2133 100644 --- a/services/core/java/com/android/server/wm/AppCompatOverrides.java +++ b/services/core/java/com/android/server/wm/AppCompatOverrides.java @@ -33,7 +33,7 @@ public class AppCompatOverrides { @NonNull private final AppCompatAspectRatioOverrides mAspectRatioOverrides; @NonNull - private final AppCompatFocusOverrides mAppCompatFocusOverrides; + private final AppCompatFocusOverrides mFocusOverrides; @NonNull private final AppCompatResizeOverrides mResizeOverrides; @NonNull @@ -55,8 +55,8 @@ public class AppCompatOverrides { mAspectRatioOverrides = new AppCompatAspectRatioOverrides(activityRecord, appCompatConfiguration, optPropBuilder, appCompatDeviceStateQuery, mReachabilityOverrides); - mAppCompatFocusOverrides = new AppCompatFocusOverrides(activityRecord, - appCompatConfiguration, optPropBuilder); + mFocusOverrides = new AppCompatFocusOverrides(activityRecord, appCompatConfiguration, + optPropBuilder); mResizeOverrides = new AppCompatResizeOverrides(activityRecord, packageManager, optPropBuilder); mAppCompatLetterboxOverrides = new AppCompatLetterboxOverrides(activityRecord, @@ -79,8 +79,8 @@ public class AppCompatOverrides { } @NonNull - AppCompatFocusOverrides getAppCompatFocusOverrides() { - return mAppCompatFocusOverrides; + AppCompatFocusOverrides getFocusOverrides() { + return mFocusOverrides; } @NonNull diff --git a/services/tests/wmtests/src/com/android/server/wm/AppCompatFocusOverridesTest.java b/services/tests/wmtests/src/com/android/server/wm/AppCompatFocusOverridesTest.java index d8f845389727..5e49c8cdb917 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AppCompatFocusOverridesTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/AppCompatFocusOverridesTest.java @@ -188,7 +188,7 @@ public class AppCompatFocusOverridesTest extends WindowTestsBase { } void checkShouldSendFakeFocusOnTopActivity(boolean expected) { - Assert.assertEquals(activity().top().mAppCompatController.getAppCompatFocusOverrides() + Assert.assertEquals(activity().top().mAppCompatController.getFocusOverrides() .shouldSendFakeFocus(), expected); } } |