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

Change SIM colors to follow GAR standards in dark mode in SIM rename

Browse Source 
dialog.

Add a color map to map SIM colors in light mode to dark mode. Check
current system dark mode and set the SIM icon color to proper color when
get the view.

Bug: 144693819
Test: Manually set SIM colors to all 6 possibilities and switch from
light mode to dark mode.

Change-Id: I5b947d1d9c949bc6b8cc669d71cd3f5d66ddecb1
This commit is contained in:
Grace Jia
2020-05-15 13:32:11 -07:00
parent 576f6c9c75
commit 4fdc471d14
3 changed files with 264 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.network.telephony;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.Paint;
import android.graphics.drawable.ShapeDrawable;
@@ -48,7 +49,10 @@ import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.DeviceInfoUtils;
import com.google.common.collect.ImmutableMap;
import java.util.List;
import java.util.Map;
/**
* A dialog allowing the display name of a mobile network subscription to be changed
@@ -65,6 +69,7 @@ public class RenameMobileNetworkDialogFragment extends InstrumentedDialogFragmen
private EditText mNameView;
private Spinner mColorSpinner;
private Color[] mColors;
private Map<Integer, Integer> mLightDarkMap;
public static RenameMobileNetworkDialogFragment newInstance(int subscriptionId) {
final Bundle args = new Bundle(1);
@@ -100,6 +105,21 @@ public class RenameMobileNetworkDialogFragment extends InstrumentedDialogFragmen
mTelephonyManager = getTelephonyManager(context);
mSubscriptionManager = getSubscriptionManager(context);
mSubId = getArguments().getInt(KEY_SUBSCRIPTION_ID);
Resources res = context.getResources();
mLightDarkMap = ImmutableMap.<Integer, Integer>builder()
.put(res.getInteger(R.color.SIM_color_teal),
res.getInteger(R.color.SIM_dark_mode_color_teal))
.put(res.getInteger(R.color.SIM_color_blue),
res.getInteger(R.color.SIM_dark_mode_color_blue))
.put(res.getInteger(R.color.SIM_color_indigo),
res.getInteger(R.color.SIM_dark_mode_color_indigo))
.put(res.getInteger(R.color.SIM_color_purple),
res.getInteger(R.color.SIM_dark_mode_color_purple))
.put(res.getInteger(R.color.SIM_color_pink),
res.getInteger(R.color.SIM_dark_mode_color_pink))
.put(res.getInteger(R.color.SIM_color_red),
res.getInteger(R.color.SIM_dark_mode_color_red))
.build();
}
@NonNull
@@ -196,8 +216,13 @@ public class RenameMobileNetworkDialogFragment extends InstrumentedDialogFragmen
if (convertView == null) {
convertView = inflater.inflate(mItemResId, null);
}
boolean isDarkMode = false;
if ((getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK)
== Configuration.UI_MODE_NIGHT_YES) {
isDarkMode = true;
}
((ImageView) convertView.findViewById(R.id.color_icon))
.setImageDrawable(getItem(position).getDrawable());
.setImageDrawable(getItem(position).getDrawable(isDarkMode));
((TextView) convertView.findViewById(R.id.color_label))
.setText(getItem(position).getLabel());
@@ -223,7 +248,7 @@ public class RenameMobileNetworkDialogFragment extends InstrumentedDialogFragmen
return colors;
}
private static class Color {
private class Color {
private String mLabel;
private int mColor;
@@ -248,8 +273,15 @@ public class RenameMobileNetworkDialogFragment extends InstrumentedDialogFragmen
return mColor;
}
private ShapeDrawable getDrawable() {
private ShapeDrawable getDrawable(boolean isDarkMode) {
if (isDarkMode) {
mDrawable.getPaint().setColor(getDarkColor(mColor));
}
return mDrawable;
}
}
private int getDarkColor(int lightColor) {
return mLightDarkMap.getOrDefault(lightColor, lightColor);
}
}