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

Commit a841ff86 authored by Liran Binyamin's avatar Liran Binyamin
Browse files

Updates to color tokens for Bubbles according to new spec. 

Test: Verified changes by testing on a physical device.

Fixes: 275090254

Change-Id: I500ebe22d090080f4ca3e26e5f25f6ef9843f86b
parent 7229904e

libs/WindowManager/Shell/res/drawable/bubble_manage_btn_bg.xml

+2 −1
Original line number Diff line number Diff line
@@ -16,9 +16,10 @@ 
  -->



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

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

    android:shape="rectangle">

    <solid

        android:color="@android:color/system_neutral1_800"

        android:color="?androidprv:attr/materialColorSurfaceContainerHigh"

        />

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

libs/WindowManager/Shell/res/drawable/bubble_manage_menu_bg.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<shape xmlns:android="http://schemas.android.com/apk/res/android"

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

       android:shape="rectangle">

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

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

    <corners

        android:bottomLeftRadius="?android:attr/dialogCornerRadius"

        android:topLeftRadius="?android:attr/dialogCornerRadius"

libs/WindowManager/Shell/res/layout/bubble_flyout.xml

+4 −1
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

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

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

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



    <LinearLayout

        android:id="@+id/bubble_flyout_text_container"
@@ -48,6 +49,7 @@ 
                android:fontFamily="@*android:string/config_bodyFontFamilyMedium"

                android:maxLines="1"

                android:ellipsize="end"

                android:textColor="?androidprv:attr/materialColorOnSurface"

                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"/>



            <TextView
@@ -57,6 +59,7 @@ 
                android:fontFamily="@*android:string/config_bodyFontFamily"

                android:maxLines="2"

                android:ellipsize="end"

                android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"

                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"/>



        </LinearLayout>

libs/WindowManager/Shell/res/layout/bubble_manage_button.xml

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

<com.android.wm.shell.common.AlphaOptimizedButton

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

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

    style="@android:style/Widget.DeviceDefault.Button.Borderless"

    android:id="@+id/manage_button"

    android:layout_gravity="start"
@@ -27,6 +28,6 @@ 
    android:focusable="true"

    android:text="@string/manage_bubbles_text"

    android:textSize="@*android:dimen/text_size_body_2_material"

    android:textColor="@*android:color/system_neutral1_50"

    android:textColor="?androidprv:attr/materialColorOnSurface"

    android:background="@drawable/bubble_manage_btn_bg"

    />
 
 No newline at end of file

libs/WindowManager/Shell/res/layout/bubble_manage_menu.xml

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
  ~ limitations under the License

  -->

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

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

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:background="@drawable/bubble_manage_menu_bg"
@@ -41,6 +42,7 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="16dp"

            android:textColor="?androidprv:attr/materialColorOnSurface"

            android:textAppearance="@*android:style/TextAppearance.DeviceDefault"

            android:text="@string/bubble_dismiss_text" />
@@ -66,6 +68,7 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="16dp"

            android:textColor="?androidprv:attr/materialColorOnSurface"

            android:textAppearance="@*android:style/TextAppearance.DeviceDefault"

            android:text="@string/bubbles_dont_bubble_conversation" />
@@ -92,6 +95,7 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="16dp"

            android:textColor="?androidprv:attr/materialColorOnSurface"

            android:textAppearance="@*android:style/TextAppearance.DeviceDefault" />



    </LinearLayout>