commit 26bf003df92b05fafd4e015680a22611724aa25b
author Doris Ling <dling@google.com> Wed Jun 15 18:16:09 2016 -0700
committer Doris Ling <dling@google.com> Fri Jul 01 11:49:03 2016 -0700
tree 9089bbb1c0596a6d35f08d19c885054ce478f33d
parent 6e1336bff127e3c19883ad29914dea84f18fefcd

Update Backup & reset settings to launch the configured activity.

Check for configured backup settings activity to be used for
Settings->Backup & reset.

Bug: 28942163
Change-Id: I8b937fde5b400afdb81463c9c278b3e3ad42688b

src/com/android/settings/SettingsActivity.java

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 17ce8a1..8cc9085 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -131,6 +131,7 @@
 import com.android.settingslib.drawer.SettingsDrawerActivity;
 import com.android.settingslib.drawer.Tile;
 
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -1099,6 +1100,23 @@
                 }
             }
         }
+
+        String backupIntent = getResources().getString(R.string.config_backup_settings_intent);
+        boolean useDefaultBackup = TextUtils.isEmpty(backupIntent);
+        setTileEnabled(new ComponentName(packageName,
+                Settings.PrivacySettingsActivity.class.getName()), useDefaultBackup, isAdmin, pm);
+        boolean hasBackupActivity = false;
+        if (!useDefaultBackup) {
+            try {
+                Intent intent = Intent.parseUri(backupIntent, 0);
+                hasBackupActivity = !getPackageManager().queryIntentActivities(intent, 0).isEmpty();
+            } catch (URISyntaxException e) {
+                Log.e(LOG_TAG, "Invalid backup intent URI!", e);
+            }
+        }
+        setTileEnabled(new ComponentName(packageName,
+                BackupSettingsActivity.class.getName()), hasBackupActivity, isAdmin, pm);
+
     }
 
     private void setTileEnabled(ComponentName component, boolean enabled, boolean isAdmin,