PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make UsersDashboardAlias primary profile controlled."

Browse Source
This commit is contained in:
Doris Ling
2017-01-31 18:14:40 +00:00
committed by Android (Google) Code Review
parent 8be6862021 31921dfa82
commit 7247d45e1c
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@@ -3344,7 +3344,7 @@
android:value="true" /> android:value="true" />
</activity-alias> </activity-alias>
<activity-alias android:name="UserDashboardAlias" <activity-alias android:name="UsersDashboardAlias"
android:targetActivity="Settings$UserSettingsActivity"> android:targetActivity="Settings$UserSettingsActivity">
<intent-filter android:priority="8"> <intent-filter android:priority="8">
<action android:name="com.android.settings.action.SETTINGS"/> <action android:name="com.android.settings.action.SETTINGS"/>
@@ -3353,6 +3353,8 @@
android:value="com.android.settings.users.UserSettings" /> android:value="com.android.settings.users.UserSettings" />
<meta-data android:name="com.android.settings.category" <meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.accounts" /> 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>
<activity-alias android:name="AppDefaultDashboardAlias" <activity-alias android:name="AppDefaultDashboardAlias"

1
src/com/android/settings/core/gateway/SettingsGateway.java
View File

@@ -287,6 +287,7 @@ public class SettingsGateway {
"com.android.settings.DisplayDashboardAlias", "com.android.settings.DisplayDashboardAlias",
"com.android.settings.SoundDashboardAlias", "com.android.settings.SoundDashboardAlias",
"com.android.settings.SecurityDashboardAlias", "com.android.settings.SecurityDashboardAlias",
"com.android.settings.UsersDashboardAlias",
Settings.UserAndAccountDashboardActivity.class.getName(), Settings.UserAndAccountDashboardActivity.class.getName(),
Settings.SystemDashboardActivity.class.getName(), Settings.SystemDashboardActivity.class.getName(),
Settings.SupportDashboardActivity.class.getName(), Settings.SupportDashboardActivity.class.getName(),