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

Commit e9b103e6 authored by Gauri Shankar's avatar Gauri Shankar Committed by Android (Google) Code Review
Browse files

Merge "Updated global_actions_lite_background color for Light theme used in... 

Merge "Updated global_actions_lite_background color for Light theme used in PowerDialogBackground" into main
parents 9a8e23f8 2a6b4daf

packages/SystemUI/res/drawable/bg_shutdown_finder_message.xml

+3 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

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

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

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

    <solid android:color="@color/global_actions_lite_button_background" />

    <solid android:color="@androidprv:color/materialColorSurfaceContainerHighest" />

</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/global_actions_lite_background.xml

+3 −2
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 
* limitations under the License.

*/

-->

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

  <solid android:color="@color/global_actions_lite_background"/>

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

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

  <solid android:color="@androidprv:color/materialColorSurfaceContainerLow"/>

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

</shape>

packages/SystemUI/res/drawable/global_actions_lite_button.xml

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
*/

-->

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

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

    android:shape="oval">

  <solid android:color="@color/global_actions_lite_button_background"/>

  <solid android:color="@androidprv:color/materialColorSurfaceContainerHighest"/>

</shape>

packages/SystemUI/res/drawable/global_actions_lite_button_background.xml

+3 −2
Original line number Diff line number Diff line
@@ -15,10 +15,11 @@ 
    limitations under the License.

-->



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

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

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

    <item android:state_focused="false" >

        <shape android:shape="oval">

            <solid android:color="@color/global_actions_lite_button_background"/>

            <solid android:color="@androidprv:color/materialColorSurfaceContainerHighest"/>

        </shape>

    </item>

    <item android:state_focused="true" >

packages/SystemUI/res/layout/global_actions_grid_item_lite.xml

+3 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
-->

<com.android.systemui.globalactions.GlobalActionsItem

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

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

    android:layout_width="match_parent"

    android:layout_weight="1"

    android:layout_height="wrap_content"
@@ -29,7 +30,7 @@ 
            android:layout_marginBottom="@dimen/global_actions_grid_container_bottom_margin"

            android:padding="@dimen/global_actions_button_padding"

            android:scaleType="centerInside"

            android:tint="@color/global_actions_lite_text"

            android:tint="@androidprv:color/materialColorOnSurface"

            android:background="@drawable/global_actions_lite_button"/>

        <TextView

            android:id="@*android:id/message"
@@ -40,6 +41,6 @@ 
            android:singleLine="true"

            android:textSize="14sp"

            android:gravity="center"

            android:textColor="@color/global_actions_lite_text"

            android:textColor="@androidprv:color/materialColorOnSurface"

            android:textAppearance="?android:attr/textAppearanceSmall" />

</com.android.systemui.globalactions.GlobalActionsItem>