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

am 865ca2a2: am 17141200: Final cleanup of "password required" dialog

Browse Source 
* commit '865ca2a2efb4ebec3b6ddc89401f8544515cd43a':
  Final cleanup of "password required" dialog
This commit is contained in:
Andy Stadler
2011-01-31 11:05:50 -08:00
committed by Android Git Automerger
parent 5fab237226 865ca2a2ef
commit 69ba9331ad
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -630,6 +630,12 @@
<!-- Warning string that will be displayed when encryption cannot be started --> <!-- Warning string that will be displayed when encryption cannot be started -->
<string name="crypt_keeper_unplugged_text">Please plug in your charger and try again.</string> <string name="crypt_keeper_unplugged_text">Please plug in your charger and try again.</string>
<!-- Dialog title, shown when encryption cannot proceed because a PIN/Password is needed -->
<string name="crypt_keeper_dialog_need_password_title">No lock screen PIN or password</string>
<!-- Dialog message, shown when encryption cannot proceed because a PIN/Password is needed -->
<string name="crypt_keeper_dialog_need_password_message">You must set a lock screen PIN or
password before you can start encryption.</string>
<!-- Title of the final confirmation screen before starting device encryption --> <!-- Title of the final confirmation screen before starting device encryption -->
<string name="crypt_keeper_confirm_title">Confirm encryption</string> <string name="crypt_keeper_confirm_title">Confirm encryption</string>
<!-- Warning text in the final confirmation screen before starting device encryption --> <!-- Warning text in the final confirmation screen before starting device encryption -->

6
src/com/android/settings/CryptKeeperSettings.java
View File

@@ -91,11 +91,11 @@ public class CryptKeeperSettings extends Fragment {
public void onClick(View v) { public void onClick(View v) {
if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) { if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
// TODO remove with proper flow // TODO replace (or follow) this dialog with an explicit launch into password UI
new AlertDialog.Builder(getActivity()) new AlertDialog.Builder(getActivity())
.setTitle("No password set") .setTitle(R.string.crypt_keeper_dialog_need_password_title)
.setIcon(android.R.drawable.ic_dialog_alert) .setIcon(android.R.drawable.ic_dialog_alert)
.setMessage("Before you enable encryption you must set a device password.") .setMessage(R.string.crypt_keeper_dialog_need_password_message)
.setPositiveButton(android.R.string.ok, null) .setPositiveButton(android.R.string.ok, null)
.create() .create()
.show(); .show();