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
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() {