psmattas/android_packages_apps_Cherish
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Notch friendly carrier label [2/2]

Browse Source 
Signed-off-by: SagarMakhar <sagarmakhar@gmail.com>
Change-Id: Ic74e28fb64425ae8f924625166da1bfe27d6d2f2
Signed-off-by: SagarMakhar <sagarmakhar@gmail.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
Alex
2020-02-04 22:18:15 +05:30
committed by Hưng Phan
parent 0a675cad6c
commit b4c3f73bb6
2 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/xml/carrier_label.xml
View File

@@ -22,9 +22,6 @@
<com.cherish.settings.preferences.SystemSettingListPreference
android:key="status_bar_show_carrier"
android:title="@string/show_carrier_title"
android:entries="@array/carrier_label_entries"
android:entryValues="@array/carrier_label_values"
android:summary="%s"
android:defaultValue="1" />
<Preference

44
src/com/cherish/settings/fragments/CarrierLabel.java
View File

@@ -21,6 +21,7 @@ import android.content.ContentResolver;
import android.content.DialogInterface;
import android.content.DialogInterface.OnCancelListener;
import android.content.Intent;
import android.content.res.Resources;
import android.os.Bundle;
import android.os.UserHandle;
import android.provider.Settings;
@@ -40,18 +41,23 @@ import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.SwitchPreference;
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.util.cherish.CherishUtils;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.cherish.settings.preferences.SystemSettingListPreference;
public class CarrierLabel extends SettingsPreferenceFragment
implements Preference.OnPreferenceChangeListener {
public static final String TAG = "CarrierLabel";
private static final String CUSTOM_CARRIER_LABEL = "custom_carrier_label";
private static final String KEY_CARRIER_LABEL = "status_bar_show_carrier";
private Preference mCarrierLabel;
private String mCarrierLabelText;
private SystemSettingListPreference mShowCarrierLabel;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -63,13 +69,51 @@ public class CarrierLabel extends SettingsPreferenceFragment
mCarrierLabel = (Preference) findPreference(CUSTOM_CARRIER_LABEL);
updateCustomLabelTextSummary();
mShowCarrierLabel = (SystemSettingListPreference) findPreference(KEY_CARRIER_LABEL);
int showCarrierLabel = Settings.System.getInt(resolver,
Settings.System.STATUS_BAR_SHOW_CARRIER, 1);
CharSequence[] NonNotchEntries = { getResources().getString(R.string.show_carrier_disabled),
getResources().getString(R.string.show_carrier_keyguard),
getResources().getString(R.string.show_carrier_statusbar), getResources().getString(
R.string.show_carrier_enabled) };
CharSequence[] NotchEntries = { getResources().getString(R.string.show_carrier_disabled),
getResources().getString(R.string.show_carrier_keyguard) };
CharSequence[] NonNotchValues = {"0", "1" , "2", "3"};
CharSequence[] NotchValues = {"0", "1"};
mShowCarrierLabel.setEntries(CherishUtils.hasNotch(getActivity()) ? NotchEntries : NonNotchEntries);
mShowCarrierLabel.setEntryValues(CherishUtils.hasNotch(getActivity()) ? NotchValues : NonNotchValues);
mShowCarrierLabel.setValue(String.valueOf(showCarrierLabel));
mShowCarrierLabel.setSummary(mShowCarrierLabel.getEntry());
mShowCarrierLabel.setOnPreferenceChangeListener(this);
}
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
ContentResolver resolver = getActivity().getContentResolver();
if (preference == mShowCarrierLabel) {
int value = Integer.parseInt((String) newValue);
updateCarrierLabelSummary(value);
return true;
}
return false;
}
private void updateCarrierLabelSummary(int value) {
Resources res = getResources();
if (value == 0) {
// Carrier Label disabled
mShowCarrierLabel.setSummary(res.getString(R.string.show_carrier_disabled));
} else if (value == 1) {
mShowCarrierLabel.setSummary(res.getString(R.string.show_carrier_keyguard));
} else if (value == 2) {
mShowCarrierLabel.setSummary(res.getString(R.string.show_carrier_statusbar));
} else if (value == 3) {
mShowCarrierLabel.setSummary(res.getString(R.string.show_carrier_enabled));
}
}
public boolean onPreferenceTreeClick(Preference preference) {
ContentResolver resolver = getActivity().getContentResolver();
boolean value;