commit 31921dfa82271edcffb3fcc53ef98036c97f1fc7
author Doris Ling <dling@google.com> Fri Jan 27 13:13:17 2017 -0800
committer Doris Ling <dling@google.com> Fri Jan 27 13:13:17 2017 -0800
tree 600e08ec5132f01117539d5cb053335cd77b37f6
parent 42c61c10cc61d6bd52cd96290f6aaeb869a8321f

Make UsersDashboardAlias primary profile controlled.

Add PRIMARY_PROFILE_CONTROLLED metadata to UsersDashboardAlias and
add it to the Settings list for restricted user, so that it will be
shown to other users.

Change-Id: I9c090b15c3dced75eb7a405bd109ca7fb51807ab
Fix: 34194505
Test: Visual

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a68b2a7..553b809 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3391,7 +3391,7 @@
                        android:value="true" />
         </activity-alias>
 
-        <activity-alias android:name="UserDashboardAlias"
+        <activity-alias android:name="UsersDashboardAlias"
                         android:targetActivity="Settings$UserSettingsActivity">
             <intent-filter android:priority="8">
                 <action android:name="com.android.settings.action.SETTINGS"/>
@@ -3400,6 +3400,8 @@
                        android:value="com.android.settings.users.UserSettings" />
             <meta-data android:name="com.android.settings.category"
                        android:value="com.android.settings.category.ia.accounts" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                       android:value="true" />
         </activity-alias>
 
         <activity-alias android:name="AppDefaultDashboardAlias"

src/com/android/settings/core/gateway/SettingsGateway.java

diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 76132ef..e4d2386 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -287,6 +287,7 @@
             "com.android.settings.DisplayDashboardAlias",
             "com.android.settings.SoundDashboardAlias",
             "com.android.settings.SecurityDashboardAlias",
+            "com.android.settings.UsersDashboardAlias",
             Settings.UserAndAccountDashboardActivity.class.getName(),
             Settings.SystemDashboardActivity.class.getName(),
             Settings.SupportDashboardActivity.class.getName(),