summaryrefslogtreecommitdiffstats
path: root/packages/BackupRestoreConfirmation/src/com
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2011-09-14 11:34:03 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-14 11:34:03 -0700
commitf9fa7543b12b4c54ee21f205b7d537494dbbbdf1 (patch)
tree82aada6ca169849da688c464231154164da2a96f /packages/BackupRestoreConfirmation/src/com
parent311fac7ea58a5fc92ea4a04fab36ee9386759fab (diff)
parentc58cf7dd02ad227a68d62a0204152cee62c13182 (diff)
downloadframeworks_base-f9fa7543b12b4c54ee21f205b7d537494dbbbdf1.zip
frameworks_base-f9fa7543b12b4c54ee21f205b7d537494dbbbdf1.tar.gz
frameworks_base-f9fa7543b12b4c54ee21f205b7d537494dbbbdf1.tar.bz2
Merge "Give backup/restore confirmation a proper window title"
Diffstat (limited to 'packages/BackupRestoreConfirmation/src/com')
-rw-r--r--packages/BackupRestoreConfirmation/src/com/android/backupconfirm/BackupRestoreConfirmation.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/packages/BackupRestoreConfirmation/src/com/android/backupconfirm/BackupRestoreConfirmation.java b/packages/BackupRestoreConfirmation/src/com/android/backupconfirm/BackupRestoreConfirmation.java
index 5448e0b..d053f29 100644
--- a/packages/BackupRestoreConfirmation/src/com/android/backupconfirm/BackupRestoreConfirmation.java
+++ b/packages/BackupRestoreConfirmation/src/com/android/backupconfirm/BackupRestoreConfirmation.java
@@ -131,10 +131,13 @@ public class BackupRestoreConfirmation extends Activity {
final String action = intent.getAction();
final int layoutId;
+ final int titleId;
if (action.equals(FullBackup.FULL_BACKUP_INTENT_ACTION)) {
layoutId = R.layout.confirm_backup;
+ titleId = R.string.backup_confirm_title;
} else if (action.equals(FullBackup.FULL_RESTORE_INTENT_ACTION)) {
layoutId = R.layout.confirm_restore;
+ titleId = R.string.restore_confirm_title;
} else {
Slog.w(TAG, "Backup/restore confirmation activity launched with invalid action!");
finish();
@@ -159,6 +162,7 @@ public class BackupRestoreConfirmation extends Activity {
mObserver.setHandler(mHandler);
}
+ setTitle(titleId);
setContentView(layoutId);
// Same resource IDs for each layout variant (backup / restore)