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

Merge "Show emergency info preference for all users" into nyc-dev

Browse Source
This commit is contained in:
Maria Garcia Puyol
2016-02-18 19:19:04 +00:00
committed by Android (Google) Code Review
parent fd267eb2ed fe19bc3d4b
commit adcec744b2
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/user_settings.xml
View File

@@ -35,9 +35,9 @@
android:key="add_users_when_locked" android:key="add_users_when_locked"
android:title="@string/user_add_on_lockscreen_menu" android:title="@string/user_add_on_lockscreen_menu"
android:summary="@string/user_add_on_lockscreen_menu_summary" /> android:summary="@string/user_add_on_lockscreen_menu_summary" />
</PreferenceCategory>
<Preference <Preference
android:key="emergency_info" android:key="emergency_info"
android:title="@string/emergency_info_title" android:title="@string/emergency_info_title"
android:summary="@string/emergency_info_subtitle"/> android:summary="@string/emergency_info_subtitle"/>
</PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>

15
src/com/android/settings/users/UserSettings.java
View File

@@ -104,7 +104,6 @@ public class UserSettings extends SettingsPreferenceFragment
private static final String KEY_USER_ME = "user_me"; private static final String KEY_USER_ME = "user_me";
private static final String KEY_ADD_USER = "user_add"; private static final String KEY_ADD_USER = "user_add";
private static final String KEY_EMERGENCY_INFO = "emergency_info"; private static final String KEY_EMERGENCY_INFO = "emergency_info";
private static final String KEY_LOCK_SCREEN_SETTINGS = "lock_screen_settings";
private static final String ACTION_EDIT_EMERGENCY_INFO = "android.settings.EDIT_EMERGENGY_INFO"; private static final String ACTION_EDIT_EMERGENCY_INFO = "android.settings.EDIT_EMERGENGY_INFO";
@@ -237,14 +236,6 @@ public class UserSettings extends SettingsPreferenceFragment
mLockScreenSettings = (PreferenceGroup) findPreference("lock_screen_settings"); mLockScreenSettings = (PreferenceGroup) findPreference("lock_screen_settings");
mAddUserWhenLocked = (RestrictedSwitchPreference) findPreference("add_users_when_locked"); mAddUserWhenLocked = (RestrictedSwitchPreference) findPreference("add_users_when_locked");
mEmergencyInfoPreference = findPreference(KEY_EMERGENCY_INFO); mEmergencyInfoPreference = findPreference(KEY_EMERGENCY_INFO);
if(emergencyInfoActivityPresent()) {
mEmergencyInfoPreference.setOnPreferenceClickListener(this);
} else {
// Remove this view if the emergency info package is not found.
PreferenceCategory lockScreenSettingsCategory =
(PreferenceCategory) findPreference(KEY_LOCK_SCREEN_SETTINGS);
lockScreenSettingsCategory.removePreference(mEmergencyInfoPreference);
}
loadProfile(); loadProfile();
setHasOptionsMenu(true); setHasOptionsMenu(true);
IntentFilter filter = new IntentFilter(Intent.ACTION_USER_REMOVED); IntentFilter filter = new IntentFilter(Intent.ACTION_USER_REMOVED);
@@ -843,6 +834,12 @@ public class UserSettings extends SettingsPreferenceFragment
mAddUserWhenLocked.setDisabledByAdmin( mAddUserWhenLocked.setDisabledByAdmin(
mUserCaps.mDisallowAddUser ? mUserCaps.mEnforcedAdmin : null); mUserCaps.mDisallowAddUser ? mUserCaps.mEnforcedAdmin : null);
} }
if (emergencyInfoActivityPresent()) {
mEmergencyInfoPreference.setOnPreferenceClickListener(this);
mEmergencyInfoPreference.setOrder(Preference.DEFAULT_ORDER);
preferenceScreen.addPreference(mEmergencyInfoPreference);
}
} }
private int getMaxRealUsers() { private int getMaxRealUsers() {