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

Update Security & screen lock preference

Browse Source 
- change password category title to Privacy and move Location into it.
- remove Advanced security preference category
- remove SIM card preference category and move the SIM card lock
  preferece down.
- move Encryption and Credential settings to a separate screen.

Bug: 34976707
Test: make RunSettingsRoboTests
Change-Id: Iebaba4a8aad135fa88f163de0b60b488fd9510d0
This commit is contained in:
Doris Ling
2017-02-15 17:49:18 -08:00
parent d72b6cc1e9
commit 81610543a9
11 changed files with 604 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/android/settings/location/LocationSettings.java
View File

@@ -362,23 +362,9 @@ public class LocationSettings extends LocationSettingsBase
return R.string.help_url_location_access;
}
private static int getLocationString(int mode) {
switch (mode) {
case android.provider.Settings.Secure.LOCATION_MODE_OFF:
return R.string.location_mode_location_off_title;
case android.provider.Settings.Secure.LOCATION_MODE_SENSORS_ONLY:
return R.string.location_mode_sensors_only_title;
case android.provider.Settings.Secure.LOCATION_MODE_BATTERY_SAVING:
return R.string.location_mode_battery_saving_title;
case android.provider.Settings.Secure.LOCATION_MODE_HIGH_ACCURACY:
return R.string.location_mode_high_accuracy_title;
}
return 0;
}
@Override
public void onModeChanged(int mode, boolean restricted) {
int modeDescription = getLocationString(mode);
int modeDescription = LocationPreferenceController.getLocationString(mode);
if (modeDescription != 0) {
mLocationMode.setSummary(modeDescription);
}
@@ -486,15 +472,8 @@ public class LocationSettings extends LocationSettingsBase
@Override
public void setListening(boolean listening) {
if (listening) {
int mode = Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF);
if (mode != Settings.Secure.LOCATION_MODE_OFF) {
mSummaryLoader.setSummary(this, mContext.getString(R.string.location_on_summary,
mContext.getString(getLocationString(mode))));
} else {
mSummaryLoader.setSummary(this,
mContext.getString(R.string.location_off_summary));
}
mSummaryLoader.setSummary(
this, LocationPreferenceController.getLocationSummary(mContext));
}
}
}