Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update bubble user education screens to use proper colors

Browse Source 
Bug: 173562716
Test: visual - force user education to show & observe it on the
      stack and manage menu
Change-Id: I6988e2c433f17b69de4aed44c1af3bacb475caf9
This commit is contained in:
Mady Mellor
2021-05-13 01:24:07 -07:00
parent 951e3ea011
commit bba5ed7765
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/WindowManager/Shell/res/drawable/bubble_stack_user_education_bg.xml
View File

@@ -14,9 +14,10 @@
~ limitations under the License.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="?android:attr/colorAccent"/>
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle">
<corners
android:bottomRightRadius="360dp"
android:topRightRadius="360dp" />
<solid android:color="?androidprv:attr/colorAccentPrimary" />
</shape>

3
libs/WindowManager/Shell/res/drawable/bubble_stack_user_education_bg_rtl.xml
View File

@@ -14,9 +14,10 @@
~ limitations under the License.
-->
<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:attr/colorAccent"/>
<corners
android:bottomLeftRadius="360dp"
android:topLeftRadius="360dp" />
<solid android:color="?androidprv:attr/colorAccentPrimary" />
</shape>

4
libs/WindowManager/Shell/res/layout/bubble_stack_user_education.xml
View File

@@ -38,7 +38,7 @@
android:gravity="start"
android:textAlignment="viewStart"
android:text="@string/bubbles_user_education_title"
android:textColor="?android:attr/textColorPrimaryInverse"
android:textColor="@android:color/system_neutral1_900"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Headline"/>
<TextView
@@ -49,7 +49,7 @@
android:gravity="start"
android:textAlignment="viewStart"
android:text="@string/bubbles_user_education_description"
android:textColor="?android:attr/textColorPrimaryInverse"
android:textColor="@android:color/system_neutral1_900"
android:fontFamily="@*android:string/config_bodyFontFamily"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"/>
</LinearLayout>

8
libs/WindowManager/Shell/res/layout/bubbles_manage_button_education.xml
View File

@@ -41,7 +41,7 @@
android:ellipsize="end"
android:gravity="start"
android:textAlignment="viewStart"
android:textColor="?android:attr/textColorPrimaryInverse"
android:textColor="@android:color/system_neutral1_900"
android:text="@string/bubbles_user_education_manage_title"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Headline"/>
@@ -56,7 +56,7 @@
android:ellipsize="end"
android:gravity="start"
android:textAlignment="viewStart"
android:textColor="?android:attr/textColorPrimaryInverse"
android:textColor="@android:color/system_neutral1_900"
android:fontFamily="@*android:string/config_bodyFontFamily"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"/>
@@ -75,7 +75,7 @@
android:focusable="true"
android:clickable="false"
android:text="@string/manage_bubbles_text"
android:textColor="?android:attr/textColorPrimaryInverse"
android:textColor="@android:color/system_neutral1_900"
/>
<com.android.wm.shell.common.AlphaOptimizedButton
@@ -86,7 +86,7 @@
android:layout_height="wrap_content"
android:focusable="true"
android:text="@string/bubbles_user_education_got_it"
android:textColor="?android:attr/textColorPrimaryInverse"
android:textColor="@android:color/system_neutral1_900"
/>
</LinearLayout>
</LinearLayout>