Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7247d45e authored by Doris Ling's avatar Doris Ling Committed by Android (Google) Code Review
Browse files

Merge "Make UsersDashboardAlias primary profile controlled."

parents 8be68620 31921dfa

AndroidManifest.xml

+3 −1
Original line number Diff line number Diff line
@@ -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

+1 −0
Original line number Diff line number Diff line
@@ -287,6 +287,7 @@ public class SettingsGateway { 
            "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(),