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

Commit ce538563 authored by Todd Lee's avatar Todd Lee Committed by Android (Google) Code Review
Browse files

Merge "Wear App Launch Optimization" into main

parents 85410c4d d9a2db75

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -6977,4 +6977,8 @@ 


    <!-- The key containing the branching boolean for legacy Search. -->

    <string name="config_defaultContextualSearchLegacyEnabled" translatable="false" />



    <!-- Whether WM DisplayContent supports high performance transitions

         (lower-end devices may want to disable) -->

    <bool name="config_deviceSupportsHighPerfTransitions">true</bool>

</resources>

core/res/res/values/symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -5374,4 +5374,7 @@ 
  <java-symbol type="string" name="config_defaultContextualSearchLegacyEnabled" />



  <java-symbol type="string" name="unarchival_session_app_label" />



  <!-- Whether WM DisplayContent supports high performance transitions -->

  <java-symbol type="bool" name="config_deviceSupportsHighPerfTransitions" />

</resources>

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

+3 −0
Original line number Diff line number Diff line
@@ -3521,6 +3521,9 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
    }



    void enableHighPerfTransition(boolean enable) {

        if (!mWmService.mSupportsHighPerfTransitions) {

            return;

        }

        if (!explicitRefreshRateHints()) {

            if (enable) {

                getPendingTransaction().setEarlyWakeupStart();

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

+4 −1
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ public class WindowManagerService extends IWindowManager.Stub 
    final boolean mHasPermanentDpad;

    final long mDrawLockTimeoutMillis;

    final boolean mAllowAnimationsInLowPowerMode;



    final boolean mSupportsHighPerfTransitions;

    final boolean mAllowBootMessages;



    // Indicates whether the Assistant should show on top of the Dream (respectively, above
@@ -1181,6 +1181,8 @@ public class WindowManagerService extends IWindowManager.Stub 
                com.android.internal.R.bool.config_allowAnimationsInLowPowerMode);

        mMaxUiWidth = context.getResources().getInteger(

                com.android.internal.R.integer.config_maxUiWidth);

        mSupportsHighPerfTransitions = context.getResources().getBoolean(

                com.android.internal.R.bool.config_deviceSupportsHighPerfTransitions);

        mDisableTransitionAnimation = context.getResources().getBoolean(

                com.android.internal.R.bool.config_disableTransitionAnimation);

        mPerDisplayFocusEnabled = context.getResources().getBoolean(
@@ -1192,6 +1194,7 @@ public class WindowManagerService extends IWindowManager.Stub 
        final boolean isScreenSizeDecoupledFromStatusBarAndCutout = context.getResources()

                .getBoolean(R.bool.config_decoupleStatusBarAndDisplayCutoutFromScreenSize)

                && mFlags.mAllowsScreenSizeDecoupledFromStatusBarAndCutout;



        if (mFlags.mInsetsDecoupledConfiguration) {

            mDecorTypes = 0;

            mConfigTypes = 0;