In MobileNetworkSettings, add divider and "Advanced" button.
Setting style of PreferenceCategory to be the one with divider
above it. Manually add divider above APN preference. Added
expandable "Advanced" button to hide most preferences by default.
Bug: 63133738
Test: Manual
Change-Id: Ied9c025ab7288505262ba0c0222246ee74b30ef2
diff --git a/src/com/android/phone/AdvancedOptionsPreference.java b/src/com/android/phone/AdvancedOptionsPreference.java
new file mode 100644
index 0000000..1987395
--- /dev/null
+++ b/src/com/android/phone/AdvancedOptionsPreference.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone;
+
+import android.content.Context;
+import android.preference.Preference;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.TextView;
+
+/**
+ * Customized preference class representing the "Advanced" button that expands to fields that
+ * are hidden by default.
+ */
+public class AdvancedOptionsPreference extends Preference {
+ public AdvancedOptionsPreference(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ @Override
+ protected void onBindView(View view) {
+ super.onBindView(view);
+
+ setIcon(R.drawable.ic_expand_more);
+ setTitle(R.string.advanced_options_title);
+ TextView summary = view.findViewById(android.R.id.summary);
+ summary.setMaxLines(1);
+ }
+}
diff --git a/src/com/android/phone/GsmUmtsOptions.java b/src/com/android/phone/GsmUmtsOptions.java
index 697fca8..909e9bd 100644
--- a/src/com/android/phone/GsmUmtsOptions.java
+++ b/src/com/android/phone/GsmUmtsOptions.java
@@ -35,13 +35,15 @@
public class GsmUmtsOptions {
private static final String LOG_TAG = "GsmUmtsOptions";
- private PreferenceScreen mButtonAPNExpand;
+ private Preference mButtonAPNExpand;
+ private Preference mCategoryAPNExpand;
private TwoStatePreference mButtonAutoSelect;
private NetworkSelectListPreference mButtonOperatorSelection;
private NetworkOperators mNetworkOperator;
private static final String BUTTON_APN_EXPAND_KEY = "button_apn_key";
+ private static final String CATEGORY_APN_EXPAND_KEY = "category_apn_key";
private static final String BUTTON_CARRIER_SETTINGS_KEY = "carrier_settings_key";
public static final String EXTRA_SUB_ID = "sub_id";
@@ -61,7 +63,8 @@
protected void create() {
mPrefFragment.addPreferencesFromResource(R.xml.gsm_umts_options);
- mButtonAPNExpand = (PreferenceScreen) mPrefScreen.findPreference(BUTTON_APN_EXPAND_KEY);
+ mButtonAPNExpand = mPrefScreen.findPreference(BUTTON_APN_EXPAND_KEY);
+ mCategoryAPNExpand = mPrefScreen.findPreference(CATEGORY_APN_EXPAND_KEY);
mNetworkOperator = (NetworkOperators) mPrefScreen
.findPreference(NetworkOperators.CATEGORY_NETWORK_OPERATORS_KEY);
@@ -71,7 +74,7 @@
boolean removedNetworkOperatorsCategory = false;
if (PhoneFactory.getDefaultPhone().getPhoneType() != PhoneConstants.PHONE_TYPE_GSM) {
log("Not a GSM phone");
- mButtonAPNExpand.setEnabled(false);
+ mCategoryAPNExpand.setEnabled(false);
mNetworkOperator.setEnabled(false);
} else {
log("Not a CDMA phone");
@@ -85,8 +88,7 @@
// Note: these settings used to be controlled with overlays in
// Telephony/res/values/config.xml
if (!carrierConfig.getBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL)
- && mButtonAPNExpand != null) {
- mPrefScreen.removePreference(mButtonAPNExpand);
+ && mCategoryAPNExpand != null) {
removedAPNExpand = true;
}
if (!carrierConfig.getBoolean(
@@ -134,6 +136,8 @@
return true;
}
});
+ } else {
+ mPrefScreen.removePreference(mCategoryAPNExpand);
}
if (!removedNetworkOperatorsCategory) {
diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index 44506b7..f0f71a5 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -147,16 +147,17 @@
private static final String BUTTON_ENABLED_NETWORKS_KEY = "enabled_networks_key";
private static final String BUTTON_4G_LTE_KEY = "enhanced_4g_lte";
private static final String BUTTON_CELL_BROADCAST_SETTINGS = "cell_broadcast_settings";
- private static final String BUTTON_APN_EXPAND_KEY = "button_apn_key";
private static final String BUTTON_CARRIER_SETTINGS_KEY = "carrier_settings_key";
private static final String BUTTON_CDMA_SYSTEM_SELECT_KEY = "cdma_system_select_key";
private static final String BUTTON_CARRIER_SETTINGS_EUICC_KEY =
"carrier_settings_euicc_key";
private static final String BUTTON_WIFI_CALLING_KEY = "wifi_calling_key";
private static final String BUTTON_VIDEO_CALLING_KEY = "video_calling_key";
- private static final String CATEGORY_CALLING_KEY = "calling";
private static final String BUTTON_MOBILE_DATA_ENABLE_KEY = "mobile_data_enable";
private static final String BUTTON_DATA_USAGE_KEY = "data_usage_summary";
+ private static final String BUTTON_ADVANCED_OPTIONS_KEY = "advanced_options";
+ private static final String CATEGORY_CALLING_KEY = "calling";
+ private static final String CATEGORY_APN_EXPAND_KEY = "category_apn_key";
private final BroadcastReceiver mPhoneChangeReceiver = new PhoneChangeReceiver();
@@ -167,10 +168,14 @@
private static final String UP_ACTIVITY_CLASS =
"com.android.settings.Settings$WirelessSettingsActivity";
+ //Information that needs to save into Bundle.
+ private static final String EXPAND_ADVANCED_FIELDS = "expand_advanced_fields";
+
private SubscriptionManager mSubscriptionManager;
private TelephonyManager mTelephonyManager;
//UI objects
+ private AdvancedOptionsPreference mAdvancedOptions;
private ListPreference mButtonPreferredNetworkMode;
private ListPreference mButtonEnabledNetworks;
private RestrictedSwitchPreference mButtonDataRoam;
@@ -191,6 +196,7 @@
private Phone mPhone;
private MyHandler mHandler;
private boolean mOkClicked;
+ private boolean mExpandAdvancedFields;
// We assume the the value returned by mTabHost.getCurrentTab() == slotId
private TabHost mTabHost;
@@ -354,6 +360,10 @@
} else if (preference == mWiFiCallingPref || preference == mVideoCallingPref
|| preference == mMobileDataPref || preference == mDataUsagePref) {
return false;
+ } else if (preference == mAdvancedOptions) {
+ mExpandAdvancedFields = true;
+ updateBody();
+ return true;
} else {
// if the button is anything but the simple toggle preference,
// we'll need to disable all preferences to reject all click
@@ -529,6 +539,15 @@
}
@Override
+ public void onSaveInstanceState(Bundle outState) {
+ super.onSaveInstanceState(outState);
+
+ // If advanced fields are already expanded, we save it and expand it
+ // when it's re-created.
+ outState.putBoolean(EXPAND_ADVANCED_FIELDS, mExpandAdvancedFields);
+ }
+
+ @Override
public void onCreate(Bundle icicle) {
Log.i(LOG_TAG, "onCreate:+");
super.onCreate(icicle);
@@ -545,6 +564,10 @@
mTelephonyManager = (TelephonyManager) activity.getSystemService(
Context.TELEPHONY_SERVICE);
+ if (icicle != null) {
+ mExpandAdvancedFields = icicle.getBoolean(EXPAND_ADVANCED_FIELDS, false);
+ }
+
bindNetworkQueryService();
if (mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)) {
@@ -583,6 +606,8 @@
BUTTON_PREFERED_NETWORK_MODE);
mButtonEnabledNetworks = (ListPreference) prefSet.findPreference(
BUTTON_ENABLED_NETWORKS_KEY);
+ mAdvancedOptions = (AdvancedOptionsPreference) prefSet.findPreference(
+ BUTTON_ADVANCED_OPTIONS_KEY);
mButtonDataRoam.setOnPreferenceChangeListener(this);
mLteDataServicePref = prefSet.findPreference(BUTTON_CDMA_LTE_DATA_SERVICE_KEY);
@@ -594,6 +619,8 @@
int max = mSubscriptionManager.getActiveSubscriptionInfoCountMax();
mActiveSubInfos = new ArrayList<SubscriptionInfo>(max);
+ setAndvancedButtonSummary();
+
IntentFilter intentFilter = new IntentFilter(
TelephonyIntents.ACTION_RADIO_TECHNOLOGY_CHANGED);
activity.registerReceiver(mPhoneChangeReceiver, intentFilter);
@@ -693,44 +720,86 @@
cr, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;
}
+ private void updateBodyBasicFields(Activity activity, PreferenceScreen prefSet,
+ int phoneSubId, boolean hasActiveSubscriptions) {
+ Context context = activity.getApplicationContext();
+
+ prefSet.addPreference(mMobileDataPref);
+ prefSet.addPreference(mButtonDataRoam);
+ prefSet.addPreference(mDataUsagePref);
+
+ // Customized preferences needs to be initialized with subId.
+ mMobileDataPref.initialize(phoneSubId);
+ mDataUsagePref.initialize(phoneSubId);
+
+ // Initialize states of mButtonDataRoam.
+ mButtonDataRoam.setChecked(mPhone.getDataRoamingEnabled());
+ mButtonDataRoam.setDisabledByAdmin(false);
+ if (mButtonDataRoam.isEnabled()) {
+ if (RestrictedLockUtils.hasBaseUserRestriction(context,
+ UserManager.DISALLOW_DATA_ROAMING, UserHandle.myUserId())) {
+ mButtonDataRoam.setEnabled(false);
+ } else {
+ mButtonDataRoam.checkRestrictionAndSetDisabled(
+ UserManager.DISALLOW_DATA_ROAMING);
+ }
+ }
+
+ mMobileDataPref.setEnabled(hasActiveSubscriptions);
+ mButtonDataRoam.setEnabled(hasActiveSubscriptions);
+ mDataUsagePref.setEnabled(hasActiveSubscriptions);
+ }
+
private void updateBody() {
final Activity activity = getActivity();
+ final PreferenceScreen prefSet = getPreferenceScreen();
+ final int phoneSubId = mPhone.getSubId();
+ final boolean hasActiveSubscriptions = hasActiveSubscriptions();
+
if (activity == null || activity.isDestroyed()) {
Log.e(LOG_TAG, "updateBody with no valid activity.");
return;
}
- Context context = activity.getApplicationContext();
- PreferenceScreen prefSet = getPreferenceScreen();
+
+ if (prefSet == null) {
+ Log.e(LOG_TAG, "updateBody with no null prefSet.");
+ return;
+ }
+
+ prefSet.removeAll();
+
+ updateBodyBasicFields(activity, prefSet, phoneSubId, hasActiveSubscriptions);
+
+ if (mExpandAdvancedFields) {
+ updateBodyAdvancedFields(activity, prefSet, phoneSubId, hasActiveSubscriptions);
+ } else {
+ prefSet.addPreference(mAdvancedOptions);
+ mAdvancedOptions.setEnabled(hasActiveSubscriptions);
+ }
+ }
+
+ private void updateBodyAdvancedFields(Activity activity, PreferenceScreen prefSet,
+ int phoneSubId, boolean hasActiveSubscriptions) {
boolean isLteOnCdma = mPhone.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE;
- final int phoneSubId = mPhone.getSubId();
if (DBG) {
log("updateBody: isLteOnCdma=" + isLteOnCdma + " phoneSubId=" + phoneSubId);
}
- if (prefSet != null) {
- prefSet.removeAll();
- prefSet.addPreference(mButtonDataRoam);
- prefSet.addPreference(mButtonPreferredNetworkMode);
- prefSet.addPreference(mButtonEnabledNetworks);
- prefSet.addPreference(mButton4glte);
+ prefSet.addPreference(mButtonPreferredNetworkMode);
+ prefSet.addPreference(mButtonEnabledNetworks);
+ prefSet.addPreference(mButton4glte);
- mMobileDataPref.initialize(phoneSubId);
- prefSet.addPreference(mMobileDataPref);
- mDataUsagePref.initialize(phoneSubId);
- prefSet.addPreference(mDataUsagePref);
-
- if (showEuiccSettings()) {
- prefSet.addPreference(mEuiccSettingsPref);
- if (TextUtils.isEmpty(mTelephonyManager.getLine1Number())) {
- mEuiccSettingsPref.setSummary(null);
- } else {
- mEuiccSettingsPref.setSummary(
- getEuiccSettingsSummary(
- mTelephonyManager.getSimOperatorName(),
- PhoneNumberUtils.formatNumber(
- mTelephonyManager.getLine1Number())));
- }
+ if (showEuiccSettings()) {
+ prefSet.addPreference(mEuiccSettingsPref);
+ if (TextUtils.isEmpty(mTelephonyManager.getLine1Number())) {
+ mEuiccSettingsPref.setSummary(null);
+ } else {
+ mEuiccSettingsPref.setSummary(
+ getEuiccSettingsSummary(
+ mTelephonyManager.getSimOperatorName(),
+ PhoneNumberUtils.formatNumber(
+ mTelephonyManager.getLine1Number())));
}
}
@@ -921,7 +990,6 @@
}
// Get the networkMode from Settings.System and displays it
- mButtonDataRoam.setChecked(mPhone.getDataRoamingEnabled());
mButtonEnabledNetworks.setValue(Integer.toString(settingsNetworkMode));
mButtonPreferredNetworkMode.setValue(Integer.toString(settingsNetworkMode));
UpdatePreferredNetworkModeSummary(settingsNetworkMode);
@@ -939,7 +1007,6 @@
* but you do need to remember that this all needs to work when subscriptions
* change dynamically such as when hot swapping sims.
*/
- boolean hasActiveSubscriptions = hasActiveSubscriptions();
boolean canChange4glte =
(mTelephonyManager.getCallState() == TelephonyManager.CALL_STATE_IDLE)
&& ImsManager.isNonTtyOrTtyOnVolteEnabled(
@@ -951,31 +1018,19 @@
int enhanced4glteModeTitleId = useVariant4glteTitle ?
R.string.enhanced_4g_lte_mode_title_variant :
R.string.enhanced_4g_lte_mode_title;
- mButtonDataRoam.setDisabledByAdmin(false);
- mButtonDataRoam.setEnabled(hasActiveSubscriptions);
- if (mButtonDataRoam.isEnabled()) {
- if (RestrictedLockUtils.hasBaseUserRestriction(context,
- UserManager.DISALLOW_DATA_ROAMING, UserHandle.myUserId())) {
- mButtonDataRoam.setEnabled(false);
- } else {
- mButtonDataRoam.checkRestrictionAndSetDisabled(
- UserManager.DISALLOW_DATA_ROAMING);
- }
- }
+
mButtonPreferredNetworkMode.setEnabled(hasActiveSubscriptions);
mButtonEnabledNetworks.setEnabled(hasActiveSubscriptions);
mButton4glte.setTitle(enhanced4glteModeTitleId);
mButton4glte.setEnabled(hasActiveSubscriptions && canChange4glte);
mLteDataServicePref.setEnabled(hasActiveSubscriptions);
- mMobileDataPref.setEnabled(hasActiveSubscriptions);
- mDataUsagePref.setEnabled(hasActiveSubscriptions);
Preference ps;
PreferenceScreen root = getPreferenceScreen();
ps = findPreference(BUTTON_CELL_BROADCAST_SETTINGS);
if (ps != null) {
ps.setEnabled(hasActiveSubscriptions);
}
- ps = findPreference(BUTTON_APN_EXPAND_KEY);
+ ps = findPreference(CATEGORY_APN_EXPAND_KEY);
if (ps != null) {
ps.setEnabled(hasActiveSubscriptions);
}
@@ -1656,8 +1711,8 @@
mGsmUmtsOptions = new GsmUmtsOptions(this, prefSet, mPhone.getSubId(),
mNetworkQueryService);
}
- PreferenceScreen apnExpand =
- (PreferenceScreen) prefSet.findPreference(BUTTON_APN_EXPAND_KEY);
+ PreferenceCategory apnExpand =
+ (PreferenceCategory) prefSet.findPreference(CATEGORY_APN_EXPAND_KEY);
PreferenceCategory networkOperatorCategory =
(PreferenceCategory) prefSet.findPreference(
NetworkOperators.CATEGORY_NETWORK_OPERATORS_KEY);
@@ -1725,6 +1780,27 @@
}
// TODO: add Metrics constants for other preferences and send events here accordingly.
}
+
+ private void setAndvancedButtonSummary() {
+ if (mAdvancedOptions == null) {
+ return;
+ }
+
+ StringBuilder summary = new StringBuilder();
+ summary.append(mButton4glte.getTitle());
+ summary.append(", ");
+ summary.append(mButtonPreferredNetworkMode.getTitle());
+ summary.append(", ");
+ summary.append(mButtonEnabledNetworks.getTitle());
+ summary.append(", ");
+ summary.append(mEuiccSettingsPref.getTitle());
+ summary.append(", ");
+ summary.append(mWiFiCallingPref.getTitle());
+ summary.append(", ");
+ summary.append(mVideoCallingPref.getTitle());
+ mAdvancedOptions.setSummary(summary.toString());
+ }
+
}
}