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

Commit fe19bc3d authored by mariagpuyol's avatar mariagpuyol
Browse files

Show emergency info preference for all users 

Change-Id: I8bfcedb8a15c9ca0194f5f526dd288857c19a1de
parent f040f80a

res/xml/user_settings.xml

+4 −4
Original line number Diff line number Diff line
@@ -35,9 +35,9 @@ 
                android:key="add_users_when_locked"

                android:title="@string/user_add_on_lockscreen_menu"

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

    </PreferenceCategory>

    <Preference

        android:key="emergency_info"

        android:title="@string/emergency_info_title"

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

    </PreferenceCategory>

</PreferenceScreen>

src/com/android/settings/users/UserSettings.java

+6 −9
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ public class UserSettings extends SettingsPreferenceFragment 
    private static final String KEY_USER_ME = "user_me";

    private static final String KEY_ADD_USER = "user_add";

    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";
@@ -237,14 +236,6 @@ public class UserSettings extends SettingsPreferenceFragment 
        mLockScreenSettings = (PreferenceGroup) findPreference("lock_screen_settings");

        mAddUserWhenLocked = (RestrictedSwitchPreference) findPreference("add_users_when_locked");

        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();

        setHasOptionsMenu(true);

        IntentFilter filter = new IntentFilter(Intent.ACTION_USER_REMOVED);
@@ -843,6 +834,12 @@ public class UserSettings extends SettingsPreferenceFragment 
            mAddUserWhenLocked.setDisabledByAdmin(

                    mUserCaps.mDisallowAddUser ? mUserCaps.mEnforcedAdmin : null);

        }



        if (emergencyInfoActivityPresent()) {

            mEmergencyInfoPreference.setOnPreferenceClickListener(this);

            mEmergencyInfoPreference.setOrder(Preference.DEFAULT_ORDER);

            preferenceScreen.addPreference(mEmergencyInfoPreference);

        }

    }



    private int getMaxRealUsers() {