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

Commit 31921dfa authored by Doris Ling's avatar Doris Ling
Browse files

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
parent 42c61c10

AndroidManifest.xml

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

+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(),