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

Commit f27a0f43 authored by Mady Mellor's avatar Mady Mellor
Browse files

Update visuals of bubble bar education views 

- update colours to match spec
- update sizes to match spec
- update elevation

Flag: com.android.wm.shell.enable_bubble_bar
Test: manual - flash wipe, get a bubble, tap on it and observe user
               education, expand the bubble, observe the manage menu
               user education, repeat with dark theme
Bug: 372516663
Fixes: 374856431
Change-Id: I726a71cb0a0528358ccc235fe8eb0778280a79e1
parent a190664b

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

+11 −9
Original line number Diff line number Diff line
@@ -16,40 +16,42 @@ 
  -->

<com.android.wm.shell.shared.bubbles.BubblePopupView

    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:layout_gravity="center_horizontal"

    android:layout_marginHorizontal="@dimen/bubble_popup_margin_horizontal"

    android:layout_marginTop="@dimen/bubble_popup_margin_top"

    android:elevation="@dimen/bubble_manage_menu_elevation"

    android:layout_marginHorizontal="@dimen/bubble_popup_margin_horizontal"

    android:layout_marginBottom="@dimen/bubble_popup_margin_bottom"

    android:elevation="@dimen/bubble_popup_elevation"

    android:gravity="center_horizontal"

    android:orientation="vertical">



    <ImageView

        android:layout_width="32dp"

        android:layout_height="32dp"

        android:tint="?android:attr/colorAccent"

        android:layout_width="@dimen/bubble_popup_icon_size"

        android:layout_height="@dimen/bubble_popup_icon_size"

        android:tint="?androidprv:attr/materialColorPrimary"

        android:contentDescription="@null"

        android:src="@drawable/pip_ic_settings"/>



    <TextView

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="16dp"

        android:layout_marginTop="@dimen/bubble_popup_text_margin"

        android:maxWidth="@dimen/bubble_popup_content_max_width"

        android:maxLines="1"

        android:ellipsize="end"

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

        android:textColor="?android:attr/textColorPrimary"

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

        android:text="@string/bubble_bar_education_manage_title"/>



    <TextView

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="16dp"

        android:layout_marginTop="@dimen/bubble_popup_text_margin"

        android:maxWidth="@dimen/bubble_popup_content_max_width"

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

        android:textColor="?android:attr/textColorSecondary"

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

        android:textAlignment="center"

        android:text="@string/bubble_bar_education_manage_text"/>