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

Commit 3c9d9a67 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Controls - Continue migration to QS" into sc-dev am: 7a17ad8c 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica13b127ff1584126013c7df71cb7a84f0d8d70c
parents 2457f7e9 7a17ad8c

packages/SystemUI/res/drawable/control_no_favorites_background.xml

+0 −8
Original line number Diff line number Diff line
@@ -26,12 +26,4 @@ 
            <corners android:radius="@dimen/control_corner_radius" />

        </shape>

    </item>

    <item>

        <shape>

            <stroke

                android:width="1dp"

                android:color="#4DFFFFFF" />

            <corners android:radius="@dimen/control_corner_radius"/>

        </shape>

    </item>

</ripple>

packages/SystemUI/res/drawable/controls_dialog_bg.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 
-->

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

       android:shape="rectangle">

    <solid android:color="?android:attr/colorBackgroundFloating" />

    <solid android:color="?android:attr/colorBackground" />

    <corners android:radius="@dimen/notification_corner_radius" />

</shape>

packages/SystemUI/res/values/colors.xml

+0 −1
Original line number Diff line number Diff line
@@ -265,7 +265,6 @@ 
    <color name="control_enabled_cool_foreground">@color/GM2_blue_300</color>

    <color name="control_thumbnail_tint">#33000000</color>

    <color name="control_thumbnail_shadow_color">@*android:color/black</color>

    <color name="controls_lockscreen_scrim">#AA000000</color>



    <!-- Docked misalignment message -->

    <color name="misalignment_text_color">#F28B82</color>

packages/SystemUI/res/values/styles.xml

+5 −5
Original line number Diff line number Diff line
@@ -663,16 +663,16 @@ 
    </style>



    <style name="Theme.SystemUI.Dialog.Control.LockScreen" parent="@android:style/Theme.DeviceDefault.Dialog.NoActionBar">

      <item name="android:windowAnimationStyle">@style/Animation.Fade</item>

      <item name="android:windowAnimationStyle">@style/Animation.ControlDialog</item>

      <item name="android:windowFullscreen">true</item>

      <item name="android:windowIsFloating">false</item>

      <item name="android:windowBackground">@color/controls_lockscreen_scrim</item>

      <item name="android:windowBackground">@null</item>

      <item name="android:backgroundDimEnabled">true</item>

    </style>



    <style name="Animation.Fade">

      <item name="android:windowEnterAnimation">@android:anim/fade_in</item>

      <item name="android:windowExitAnimation">@android:anim/fade_out</item>

    <style name="Animation.ControlDialog">

      <item name="android:windowEnterAnimation">@*android:anim/dialog_enter</item>

      <item name="android:windowExitAnimation">@*android:anim/dialog_exit</item>

    </style>



    <style name="Control" />

packages/SystemUI/src/com/android/systemui/controls/management/ControlsAnimations.kt

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ import com.android.systemui.controls.ui.ControlsUiController 


object ControlsAnimations {



    private const val ALPHA_EXIT_DURATION = 167L

    private const val ALPHA_EXIT_DURATION = 183L

    private const val ALPHA_ENTER_DELAY = ALPHA_EXIT_DURATION

    private const val ALPHA_ENTER_DURATION = 350L - ALPHA_ENTER_DELAY