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

Commit c3a68520 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9736625 from 191007fa to tm-qpr3-release 

Change-Id: I76dc87ac0e9617f4d02a882ab0ddc75b835c83b8
parents 69b2fa15 191007fa

core/java/android/service/dreams/DreamOverlayService.java

+55 −9
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ import android.os.RemoteException; 
import android.util.Log;

import android.view.WindowManager;



import java.util.concurrent.Executor;





/**

 * Basic implementation of for {@link IDreamOverlay} for testing.
@@ -40,6 +42,12 @@ public abstract class DreamOverlayService extends Service { 
    // The last client that started dreaming and hasn't ended

    private OverlayClient mCurrentClient;



    /**

     * Executor used to run callbacks that subclasses will implement. Any calls coming over Binder

     * from {@link OverlayClient} should perform the work they need to do on this executor.

     */

    private Executor mExecutor;



    // An {@link IDreamOverlayClient} implementation that identifies itself when forwarding

    // requests to the {@link DreamOverlayService}

    private static class OverlayClient extends IDreamOverlayClient.Stub {
@@ -61,8 +69,6 @@ public abstract class DreamOverlayService extends Service { 
            mService.startDream(this, params);

        }







        @Override

        public void wakeUp() {

            mService.wakeUp(this, () -> {
@@ -97,12 +103,20 @@ public abstract class DreamOverlayService extends Service { 
    }



    private void startDream(OverlayClient client, WindowManager.LayoutParams params) {

        endDream(mCurrentClient);

        // Run on executor as this is a binder call from OverlayClient.

        mExecutor.execute(() -> {

            endDreamInternal(mCurrentClient);

            mCurrentClient = client;

            onStartDream(params);

        });

    }



    private void endDream(OverlayClient client) {

        // Run on executor as this is a binder call from OverlayClient.

        mExecutor.execute(() -> endDreamInternal(client));

    }



    private void endDreamInternal(OverlayClient client) {

        if (client == null || client != mCurrentClient) {

            return;

        }
@@ -112,11 +126,14 @@ public abstract class DreamOverlayService extends Service { 
    }



    private void wakeUp(OverlayClient client, Runnable callback) {

        // Run on executor as this is a binder call from OverlayClient.

        mExecutor.execute(() -> {

            if (mCurrentClient != client) {

                return;

            }



            onWakeUp(callback);

        });

    }



    private IDreamOverlay mDreamOverlay = new IDreamOverlay.Stub() {
@@ -134,6 +151,25 @@ public abstract class DreamOverlayService extends Service { 
    public DreamOverlayService() {

    }



    /**

     * This constructor allows providing an executor to run callbacks on.

     *

     * @hide

     */

    public DreamOverlayService(@NonNull Executor executor) {

        mExecutor = executor;

    }



    @Override

    public void onCreate() {

        super.onCreate();

        if (mExecutor == null) {

            // If no executor was provided, use the main executor. onCreate is the earliest time

            // getMainExecutor is available.

            mExecutor = getMainExecutor();

        }

    }



    @Nullable

    @Override

    public final IBinder onBind(@NonNull Intent intent) {
@@ -143,6 +179,10 @@ public abstract class DreamOverlayService extends Service { 
    /**

     * This method is overridden by implementations to handle when the dream has started and the

     * window is ready to be interacted with.

     *

     * This callback will be run on the {@link Executor} provided in the constructor if provided, or

     * on the main executor if none was provided.

     *

     * @param layoutParams The {@link android.view.WindowManager.LayoutParams} associated with the

     *                     dream window.

     */
@@ -153,6 +193,9 @@ public abstract class DreamOverlayService extends Service { 
     * to wakeup. This allows any overlay animations to run. By default, the method will invoke

     * the callback immediately.

     *

     * This callback will be run on the {@link Executor} provided in the constructor if provided, or

     * on the main executor if none was provided.

     *

     * @param onCompleteCallback The callback to trigger to notify the dream service that the

     *                           overlay has completed waking up.

     * @hide
@@ -164,6 +207,9 @@ public abstract class DreamOverlayService extends Service { 
    /**

     * This method is overridden by implementations to handle when the dream has ended. There may

     * be earlier signals leading up to this step, such as @{@link #onWakeUp(Runnable)}.

     *

     * This callback will be run on the {@link Executor} provided in the constructor if provided, or

     * on the main executor if none was provided.

     */

    public void onEndDream() {

    }

core/java/com/android/internal/util/LatencyTracker.java

+37 −0
Original line number Diff line number Diff line
@@ -24,12 +24,15 @@ import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPOR 
import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_FOLD_TO_AOD;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_LOAD_SHARE_SHEET;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_LOCKSCREEN_UNLOCK;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_REQUEST_IME_HIDDEN;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_REQUEST_IME_SHOWN;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_ROTATE_SCREEN;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_ROTATE_SCREEN_CAMERA_CHECK;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_ROTATE_SCREEN_SENSOR;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_SHOW_BACK_ARROW;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_SHOW_SELECTION_TOOLBAR;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_SHOW_VOICE_INTERACTION;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_SMARTSPACE_DOORBELL;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_START_RECENTS_ANIMATION;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_SWITCH_DISPLAY_UNFOLD;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_TOGGLE_RECENTS;
@@ -187,6 +190,25 @@ public class LatencyTracker { 
     */

    public static final int ACTION_SHOW_VOICE_INTERACTION = 19;



    /**

     * Time it takes to request IME shown animation.

     */

    public static final int ACTION_REQUEST_IME_SHOWN = 20;



    /**

     * Time it takes to request IME hidden animation.

     */

    public static final int ACTION_REQUEST_IME_HIDDEN = 21;



    /**

     * Time it takes to load the animation frames in smart space doorbell card.

     * It measures the duration from the images uris are passed into the view

     * to all the frames are loaded.

     * <p/>

     * A long latency makes the doorbell animation looks janky until all the frames are loaded.

     */

    public static final int ACTION_SMARTSPACE_DOORBELL = 22;



    private static final int[] ACTIONS_ALL = {

        ACTION_EXPAND_PANEL,

        ACTION_TOGGLE_RECENTS,
@@ -208,6 +230,9 @@ public class LatencyTracker { 
        ACTION_SHOW_SELECTION_TOOLBAR,

        ACTION_FOLD_TO_AOD,

        ACTION_SHOW_VOICE_INTERACTION,

        ACTION_REQUEST_IME_SHOWN,

        ACTION_REQUEST_IME_HIDDEN,

        ACTION_SMARTSPACE_DOORBELL,

    };



    /** @hide */
@@ -232,6 +257,9 @@ public class LatencyTracker { 
        ACTION_SHOW_SELECTION_TOOLBAR,

        ACTION_FOLD_TO_AOD,

        ACTION_SHOW_VOICE_INTERACTION,

        ACTION_REQUEST_IME_SHOWN,

        ACTION_REQUEST_IME_HIDDEN,

        ACTION_SMARTSPACE_DOORBELL,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface Action {
@@ -259,6 +287,9 @@ public class LatencyTracker { 
            UIACTION_LATENCY_REPORTED__ACTION__ACTION_SHOW_SELECTION_TOOLBAR,

            UIACTION_LATENCY_REPORTED__ACTION__ACTION_FOLD_TO_AOD,

            UIACTION_LATENCY_REPORTED__ACTION__ACTION_SHOW_VOICE_INTERACTION,

            UIACTION_LATENCY_REPORTED__ACTION__ACTION_REQUEST_IME_SHOWN,

            UIACTION_LATENCY_REPORTED__ACTION__ACTION_REQUEST_IME_HIDDEN,

            UIACTION_LATENCY_REPORTED__ACTION__ACTION_SMARTSPACE_DOORBELL,

    };



    private static LatencyTracker sLatencyTracker;
@@ -368,6 +399,12 @@ public class LatencyTracker { 
                return "ACTION_FOLD_TO_AOD";

            case UIACTION_LATENCY_REPORTED__ACTION__ACTION_SHOW_VOICE_INTERACTION:

                return "ACTION_SHOW_VOICE_INTERACTION";

            case UIACTION_LATENCY_REPORTED__ACTION__ACTION_REQUEST_IME_SHOWN:

                return "ACTION_REQUEST_IME_SHOWN";

            case UIACTION_LATENCY_REPORTED__ACTION__ACTION_REQUEST_IME_HIDDEN:

                return "ACTION_REQUEST_IME_HIDDEN";

            case UIACTION_LATENCY_REPORTED__ACTION__ACTION_SMARTSPACE_DOORBELL:

                return "ACTION_SMARTSPACE_DOORBELL";

            default:

                throw new IllegalArgumentException("Invalid action");

        }

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -727,6 +727,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
@@ -1987,6 +1987,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" />

packages/SystemUI/res/drawable/media_ttt_chip_background.xml→packages/SystemUI/res/drawable/chipbar_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 
<shape

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <solid android:color="?androidprv:attr/colorSurface" />

    <solid android:color="?androidprv:attr/colorAccentSecondary" />

    <corners android:radius="32dp" />

</shape>