Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1de2df4 authored by Massimo Carli's avatar Massimo Carli Committed by Android (Google) Code Review
Browse files

Merge "[47/n] Simplify AppCompatFocusOverride naming" into main

parents 4ca49cf8 344fa8ed

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

+1 −1
Original line number 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.

     */

    boolean shouldSendCompatFakeFocus() {

        return mAppCompatController.getAppCompatFocusOverrides().shouldSendFakeFocus();

        return mAppCompatController.getFocusOverrides().shouldSendFakeFocus();

    }



    boolean canCaptureSnapshot() {

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

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



    @NonNull

    AppCompatFocusOverrides getAppCompatFocusOverrides() {

        return mAppCompatOverrides.getAppCompatFocusOverrides();

    AppCompatFocusOverrides getFocusOverrides() {

        return mAppCompatOverrides.getFocusOverrides();

    }



    @NonNull

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

+5 −5
Original line number Diff line number Diff line
@@ -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

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

        }

    }