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

Add backup password setting UI

Browse Source 
Bug 4901637

Change-Id: I515f1475d3675285a830b4b5ddd1f011f1b56e3a
This commit is contained in:
Christopher Tate
2011-07-25 12:09:10 -07:00
parent 95ce1898c5
commit 4f33878f20
6 changed files with 244 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
AndroidManifest.xml
View File

@@ -639,6 +639,11 @@
android:resource="@id/privacy_settings" />
</activity>
<activity android:name="SetFullBackupPassword"
android:theme="@android:style/Theme.Holo.DialogWhenLarge"
android:exported="false">
</activity>
<activity android:name="CredentialStorage"
android:theme="@style/Transparent"
android:configChanges="orientation|keyboardHidden|screenSize">

83
res/layout/set_backup_pw.xml Normal file
View File

@@ -0,0 +1,83 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2011 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="16dip"
>
<TextView
android:id="@+id/prompt1"
android:text="@string/current_backup_pw_prompt"
android:layout_height="wrap_content"
android:layout_width="wrap_content" />
<EditText
android:id="@+id/current_backup_pw"
android:layout_below="@id/prompt1"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:singleLine="true"
android:password="true" />
<TextView
android:id="@+id/prompt2"
android:layout_below="@id/current_backup_pw"
android:text="@string/new_backup_pw_prompt"
android:layout_height="wrap_content"
android:layout_width="wrap_content" />
<EditText
android:id="@+id/new_backup_pw"
android:layout_below="@id/prompt2"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:singleLine="true"
android:password="true" />
<TextView
android:id="@+id/prompt3"
android:layout_below="@id/new_backup_pw"
android:text="@string/confirm_new_backup_pw_prompt"
android:layout_height="wrap_content"
android:layout_width="wrap_content" />
<EditText
android:id="@+id/confirm_new_backup_pw"
android:layout_below="@id/prompt3"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:singleLine="true"
android:password="true" />
<Button
android:id="@+id/backup_pw_cancel_button"
android:layout_below="@id/confirm_new_backup_pw"
android:text="@string/backup_pw_cancel_button_text"
android:layout_height="wrap_content"
android:layout_width="wrap_content" />
<Button
android:id="@+id/backup_pw_set_button"
android:layout_below="@id/confirm_new_backup_pw"
android:layout_toRightOf="@id/backup_pw_cancel_button"
android:text="@string/backup_pw_set_button_text"
android:layout_height="wrap_content"
android:layout_width="wrap_content" />
</RelativeLayout>

21
res/values/strings.xml
View File

@@ -3080,6 +3080,14 @@ found in the list of installed applications.</string>
<string name="auto_restore_title">Automatic restore</string>
<!-- Summary text of the "automatic restore" setting -->
<string name="auto_restore_summary">If I reinstall an application, restore backed up settings or other data</string>
<!-- Local backup password menu title [CHAR LIMIT=25] -->
<string name="local_backup_password_title">Local backup password</string>
<!-- Summary text of the "local backup password" setting when the user has not supplied a password -->
<string name="local_backup_password_summary_none">Local full backups are not currently protected.</string>
<!-- Summary text of the "local backup password" setting when the user has already supplied a password -->
<string name="local_backup_password_summary_change">Select to change or remove the password for local full backups</string>
<!-- Dialog title for confirmation to erase backup data from server -->
<string name="backup_erase_dialog_title">Backup</string>
<!-- Dialog title for confirmation to erase backup data from server -->
@@ -3593,4 +3601,17 @@ found in the list of installed applications.</string>
<!-- Title for spelling correction settings -->
<string name="spellcheckers_settings_title">Spelling correction</string>
<!-- Prompt for the user to enter their current full-backup password -->
<string name="current_backup_pw_prompt">Enter your current full backup password here</string>
<!-- Prompt for the user to enter a new full-backup password -->
<string name="new_backup_pw_prompt">Enter a new password for full backups here</string>
<!-- Prompt for the user to confirm the new full-backup password by re-entering it -->
<string name="confirm_new_backup_pw_prompt">Please re-enter your new full backup password here</string>
<!-- Button label for setting the user's new full-backup password -->
<string name="backup_pw_set_button_text">Set backup password</string>
<!-- Button label for cancelling the new-password operation and retaining the user's previous full-backup password -->
<string name="backup_pw_cancel_button_text">Cancel</string>
</resources>

12
res/xml/privacy_settings.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2009 The Android Open Source Project
<!-- Copyright (C) 2009-2011 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -38,6 +38,16 @@
android:title="@string/auto_restore_title"
android:summary="@string/auto_restore_summary"
android:persistent="false" />
<PreferenceScreen
android:key="local_backup_password"
android:title="@string/local_backup_password_title"
android:summary="@string/local_backup_password_summary_none"
android:persistent="false" >
<intent
android:action="android.settings.privacy.SET_FULL_BACKUP_PASSWORD"
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.SetFullBackupPassword" />
</PreferenceScreen>
</PreferenceCategory>
<PreferenceCategory

17
src/com/android/settings/PrivacySettings.java
View File

@@ -43,11 +43,13 @@ public class PrivacySettings extends SettingsPreferenceFragment implements
private static final String BACKUP_DATA = "backup_data";
private static final String AUTO_RESTORE = "auto_restore";
private static final String CONFIGURE_ACCOUNT = "configure_account";
private static final String LOCAL_BACKUP_PASSWORD = "local_backup_password";
private IBackupManager mBackupManager;
private CheckBoxPreference mBackup;
private CheckBoxPreference mAutoRestore;
private Dialog mConfirmDialog;
private PreferenceScreen mConfigure;
private PreferenceScreen mPassword;
private static final int DIALOG_ERASE_BACKUP = 2;
private int mDialogType;
@@ -64,6 +66,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements
mBackup = (CheckBoxPreference) screen.findPreference(BACKUP_DATA);
mAutoRestore = (CheckBoxPreference) screen.findPreference(AUTO_RESTORE);
mConfigure = (PreferenceScreen) screen.findPreference(CONFIGURE_ACCOUNT);
mPassword = (PreferenceScreen) screen.findPreference(LOCAL_BACKUP_PASSWORD);
// Vendor specific
if (getActivity().getPackageManager().
@@ -158,6 +161,8 @@ public class PrivacySettings extends SettingsPreferenceFragment implements
mConfigure.setEnabled(configureEnabled);
mConfigure.setIntent(configIntent);
setConfigureSummary(configSummary);
updatePasswordSummary();
}
private void setConfigureSummary(String summary) {
@@ -178,6 +183,18 @@ public class PrivacySettings extends SettingsPreferenceFragment implements
}
}
private void updatePasswordSummary() {
try {
if (mBackupManager.hasBackupPassword()) {
mPassword.setSummary(R.string.local_backup_password_summary_change);
} else {
mPassword.setSummary(R.string.local_backup_password_summary_none);
}
} catch (RemoteException e) {
// Not much we can do here
}
}
public void onClick(DialogInterface dialog, int which) {
if (which == DialogInterface.BUTTON_POSITIVE) {
//updateProviders();

106
src/com/android/settings/SetFullBackupPassword.java Normal file
View File

@@ -0,0 +1,106 @@
/*
* Copyright (C) 2011 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings;
import android.app.Activity;
import android.app.backup.IBackupManager;
import android.os.Bundle;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.util.Log;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.TextView;
import android.widget.Toast;
public class SetFullBackupPassword extends Activity {
static final String TAG = "SetFullBackupPassword";
IBackupManager mBackupManager;
TextView mCurrentPw, mNewPw, mConfirmNewPw;
Button mCancel, mSet;
OnClickListener mButtonListener = new OnClickListener() {
@Override
public void onClick(View v) {
if (v == mSet) {
final String curPw = mCurrentPw.getText().toString();
final String newPw = mNewPw.getText().toString();
final String confirmPw = mConfirmNewPw.getText().toString();
if (!newPw.equals(confirmPw)) {
// Mismatch between new pw and its confirmation re-entry
Log.i(TAG, "password mismatch");
Toast.makeText(SetFullBackupPassword.this,
"!!! New password and confirmation don't match !!!",
Toast.LENGTH_LONG).show();
return;
}
// TODO: should we distinguish cases of has/hasn't set a pw before?
if (setBackupPassword(curPw, newPw)) {
// success
Log.i(TAG, "password set successfully");
Toast.makeText(SetFullBackupPassword.this,
"!!! New backup password set !!!",
Toast.LENGTH_LONG).show();
finish();
} else {
// failure -- bad existing pw, usually
Log.i(TAG, "failure; password mismatch?");
Toast.makeText(SetFullBackupPassword.this,
"!!! Failure setting backup password !!!",
Toast.LENGTH_LONG).show();
}
} else if (v == mCancel) {
finish();
} else {
Log.w(TAG, "Click on unknown view");
}
}
};
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
mBackupManager = IBackupManager.Stub.asInterface(ServiceManager.getService("backup"));
setContentView(R.layout.set_backup_pw);
mCurrentPw = (TextView) findViewById(R.id.current_backup_pw);
mNewPw = (TextView) findViewById(R.id.new_backup_pw);
mConfirmNewPw = (TextView) findViewById(R.id.confirm_new_backup_pw);
mCancel = (Button) findViewById(R.id.backup_pw_cancel_button);
mSet = (Button) findViewById(R.id.backup_pw_set_button);
mCancel.setOnClickListener(mButtonListener);
mSet.setOnClickListener(mButtonListener);
}
private boolean setBackupPassword(String currentPw, String newPw) {
try {
return mBackupManager.setBackupPassword(currentPw, newPw);
} catch (RemoteException e) {
Log.e(TAG, "Unable to communicate with backup manager");
return false;
}
}
}