commit 7247d45e1c41bd285b95146ec923a8a4ebe25453
author Doris Ling <dling@google.com> Tue Jan 31 18:14:40 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 31 18:14:41 2017 +0000
tree b1e42c249cd050699e7f834be7e3a4441822f42b
parent 8be6862021787b8662ac626ed65cf59676e45042
parent 31921dfa82271edcffb3fcc53ef98036c97f1fc7

Merge "Make UsersDashboardAlias primary profile controlled."

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e754d6a..1df38d8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3344,7 +3344,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"/>
@@ -3353,6 +3353,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 2f0dff3..818e45f 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(),