Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add configs to display/hide a few tiles in device info page

Browse Source 
- Displaying/hiding Emergency info, branded account, device header
  widget are now driven by config flags
- Also refactored controllers to use BasePreferenceController

Change-Id: Ie601ebf689e0744c6a05a2cca5513fa43ef355e0
Fixes: 119607340
Test: robotests
This commit is contained in:
Fan Zhang
2019-01-28 13:10:32 -08:00
parent c2448a1e8c
commit 5c3301b0ab
11 changed files with 100 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java
View File

@@ -43,8 +43,6 @@ public class DeviceNamePreferenceController extends BasePreferenceController
LifecycleObserver,
OnSaveInstanceState,
OnCreate {
private static final String PREF_KEY = "device_name";
public static final int DEVICE_NAME_SET_WARNING_ID = 1;
private static final String KEY_PENDING_DEVICE_NAME = "key_pending_device_name";
private String mDeviceName;
protected WifiManager mWifiManager;
@@ -54,8 +52,8 @@ public class DeviceNamePreferenceController extends BasePreferenceController
private DeviceNamePreferenceHost mHost;
private String mPendingDeviceName;
public DeviceNamePreferenceController(Context context) {
super(context, PREF_KEY);
public DeviceNamePreferenceController(Context context, String key) {
super(context, key);
mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
mWifiDeviceNameTextValidator = new WifiDeviceNameTextValidator();
@@ -67,7 +65,7 @@ public class DeviceNamePreferenceController extends BasePreferenceController
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mPreference = (ValidatedEditTextPreference) screen.findPreference(PREF_KEY);
mPreference = screen.findPreference(getPreferenceKey());
final CharSequence deviceName = getSummary();
mPreference.setSummary(deviceName);
mPreference.setText(deviceName.toString());
@@ -94,11 +92,6 @@ public class DeviceNamePreferenceController extends BasePreferenceController
: UNSUPPORTED_ON_DEVICE;
}
@Override
public String getPreferenceKey() {
return PREF_KEY;
}
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
mPendingDeviceName = (String) newValue;