Merge "Add self-restore capability to Backup/Restore sample app"

samples/BackupRestore/Android.mk

@@ -10,4 +10,6 @@ LOCAL_PACKAGE_NAME := BackupRestore
 
 LOCAL_SDK_VERSION := current
 
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+
 include $(BUILD_PACKAGE)

samples/BackupRestore/proguard.flags

@@ -0,0 +1,3 @@
+-keepclassmembers class com.example.android.backuprestore.BackupRestoreActivity {
+    public void onRestoreButtonClick(android.view.View);
+}

samples/BackupRestore/res/layout/backup_restore.xml

@@ -16,11 +16,16 @@
 
 <!-- Layout description of the BackupRestore sample's main activity -->
 
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
 
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    <ScrollView
         android:orientation="vertical"
         android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+        android:layout_height="fill_parent"
+        android:layout_weight="1">
 
         <LinearLayout
             android:orientation="vertical"
@@ -71,3 +76,12 @@
         </LinearLayout>
 
     </ScrollView>
+
+    <Button android:id="@+id/restore_button"
+        android:text="@string/restore_text"
+        android:onClick="onRestoreButtonClick"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_weight="0" />
+
+</LinearLayout>

samples/BackupRestore/res/values/strings.xml

@@ -23,4 +23,6 @@
   <string name="extras_text">Extras:</string>
   <string name="mayo_text">Mayonnaise\?</string>
   <string name="tomato_text">Tomato\?</string>
+
+  <string name="restore_text">Restore last data</string>
 </resources>

samples/BackupRestore/src/com/example/android/backuprestore/BackupRestoreActivity.java

@@ -18,8 +18,10 @@ package com.example.android.backuprestore;
 
 import android.app.Activity;
 import android.app.backup.BackupManager;
+import android.app.backup.RestoreObserver;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.View;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.RadioGroup;
@@ -249,4 +251,21 @@ public class BackupRestoreActivity extends Activity {
 
         mBackupManager.dataChanged();
     }
+
+    /**
+     * Click handler, designated in the layout, that runs a restore of the app's
+     * most recent data when the button is pressed.
+     */
+    public void onRestoreButtonClick(View v) {
+        Log.v(TAG, "Requesting restore of our most recent data");
+        mBackupManager.requestRestore(
+                new RestoreObserver() {
+                    public void restoreFinished(int error) {
+                        /** Done with the restore!  Now draw the new state of our data */
+                        Log.v(TAG, "Restore finished, error = " + error);
+                        populateUI();
+                    }
+                }
+        );
+    }
 }