Merge "[Audiosharing] Use a11y compliant color for dialog buttons" into main

This commit is contained in:
Yiyi Shen
2024-07-25 10:21:37 +00:00
committed by Android (Google) Code Review
3 changed files with 11 additions and 3 deletions

View File

@@ -15,8 +15,10 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<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"
android:shape="rectangle"> android:shape="rectangle">
<solid android:color="?android:colorButtonNormal" /> <solid android:color="?androidprv:attr/colorAccentPrimary" />
<corners android:radius="12dp" /> <corners android:radius="12dp" />
</shape> </shape>

View File

@@ -17,6 +17,7 @@
<FrameLayout <FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android" 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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
@@ -27,6 +28,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:textColor="?androidprv:attr/textColorOnAccent"
android:background="@drawable/audio_sharing_rounded_bg_ripple" android:background="@drawable/audio_sharing_rounded_bg_ripple"
android:textAlignment="center" /> android:textAlignment="center" />

View File

@@ -15,7 +15,9 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView
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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:scrollbars="none"> android:scrollbars="none">
@@ -60,6 +62,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:textColor="?androidprv:attr/textColorOnAccent"
android:background="@drawable/audio_sharing_rounded_bg_ripple" android:background="@drawable/audio_sharing_rounded_bg_ripple"
android:visibility="gone" /> android:visibility="gone" />
@@ -70,6 +73,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:textColor="?androidprv:attr/textColorOnAccent"
android:background="@drawable/audio_sharing_rounded_bg_ripple" android:background="@drawable/audio_sharing_rounded_bg_ripple"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>