PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Automated Token Alignment Android/Material

Browse Source 
Resubmiting reverted CL Ia1f84669090e04b3a2aaac82bb5971032d74a125.
Reson: Bug was found in another CL (in this topic)

Test: Treehugger
Bug: 268682423

Change-Id: I0fead8915b2bb6281e29b32f7426c35b0138b10e
This commit is contained in:
Marcelo Arteiro
2023-03-13 15:05:08 +00:00
parent 486691ad26
commit c5631b45b2
29 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/color/dream_card_color_state_list.xml
View File

@@ -18,5 +18,5 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<item android:state_selected="true" android:color="?androidprv:attr/colorAccentPrimary"/>
<item android:color="?androidprv:attr/colorSurface"/>
<item android:color="?androidprv:attr/materialColorSurfaceContainer"/>
</selector>

4
res/color/dream_card_icon_color_state_list.xml
View File

@@ -17,6 +17,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<item android:state_selected="true" android:color="?androidprv:attr/textColorOnAccent"/>
<item android:color="?androidprv:attr/colorAccentPrimaryVariant"/>
<item android:state_selected="true" android:color="?androidprv:attr/materialColorOnPrimary"/>
<item android:color="?androidprv:attr/materialColorPrimaryContainer"/>
</selector>

2
res/color/dream_card_text_color_state_list.xml
View File

@@ -17,6 +17,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<item android:state_selected="true" android:color="?androidprv:attr/textColorOnAccent"/>
<item android:state_selected="true" android:color="?androidprv:attr/materialColorOnPrimary"/>
<item android:color="?android:attr/textColorPrimary"/>
</selector>

2
res/drawable/accessibility_text_reading_preview.xml
View File

@@ -20,5 +20,5 @@
android:shape="rectangle">
<corners android:radius="28dp" />
<solid android:color="?androidprv:attr/colorSurface" />
<solid android:color="?androidprv:attr/materialColorSurfaceContainer" />
</shape>

2
res/drawable/broadcast_button_outline.xml
View File

@@ -29,7 +29,7 @@
<shape android:shape="rectangle">
<corners android:radius="24dp"/>
<solid android:color="@android:color/transparent"/>
<stroke android:color="?androidprv:attr/colorAccentPrimaryVariant"
<stroke android:color="?androidprv:attr/materialColorPrimaryContainer"
android:width="1dp"
/>
<padding android:left="16dp"

2
res/drawable/button_border_selected.xml
View File

@@ -18,7 +18,7 @@
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle">
<solid
android:color="?androidprv:attr/colorSurface" />
android:color="?androidprv:attr/materialColorSurfaceContainer" />
<stroke
android:width="2dp"
android:color="?android:attr/colorAccent"/>

2
res/drawable/dream_preview_rounded_bg.xml
View File

@@ -17,6 +17,6 @@
<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/colorSurfaceHighlight" />
<solid android:color="?androidprv:attr/materialColorSurfaceBright" />
<corners android:radius="@dimen/dream_item_corner_radius"/>
</shape>

2
res/drawable/ic_check_24dp.xml
View File

@@ -18,7 +18,7 @@
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0"
android:tint="?androidprv:attr/colorAccent">
android:tint="?androidprv:attr/materialColorPrimaryContainer">
<path
android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"
android:fillColor="@android:color/white"/>

2
res/drawable/ic_check_circle_filled_24dp.xml
View File

@@ -20,7 +20,7 @@
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?androidprv:attr/colorAccentPrimaryVariant">
android:tint="?androidprv:attr/materialColorPrimaryContainer">
<path
android:fillColor="@android:color/white"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10c5.52,0 10,-4.48 10,-10S17.52,2 12,2zM10.59,16.6l-4.24,-4.24l1.41,-1.41l2.83,2.83l5.66,-5.66l1.41,1.41L10.59,16.6z"/>

2
res/drawable/ic_modifier_keys_reset.xml
View File

@@ -21,7 +21,7 @@
android:height="24.0dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0"
android:tint="?androidprv:attr/colorAccentPrimaryVariant">
android:tint="?androidprv:attr/materialColorPrimaryContainer">
<path
android:fillColor="@android:color/white"
android:pathData="M18,4C13.58,0.69 7.31,1.58 4,6V4H2v6h6V8H5.09c1.44,-2.47 4.09,-3.98 6.94,-3.97c4.42,0.02 7.99,3.61 7.97,8.03s-3.61,7.99 -8.03,7.97C7.55,20.01 3.98,16.42 4,12H2c0,3.15 1.48,6.11 4,8c4.42,3.31 10.69,2.42 14,-2C23.31,13.58 22.42,7.31 18,4z"/>

2
res/drawable/modifier_key_bordered.xml
View File

@@ -25,7 +25,7 @@
<solid android:color="@android:color/transparent"/>
<stroke
android:width="1dp"
android:color="?androidprv:attr/colorAccentPrimaryVariant"/>
android:color="?androidprv:attr/materialColorPrimaryContainer"/>
</shape>
</item>
</ripple>

2
res/drawable/modifier_key_lisetview_background.xml
View File

@@ -22,7 +22,7 @@
<item>
<shape android:shape="rectangle">
<corners android:radius="24dp"/>
<solid android:color="?androidprv:attr/colorSurfaceVariant"/>
<solid android:color="?androidprv:attr/materialColorSurfaceContainerHigh"/>
</shape>
</item>
</ripple>

2
res/drawable/rounded_bg.xml
View File

@@ -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/materialColorSurfaceContainer" />
<corners
android:bottomLeftRadius="?android:attr/dialogCornerRadius"
android:topLeftRadius="?android:attr/dialogCornerRadius"

2
res/drawable/sim_confirm_dialog_btn_outline.xml
View File

@@ -29,7 +29,7 @@
<shape android:shape="rectangle">
<corners android:radius="24dp"/>
<solid android:color="@android:color/transparent"/>
<stroke android:color="?androidprv:attr/colorAccentPrimaryVariant"
<stroke android:color="?androidprv:attr/materialColorPrimaryContainer"
android:width="1dp" />
<padding android:left="16dp"
android:top="8dp"

4
res/drawable/user_select_background.xml
View File

@@ -19,13 +19,13 @@
android:color="@color/settingslib_ripple_color">
<item android:id="@android:id/mask">
<shape android:shape="rectangle">
<solid android:color="?androidprv:attr/colorSurface"/>
<solid android:color="?androidprv:attr/materialColorSurfaceContainer"/>
<corners android:radius="20dp"/>
</shape>
</item>
<item android:id="@android:id/background">
<shape android:shape="rectangle">
<stroke android:color="?androidprv:attr/colorAccentPrimaryVariant" android:width="1dp"/>
<stroke android:color="?androidprv:attr/materialColorPrimaryContainer" android:width="1dp"/>
<corners android:radius="20dp"/>
</shape>
</item>

2
res/drawable/volume_dialog_button_background_outline.xml
View File

@@ -21,7 +21,7 @@
<shape
android:shape="rectangle">
<stroke
android:color="?androidprv:attr/colorAccentPrimaryVariant"
android:color="?androidprv:attr/materialColorPrimaryContainer"
android:width="1dp"/>
<corners android:radius="24dp"/>
<padding

2
res/layout/dream_preview_button.xml
View File

@@ -28,6 +28,6 @@
android:theme="@style/Theme.CollapsingToolbar.Settings"
android:layout_marginBottom="16dp"
android:layout_gravity="bottom|center"
app:backgroundTint="?androidprv:attr/colorAccentPrimaryVariant"
app:backgroundTint="?androidprv:attr/materialColorPrimaryContainer"
app:iconTint="?android:attr/textColorPrimaryInverse"
app:icon="@drawable/dream_preview_icon"/>

2
res/layout/modifier_key_item.xml
View File

@@ -32,7 +32,7 @@
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:src="@drawable/ic_check_24dp"
android:tint="?androidprv:attr/colorAccentPrimaryVariant"/>
android:tint="?androidprv:attr/materialColorPrimaryContainer"/>
<TextView
android:id="@+id/modifier_key_text"

2
res/layout/modifier_key_picker_dialog.xml
View File

@@ -100,7 +100,7 @@
android:paddingVertical="14dp"
android:drawablePadding="9dp"
style="@style/ModifierKeyButtonDone"
android:textColor="?androidprv:attr/textColorOnAccent"
android:textColor="?androidprv:attr/materialColorOnPrimary"
android:text="@string/modifier_keys_done"/>
</RelativeLayout>

2
res/layout/qrcode_scanner_fragment.xml
View File

@@ -35,7 +35,7 @@
android:orientation="vertical">
<ImageView
android:src="@drawable/ic_qr_code_scanner"
android:tint="?androidprv:attr/colorAccentPrimaryVariant"
android:tint="?androidprv:attr/materialColorPrimaryContainer"
android:layout_width="@dimen/qrcode_icon_size"
android:layout_height="@dimen/qrcode_icon_size"
android:contentDescription="@null"/>

4
res/layout/trackpad_gesture_preview.xml
View File

@@ -81,7 +81,7 @@
android:paddingVertical="14dp"
android:drawablePadding="9dp"
style="@style/ModifierKeyButtonDone"
android:textColor="?androidprv:attr/textColorOnAccent"
android:textColor="?androidprv:attr/materialColorOnPrimary"
android:text="@string/gesture_button_next"/>
<Button
@@ -95,7 +95,7 @@
android:paddingVertical="14dp"
android:drawablePadding="9dp"
style="@style/ModifierKeyButtonDone"
android:textColor="?androidprv:attr/textColorOnAccent"
android:textColor="?androidprv:attr/materialColorOnPrimary"
android:text="@string/gesture_button_done"/>
</RelativeLayout>

2
res/values-night/colors.xml
View File

@@ -21,7 +21,7 @@
<color name="homepage_accessibility_background">#783BE5</color>
<color name="homepage_support_background">#3F5FBD</color>
<color name="contextual_card_background">@*android:color/material_grey_900</color>
<color name="search_bar_background">?androidprv:attr/colorSurfaceVariant</color>
<color name="search_bar_background">?androidprv:attr/materialColorSurfaceContainerHigh</color>
<color name="notification_importance_button_unselected">#5F6368</color>
<!-- Palette list preference colors. -->

4
res/values/colors.xml
View File

@@ -98,7 +98,7 @@
<color name="icon_launcher_setting_color">@*android:color/accent_device_default_light</color>
<!-- Search bar background color -->
<color name="search_bar_background">?androidprv:attr/colorSurfaceHighlight</color>
<color name="search_bar_background">?androidprv:attr/materialColorSurfaceBright</color>
<color name="face_enroll_icon_color">#42a5f5</color> <!-- Blue 400 -->
@@ -168,7 +168,7 @@
<color name="battery_info_error_color_black">@*android:color/primary_text_default_material_light</color>
<!-- Background for multiple user settings page avatars -->
<color name="user_avatar_color_bg">?androidprv:attr/colorSurface</color>
<color name="user_avatar_color_bg">?androidprv:attr/materialColorSurfaceContainer</color>
<!-- Icon tint color for battery usage system icon -->
<color name="battery_usage_system_icon_color">?android:attr/textColorPrimary</color>

2
res/values/styles.xml
View File

@@ -435,7 +435,7 @@
<item name="android:layout_marginBottom">@dimen/contextual_card_vertical_margin</item>
<item name="android:layout_marginStart">@dimen/contextual_card_side_margin</item>
<item name="android:layout_marginEnd">@dimen/contextual_card_side_margin</item>
<item name="cardBackgroundColor">?androidprv:attr/colorSurface</item>
<item name="cardBackgroundColor">?androidprv:attr/materialColorSurfaceContainer</item>
<item name="cardCornerRadius">@dimen/contextual_card_corner_radius</item>
<item name="cardElevation">0dp</item>
<item name="rippleColor">?android:attr/colorControlHighlight</item>

2
src/com/android/settings/dashboard/profileselector/UserAdapter.java
View File

@@ -58,7 +58,7 @@ public class UserAdapter extends BaseAdapter {
mUserHandle = userHandle;
UserInfo userInfo = um.getUserInfo(mUserHandle.getIdentifier());
int tintColor = Utils.getColorAttrDefaultColor(context,
com.android.internal.R.attr.colorAccentPrimaryVariant);
com.android.internal.R.attr.materialColorPrimaryContainer);
if (userInfo.isManagedProfile()) {
mIcon = context.getPackageManager().getUserBadgeForDensityNoBackground(
userHandle, /* density= */ 0);

2
src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java
View File

@@ -301,7 +301,7 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick
mTrapezoidSolidColor = Utils.getColorAccentDefaultColor(context);
mTrapezoidColor = Utils.getDisabled(context, mTrapezoidSolidColor);
mTrapezoidHoverColor = Utils.getColorAttrDefaultColor(context,
com.android.internal.R.attr.colorAccentSecondaryVariant);
com.android.internal.R.attr.materialColorSecondaryContainer);
// Initializes the divider line paint.
final Resources resources = getContext().getResources();
mDividerWidth = resources.getDimensionPixelSize(R.dimen.chartview_divider_width);

2
src/com/android/settings/inputmethod/ModifierKeysPickerDialogFragment.java
View File

@@ -244,6 +244,6 @@ public class ModifierKeysPickerDialogFragment extends DialogFragment {
private int getColorOfColorAccentPrimaryVariant() {
return Utils.getColorAttrDefaultColor(
mContext, com.android.internal.R.attr.colorAccentPrimaryVariant);
mContext, com.android.internal.R.attr.materialColorPrimaryContainer);
}
}

2
src/com/android/settings/inputmethod/ModifierKeysPreferenceController.java
View File

@@ -158,7 +158,7 @@ public class ModifierKeysPreferenceController extends BasePreferenceController {
private int getColorOfColorAccentPrimaryVariant() {
return Utils.getColorAttrDefaultColor(
mContext, com.android.internal.R.attr.colorAccentPrimaryVariant);
mContext, com.android.internal.R.attr.materialColorPrimaryContainer);
}
private static boolean isCtrl(int keyCode) {

2
src/com/android/settings/inputmethod/ModifierKeysRestorePreferenceController.java
View File

@@ -96,7 +96,7 @@ public class ModifierKeysRestorePreferenceController extends BasePreferenceContr
private int getColorOfColorAccentPrimaryVariant() {
return Utils.getColorAttrDefaultColor(
mParent.getActivity(), com.android.internal.R.attr.colorAccentPrimaryVariant);
mParent.getActivity(), com.android.internal.R.attr.materialColorPrimaryContainer);
}
private void clearPreviousDialog() {