diff options
| author | 2023-02-20 17:21:36 +0000 | |
|---|---|---|
| committer | 2023-02-20 17:21:36 +0000 | |
| commit | f48182856b8ae1bf2d1b03d28613e3d08a2e3be7 (patch) | |
| tree | f1d52432f208ad144dc2fb84553f5640ff0afc6d /java | |
| parent | 373f5ae497bf31bf480f4f7b975e7b07829a437c (diff) | |
| parent | 0cff9441b0626a7691820ccab8fccecfded59f9c (diff) | |
Merge "Automated Token Alignment Android/Material" into udc-dev
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/drawable/chooser_action_button_bg.xml | 2 | ||||
| -rw-r--r-- | java/res/drawable/chooser_row_layer_list.xml | 2 | ||||
| -rw-r--r-- | java/res/drawable/resolver_outlined_button_bg.xml | 2 | ||||
| -rw-r--r-- | java/res/drawable/resolver_profile_tab_bg.xml | 2 | ||||
| -rw-r--r-- | java/res/layout/chooser_grid.xml | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/java/res/drawable/chooser_action_button_bg.xml b/java/res/drawable/chooser_action_button_bg.xml index b984a067..b03c310e 100644 --- a/java/res/drawable/chooser_action_button_bg.xml +++ b/java/res/drawable/chooser_action_button_bg.xml @@ -26,7 +26,7 @@ <shape android:shape="rectangle"> <corners android:radius="8dp" /> <stroke android:width="1dp" - android:color="?androidprv:attr/colorAccentPrimaryVariant"/> + android:color="?androidprv:attr/materialColorPrimaryContainer"/> </shape> </inset> </item> diff --git a/java/res/drawable/chooser_row_layer_list.xml b/java/res/drawable/chooser_row_layer_list.xml index 43f0cf6f..868ac8aa 100644 --- a/java/res/drawable/chooser_row_layer_list.xml +++ b/java/res/drawable/chooser_row_layer_list.xml @@ -20,7 +20,7 @@ xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"> <item> <shape android:shape="rectangle"> - <solid android:color="?androidprv:attr/colorAccentSecondary"/> + <solid android:color="?androidprv:attr/materialColorSecondary"/> <size android:width="128dp" android:height="2dp"/> <corners android:radius="2dp" /> </shape> diff --git a/java/res/drawable/resolver_outlined_button_bg.xml b/java/res/drawable/resolver_outlined_button_bg.xml index da569e72..3469a06e 100644 --- a/java/res/drawable/resolver_outlined_button_bg.xml +++ b/java/res/drawable/resolver_outlined_button_bg.xml @@ -26,7 +26,7 @@ <shape android:shape="rectangle"> <corners android:radius="8dp" /> <stroke android:width="1dp" - android:color="?androidprv:attr/colorAccentPrimaryVariant"/> + android:color="?androidprv:attr/materialColorPrimaryContainer"/> </shape> </inset> </item> diff --git a/java/res/drawable/resolver_profile_tab_bg.xml b/java/res/drawable/resolver_profile_tab_bg.xml index 66cd6d88..c7f2dd35 100644 --- a/java/res/drawable/resolver_profile_tab_bg.xml +++ b/java/res/drawable/resolver_profile_tab_bg.xml @@ -29,7 +29,7 @@ <item android:state_selected="false"> <shape android:shape="rectangle"> <corners android:radius="12dp" /> - <solid android:color="?androidprv:attr/colorSurface" /> + <solid android:color="?androidprv:attr/materialColorSurfaceContainer" /> </shape> </item> diff --git a/java/res/layout/chooser_grid.xml b/java/res/layout/chooser_grid.xml index d863495d..dc9954d5 100644 --- a/java/res/layout/chooser_grid.xml +++ b/java/res/layout/chooser_grid.xml @@ -43,7 +43,7 @@ android:src="@drawable/ic_drag_handle" android:layout_marginTop="@dimen/chooser_edge_margin_thin" android:layout_marginBottom="@dimen/chooser_edge_margin_thin" - android:tint="?androidprv:attr/colorSurfaceVariant" + android:tint="?androidprv:attr/materialColorSurfaceContainerHigh" android:layout_centerHorizontal="true" android:layout_alignParentTop="true" /> |