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

Commit 0def4c45 authored by Daniel Sandler's avatar Daniel Sandler
Browse files

Revert "Add Emergency Info preference to user settings" 

This reverts commit 04013880.

Bug: 26831671
Change-Id: Ibe5ae3c7da400efb389f905b1111f029b6a8bfaf
parent 04013880

res/values/strings.xml

+0 −4
Original line number Diff line number Diff line
@@ -5297,10 +5297,6 @@ 
    <string name="user_enable_calling_and_sms_confirm_title">Turn on phone calls &amp; SMS?</string>

    <!-- Message for confirmation of turning on calls and SMS [CHAR LIMIT=none] -->

    <string name="user_enable_calling_and_sms_confirm_message">Call and SMS history will be shared with this user.</string>

    <!-- Title for the emergency info preference [CHAR LIMIT=40] -->

    <string name="emergency_info_title">Emergency information</string>

    <!-- Description of the emergency info preference [CHAR LIMIT=80] -->

    <string name="emergency_info_subtitle">Accessible through lock screen in the emergency dialer</string>









    <!-- Application Restrictions screen title [CHAR LIMIT=45] -->









    <string name="application_restrictions">Allow apps and content</string>
































res/xml/user_settings.xml



+0
−4






























Original line number
Diff line number
Diff line







@@ -35,9 +35,5 @@







                android:key="add_users_when_locked"









                android:title="@string/user_add_on_lockscreen_menu"









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









        <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



+0
−7






























Original line number
Diff line number
Diff line







@@ -101,7 +101,6 @@ public class UserSettings extends SettingsPreferenceFragment







    private static final String KEY_USER_LIST = "user_list";









    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 int MENU_REMOVE_USER = Menu.FIRST;


















@@ -135,7 +134,6 @@ public class UserSettings extends SettingsPreferenceFragment







    private DimmableIconPreference mAddUser;









    private PreferenceGroup mLockScreenSettings;









    private RestrictedSwitchPreference mAddUserWhenLocked;









    private Preference mEmergencyInfoPreference;









    private int mRemovingUserId = -1;









    private int mAddedUserId = 0;









    private boolean mAddingUser;








@@ -231,8 +229,6 @@ public class UserSettings extends SettingsPreferenceFragment







        }









        mLockScreenSettings = (PreferenceGroup) findPreference("lock_screen_settings");









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









        mEmergencyInfoPreference = findPreference(KEY_EMERGENCY_INFO);









        mEmergencyInfoPreference.setOnPreferenceClickListener(this);









        loadProfile();









        setHasOptionsMenu(true);









        IntentFilter filter = new IntentFilter(Intent.ACTION_USER_REMOVED);








@@ -921,9 +917,6 @@ public class UserSettings extends SettingsPreferenceFragment







            } else {









                onAddUserClicked(USER_TYPE_USER);









            }









        } else if (pref == mEmergencyInfoPreference) {









            Intent intent = new Intent("com.android.emergency.EDIT_EMERGENGY_INFO");









            startActivity(intent);









        }









        return false;









    }