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

Merge "Revert "Dialog for emergency info"" into nyc-dev

Browse Source
This commit is contained in:
Maria Garcia Puyol
2016-03-18 15:06:02 +00:00
committed by Android (Google) Code Review
parent 47a9d4f70c da497f26d7
commit c35b08b4b3
3 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -5392,10 +5392,6 @@
<string name="user_exit_guest_confirm_message">All apps and data in this session will be deleted.</string> <string name="user_exit_guest_confirm_message">All apps and data in this session will be deleted.</string>
<!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] --> <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
<string name="user_exit_guest_dialog_remove">Remove</string> <string name="user_exit_guest_dialog_remove">Remove</string>
<!-- Message of dialog to user to confirm that he understands that emergency information is shown in emergency dialer [CHAR LIMIT=none] -->
<string name="user_emergency_info_consent">Information you enter here can help first responders in an emergency. It is stored on your device only, but anyone can read it from the emergency dialer without unlocking your phone.</string>
<!-- Label for button in confirmation dialog when the user clicks on emergency information [CHAR LIMIT=35] -->
<string name="emergency_info_continue">Continue</string>
<!-- Title of preference to enable calling[CHAR LIMIT=40] --> <!-- Title of preference to enable calling[CHAR LIMIT=40] -->
<string name="user_enable_calling">Turn on phone calls</string> <string name="user_enable_calling">Turn on phone calls</string>
@@ -5413,6 +5409,8 @@
<string name="user_enable_calling_and_sms_confirm_message">Call and SMS history will be shared with this user.</string> <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] --> <!-- Title for the emergency info preference [CHAR LIMIT=40] -->
<string name="emergency_info_title">Emergency information</string> <string name="emergency_info_title">Emergency information</string>
<!-- Description of the emergency info preference [CHAR LIMIT=none] -->
<string name="emergency_info_subtitle">Accessible by anyone from the emergency dialer without unlocking your phone</string>
<!-- Application Restrictions screen title [CHAR LIMIT=45] --> <!-- Application Restrictions screen title [CHAR LIMIT=45] -->
<string name="application_restrictions">Allow apps and content</string> <string name="application_restrictions">Allow apps and content</string>

3
res/xml/user_settings.xml
View File

@@ -38,5 +38,6 @@
</PreferenceCategory> </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"/>
</PreferenceScreen> </PreferenceScreen>

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

@@ -115,7 +115,6 @@ public class UserSettings extends SettingsPreferenceFragment
private static final int DIALOG_NEED_LOCKSCREEN = 7; private static final int DIALOG_NEED_LOCKSCREEN = 7;
private static final int DIALOG_CONFIRM_EXIT_GUEST = 8; private static final int DIALOG_CONFIRM_EXIT_GUEST = 8;
private static final int DIALOG_USER_PROFILE_EDITOR = 9; private static final int DIALOG_USER_PROFILE_EDITOR = 9;
private static final int DIALOG_EMERGENCY_INFO_CONSENT = 10;
private static final int MESSAGE_UPDATE_LIST = 1; private static final int MESSAGE_UPDATE_LIST = 1;
private static final int MESSAGE_SETUP_USER = 2; private static final int MESSAGE_SETUP_USER = 2;
@@ -609,22 +608,6 @@ public class UserSettings extends SettingsPreferenceFragment
android.os.Process.myUserHandle()); android.os.Process.myUserHandle());
return dlg; return dlg;
} }
case DIALOG_EMERGENCY_INFO_CONSENT : {
Dialog dlg = new AlertDialog.Builder(context)
.setTitle(R.string.emergency_info_title)
.setMessage(R.string.user_emergency_info_consent)
.setPositiveButton(R.string.emergency_info_continue,
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Intent intent = new Intent(ACTION_EDIT_EMERGENCY_INFO);
startActivity(intent);
}
})
.setNegativeButton(android.R.string.cancel, null)
.create();
return dlg;
}
default: default:
return null; return null;
} }
@@ -966,7 +949,8 @@ public class UserSettings extends SettingsPreferenceFragment
onAddUserClicked(USER_TYPE_USER); onAddUserClicked(USER_TYPE_USER);
} }
} else if (pref == mEmergencyInfoPreference) { } else if (pref == mEmergencyInfoPreference) {
showDialog(DIALOG_EMERGENCY_INFO_CONSENT); Intent intent = new Intent(ACTION_EDIT_EMERGENCY_INFO);
startActivity(intent);
} }
return false; return false;
} }