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

Commit e61fe9ab authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5761925 from 6293cba4 to qt-c2f2-release

Change-Id: I87ac399db8f2f3ab01498855934eb626171535df
parents 6d11b975 6293cba4
Loading
Loading
Loading
Loading
+3 −2
Original line number Original line Diff line number Diff line
@@ -75,14 +75,15 @@
        <attr name="horizontalSpacing" format="dimension" />
        <attr name="horizontalSpacing" format="dimension" />
    </declare-styleable>
    </declare-styleable>


    <!-- Theme for icons in the status bar (light/dark). background/fillColor is used for dual tone
    <!-- Theme for icons in the status/nav bar (light/dark). background/fillColor is used for dual
         icons like wifi and signal, and singleToneColor is used for icons with only one tone.
         tone icons like wifi and signal, and singleToneColor is used for icons with only one tone.
         Contract: Pixel with fillColor blended over backgroundColor blended over translucent should
         Contract: Pixel with fillColor blended over backgroundColor blended over translucent should
         equal to singleToneColor blended over translucent. -->
         equal to singleToneColor blended over translucent. -->
    <declare-styleable name="TonedIcon">
    <declare-styleable name="TonedIcon">
        <attr name="backgroundColor" format="integer" />
        <attr name="backgroundColor" format="integer" />
        <attr name="fillColor" format="integer" />
        <attr name="fillColor" format="integer" />
        <attr name="singleToneColor" format="integer" />
        <attr name="singleToneColor" format="integer" />
        <attr name="homeHandleColor" format="integer" />
    </declare-styleable>
    </declare-styleable>


    <declare-styleable name="StatusBarWindowView_Layout">
    <declare-styleable name="StatusBarWindowView_Layout">
+3 −0
Original line number Original line Diff line number Diff line
@@ -116,6 +116,9 @@
    <!-- The color of the navigation bar icons. Need to be in sync with ic_sysbar_* -->
    <!-- The color of the navigation bar icons. Need to be in sync with ic_sysbar_* -->
    <color name="navigation_bar_icon_color">#E5FFFFFF</color>
    <color name="navigation_bar_icon_color">#E5FFFFFF</color>


    <color name="navigation_bar_home_handle_light_color">#EBffffff</color>
    <color name="navigation_bar_home_handle_dark_color">#99000000</color>

    <!-- The shadow color for light navigation bar icons. -->
    <!-- The shadow color for light navigation bar icons. -->
    <color name="nav_key_button_shadow_color">#30000000</color>
    <color name="nav_key_button_shadow_color">#30000000</color>


+2 −0
Original line number Original line Diff line number Diff line
@@ -366,11 +366,13 @@
        <item name="backgroundColor">@color/light_mode_icon_color_dual_tone_background</item>
        <item name="backgroundColor">@color/light_mode_icon_color_dual_tone_background</item>
        <item name="fillColor">@color/light_mode_icon_color_dual_tone_fill</item>
        <item name="fillColor">@color/light_mode_icon_color_dual_tone_fill</item>
        <item name="singleToneColor">@color/light_mode_icon_color_single_tone</item>
        <item name="singleToneColor">@color/light_mode_icon_color_single_tone</item>
        <item name="homeHandleColor">@color/navigation_bar_home_handle_light_color</item>
    </style>
    </style>
    <style name="DualToneDarkTheme">
    <style name="DualToneDarkTheme">
        <item name="backgroundColor">@color/dark_mode_icon_color_dual_tone_background</item>
        <item name="backgroundColor">@color/dark_mode_icon_color_dual_tone_background</item>
        <item name="fillColor">@color/dark_mode_icon_color_dual_tone_fill</item>
        <item name="fillColor">@color/dark_mode_icon_color_dual_tone_fill</item>
        <item name="singleToneColor">@color/dark_mode_icon_color_single_tone</item>
        <item name="singleToneColor">@color/dark_mode_icon_color_single_tone</item>
        <item name="homeHandleColor">@color/navigation_bar_home_handle_dark_color</item>
    </style>
    </style>
    <style name="QSHeaderDarkTheme">
    <style name="QSHeaderDarkTheme">
        <item name="backgroundColor">@color/dark_mode_qs_icon_color_dual_tone_background</item>
        <item name="backgroundColor">@color/dark_mode_qs_icon_color_dual_tone_background</item>
+9 −2
Original line number Original line Diff line number Diff line
@@ -82,11 +82,15 @@ public class QuickStepContract {
    public static final int SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED = 1 << 9;
    public static final int SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED = 1 << 9;
    // The search feature is disabled (either by SUW/SysUI/device policy)
    // The search feature is disabled (either by SUW/SysUI/device policy)
    public static final int SYSUI_STATE_SEARCH_DISABLED = 1 << 10;
    public static final int SYSUI_STATE_SEARCH_DISABLED = 1 << 10;
    // The notification panel is expanded and interactive (either locked or unlocked), and the
    // quick settings is not expanded
    public static final int SYSUI_STATE_QUICK_SETTINGS_EXPANDED = 1 << 11;


    @Retention(RetentionPolicy.SOURCE)
    @Retention(RetentionPolicy.SOURCE)
    @IntDef({SYSUI_STATE_SCREEN_PINNING,
    @IntDef({SYSUI_STATE_SCREEN_PINNING,
            SYSUI_STATE_NAV_BAR_HIDDEN,
            SYSUI_STATE_NAV_BAR_HIDDEN,
            SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED,
            SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED,
            SYSUI_STATE_QUICK_SETTINGS_EXPANDED,
            SYSUI_STATE_BOUNCER_SHOWING,
            SYSUI_STATE_BOUNCER_SHOWING,
            SYSUI_STATE_A11Y_BUTTON_CLICKABLE,
            SYSUI_STATE_A11Y_BUTTON_CLICKABLE,
            SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE,
            SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE,
@@ -106,6 +110,7 @@ public class QuickStepContract {
        str.add((flags & SYSUI_STATE_SEARCH_DISABLED) != 0 ? "search_disabled" : "");
        str.add((flags & SYSUI_STATE_SEARCH_DISABLED) != 0 ? "search_disabled" : "");
        str.add((flags & SYSUI_STATE_NAV_BAR_HIDDEN) != 0 ? "navbar_hidden" : "");
        str.add((flags & SYSUI_STATE_NAV_BAR_HIDDEN) != 0 ? "navbar_hidden" : "");
        str.add((flags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) != 0 ? "notif_visible" : "");
        str.add((flags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) != 0 ? "notif_visible" : "");
        str.add((flags & SYSUI_STATE_QUICK_SETTINGS_EXPANDED) != 0 ? "qs_visible" : "");
        str.add((flags & SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING) != 0 ? "keygrd_visible" : "");
        str.add((flags & SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING) != 0 ? "keygrd_visible" : "");
        str.add((flags & SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED) != 0
        str.add((flags & SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED) != 0
                ? "keygrd_occluded" : "");
                ? "keygrd_occluded" : "");
@@ -154,11 +159,13 @@ public class QuickStepContract {
     * disabled.
     * disabled.
     */
     */
    public static boolean isAssistantGestureDisabled(int sysuiStateFlags) {
    public static boolean isAssistantGestureDisabled(int sysuiStateFlags) {
        // Disable when in screen pinning, immersive, the bouncer is showing, or search is disabled
        // Disable when in quick settings, screen pinning, immersive, the bouncer is showing, 
        // or search is disabled
        int disableFlags = SYSUI_STATE_SCREEN_PINNING
        int disableFlags = SYSUI_STATE_SCREEN_PINNING
                | SYSUI_STATE_NAV_BAR_HIDDEN
                | SYSUI_STATE_NAV_BAR_HIDDEN
                | SYSUI_STATE_BOUNCER_SHOWING
                | SYSUI_STATE_BOUNCER_SHOWING
                | SYSUI_STATE_SEARCH_DISABLED;
                | SYSUI_STATE_SEARCH_DISABLED
                | SYSUI_STATE_QUICK_SETTINGS_EXPANDED;
        if ((sysuiStateFlags & disableFlags) != 0) {
        if ((sysuiStateFlags & disableFlags) != 0) {
            return true;
            return true;
        }
        }
+4 −4
Original line number Original line Diff line number Diff line
@@ -47,7 +47,7 @@ public class ImageWallpaper extends WallpaperService {
    // This is to avoid destroying then recreating render context in a very short time.
    // This is to avoid destroying then recreating render context in a very short time.
    private static final int DELAY_FINISH_RENDERING = 1000;
    private static final int DELAY_FINISH_RENDERING = 1000;
    private static final int INTERVAL_WAIT_FOR_RENDERING = 100;
    private static final int INTERVAL_WAIT_FOR_RENDERING = 100;
    private static final int PATIENCE_WAIT_FOR_RENDERING = 5;
    private static final int PATIENCE_WAIT_FOR_RENDERING = 10;
    private HandlerThread mWorker;
    private HandlerThread mWorker;


    @Override
    @Override
@@ -124,10 +124,10 @@ public class ImageWallpaper extends WallpaperService {


        @Override
        @Override
        public void onAmbientModeChanged(boolean inAmbientMode, long animationDuration) {
        public void onAmbientModeChanged(boolean inAmbientMode, long animationDuration) {
            long duration = mNeedTransition || animationDuration != 0 ? animationDuration : 0;
            if (!mNeedTransition) return;
            mWorker.getThreadHandler().post(
            mWorker.getThreadHandler().post(
                    () -> mRenderer.updateAmbientMode(inAmbientMode, duration));
                    () -> mRenderer.updateAmbientMode(inAmbientMode, animationDuration));
            if (inAmbientMode && duration == 0) {
            if (inAmbientMode && animationDuration == 0) {
                // This means that we are transiting from home to aod, to avoid
                // This means that we are transiting from home to aod, to avoid
                // race condition between window visibility and transition,
                // race condition between window visibility and transition,
                // we don't return until the transition is finished. See b/136643341.
                // we don't return until the transition is finished. See b/136643341.
Loading