From 0e8d0d19afe7a613fa22492c8f610a2b2849e683 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Wed, 2 Nov 2016 09:15:33 -0700
Subject: [PATCH] Add PrivacySettings to System category.

This activity is only activated when useDefaultBackup flag is set in
SettingsActivity

Bug: 31801428
Test: RunSettingsRoboTests
Change-Id: I7f5e968684dea623fb5604f944472accb89a0176
---
 AndroidManifest.xml                            | 13 +++++++++++++
 src/com/android/settings/SettingsActivity.java |  4 ++++
 2 files changed, 17 insertions(+)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 638a2b5dab3..4b311c103e1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3244,6 +3244,19 @@
                        android:resource="@string/gesture_preference_summary"/>
         </activity-alias>
 
+        <activity-alias android:name="PrivacyDashboardAlias"
+            android:targetActivity="Settings$PrivacySettingsActivity">
+            <intent-filter android:priority="60">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                       android:value="com.android.settings.category.ia.system" />
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.PrivacySettings" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                       android:value="true" />
+        </activity-alias>
+
         <activity-alias android:name="BackupResetDashboardAlias"
                         android:targetActivity="Settings$PrivacySettingsActivity">
             <intent-filter android:priority="60">
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index eff20047f48..3813c42d227 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -1189,6 +1189,10 @@ public class SettingsActivity extends SettingsDrawerActivity
         boolean useDefaultBackup = TextUtils.isEmpty(backupIntent);
         setTileEnabled(new ComponentName(packageName,
                 Settings.PrivacySettingsActivity.class.getName()), useDefaultBackup, isAdmin, pm);
+        setTileEnabled(new ComponentName(packageName,
+                        "com.android.settings.PrivacyDashboardAlias"),
+                useDefaultBackup, isAdmin, pm);
+
         boolean hasBackupActivity = false;
         if (!useDefaultBackup) {
             try {