Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b55c80f2 authored by Fang Yunong's avatar Fang Yunong Committed by Linux Build Service Account
Browse files

Settings: Display network name on statusbar 

Display operator name (network name) on the statusbar (top-left)
to meet some carriers' requirement. Here the change is to
provide a UI to turn on/off this feature.--nporting

CRs-Fixed: 1039313
Change-Id: Ia3eaaca3cf84b7c8305387f1d5cb5132825aa82d
parent 77a62a97

res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -7550,4 +7550,10 @@ 
    <string name="select_sim_card">Select SIM card</string>









    <string name="mbn_version">MBN version</string>









    <!-- show security alert for open type end -->









    <string name="voice_over_lte">Voice over LTE</string>

















    <string name="network_operator_display_title">Show Network Operator</string>









    <string name="keywords_network_name_display">network name displayed</string>









    <string name="network_name_displayed_summary">Show network name on status bar</string>









</resources>

























res/xml/display_settings.xml



+7
−0






























Original line number
Diff line number
Diff line







@@ -32,6 +32,13 @@







                settings:keywords="@string/keywords_display_auto_brightness"









                android:summary="@string/auto_brightness_summary" />



















        <SwitchPreference









                android:key="network_operator_display"









                android:title="@string/network_operator_display_title"









                settings:keywords="@string/keywords_network_name_display"









                android:summary="@string/network_name_displayed_summary"









                android:persistent="false" />



















        <!-- Hide night mode for now









        <ListPreference









            android:key="night_mode"
































src/com/android/settings/DisplaySettings.java



+26
−0






























Original line number
Diff line number
Diff line







@@ -90,6 +90,10 @@ public class DisplaySettings extends SettingsPreferenceFragment implements







            = "camera_double_tap_power_gesture";









    private static final String KEY_WALLPAPER = "wallpaper";









    private static final String KEY_VR_DISPLAY_PREF = "vr_display_pref";









    private static final String KEY_NETWORK_NAME_DISPLAYED = "network_operator_display";









    private static final String SHOW_NETWORK_NAME_MODE = "show_network_name_mode";









    private static final int SHOW_NETWORK_NAME_ON = 1;









    private static final int SHOW_NETWORK_NAME_OFF = 0;



















    private Preference mFontSizePref;


















@@ -102,6 +106,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements







    private SwitchPreference mAutoBrightnessPreference;









    private SwitchPreference mCameraGesturePreference;









    private SwitchPreference mCameraDoubleTapPowerGesturePreference;









    private SwitchPreference mNetworkNameDisplayedPreference = null;



















    @Override









    protected int getMetricsCategory() {








@@ -134,6 +139,16 @@ public class DisplaySettings extends SettingsPreferenceFragment implements







            removePreference(KEY_AUTO_BRIGHTNESS);









        }



















        boolean enableOperatorName = this.getResources().









                getBoolean(com.android.internal.R.bool.config_showOperatorNameInStatusBar);









        if(enableOperatorName) {









            mNetworkNameDisplayedPreference = (SwitchPreference) findPreference(









                KEY_NETWORK_NAME_DISPLAYED);









            mNetworkNameDisplayedPreference.setOnPreferenceChangeListener(this);









        } else {









            removePreference(KEY_NETWORK_NAME_DISPLAYED);









        }



















        if (isLiftToWakeAvailable(activity)) {









            mLiftToWakePreference = (SwitchPreference) findPreference(KEY_LIFT_TO_WAKE);









            mLiftToWakePreference.setOnPreferenceChangeListener(this);








@@ -359,6 +374,12 @@ public class DisplaySettings extends SettingsPreferenceFragment implements







            mAutoBrightnessPreference.setChecked(brightnessMode != SCREEN_BRIGHTNESS_MODE_MANUAL);









        }



















        if (mNetworkNameDisplayedPreference != null) {









            int showNetworkNameMode = Settings.System.getInt(getContentResolver(),









                    SHOW_NETWORK_NAME_MODE, SHOW_NETWORK_NAME_ON); //default is ON









            mNetworkNameDisplayedPreference.setChecked(showNetworkNameMode != 0);









        }



















        // Update lift-to-wake if it is available.









        if (mLiftToWakePreference != null) {









            int value = Settings.Secure.getInt(getContentResolver(), WAKE_GESTURE_ENABLED, 0);








@@ -427,6 +448,11 @@ public class DisplaySettings extends SettingsPreferenceFragment implements







            Settings.System.putInt(getContentResolver(), SCREEN_BRIGHTNESS_MODE,









                    auto ? SCREEN_BRIGHTNESS_MODE_AUTOMATIC : SCREEN_BRIGHTNESS_MODE_MANUAL);









        }









        if (preference == mNetworkNameDisplayedPreference) {









            boolean isShow = (Boolean) objValue;









            Settings.System.putInt(getContentResolver(), SHOW_NETWORK_NAME_MODE,









                    isShow ? SHOW_NETWORK_NAME_ON : SHOW_NETWORK_NAME_OFF);









        }









        if (preference == mLiftToWakePreference) {









            boolean value = (Boolean) objValue;









            Settings.Secure.putInt(getContentResolver(), WAKE_GESTURE_ENABLED, value ? 1 : 0);