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

Commit d8f635fc authored by Nicolò Mazzucato's avatar Nicolò Mazzucato Committed by Automerger Merge Worker
Browse files

Merge "Increase keyguardDrawnTimeout to reduce fold->AOD flickers" into... 

Merge "Increase keyguardDrawnTimeout to reduce fold->AOD flickers" into tm-qpr-dev am: 191007fa am: 65bd24f4 am: 93ce6198

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21911630



Change-Id: I267bc0e66d01a1b51c0e459527b0d5eccf448886
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bb740781 93ce6198

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -711,6 +711,9 @@ 
         mode. -->

    <integer name="config_unfoldTransitionHalfFoldedTimeout">1000</integer>



    <!-- Timeout for receiving the keyguard drawn event from System UI.  -->

    <integer name="config_keyguardDrawnTimeout">1000</integer>



    <!-- Indicates that the device supports having more than one internal display on at the same

         time. Only applicable to devices with more than one internal display. If this option is

         set to false, DisplayManager will make additional effort to ensure no more than 1 internal

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -1939,6 +1939,7 @@ 
  <java-symbol type="bool" name="config_allowTheaterModeWakeFromDock" />

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

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

  <java-symbol type="integer" name="config_keyguardDrawnTimeout" />

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

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

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

services/core/java/com/android/server/policy/PhoneWindowManager.java

+6 −1
Original line number Diff line number Diff line
@@ -647,6 +647,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 


    private boolean mLockNowPending = false;



    // Timeout for showing the keyguard after the screen is on, in case no "ready" is received.

    private int mKeyguardDrawnTimeout = 1000;



    private static final int MSG_DISPATCH_MEDIA_KEY_WITH_WAKE_LOCK = 3;

    private static final int MSG_DISPATCH_MEDIA_KEY_REPEAT_WITH_WAKE_LOCK = 4;

    private static final int MSG_KEYGUARD_DRAWN_COMPLETE = 5;
@@ -2236,6 +2239,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            }

        });



        mKeyguardDrawnTimeout = mContext.getResources().getInteger(

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

        mKeyguardDelegate = new KeyguardServiceDelegate(mContext,

                new StateCallback() {

                    @Override
@@ -4981,7 +4986,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        final boolean bootCompleted =

                LocalServices.getService(SystemServiceManager.class).isBootCompleted();

        // Set longer timeout if it has not booted yet to prevent showing empty window.

        return bootCompleted ? 1000 : 5000;

        return bootCompleted ? mKeyguardDrawnTimeout : 5000;

    }



    // Called on the DisplayManager's DisplayPowerController thread.