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

Commit c24930aa authored by Fan Zhang's avatar Fan Zhang
Browse files

Move users to system dashboard 

Bug: 71871075
Test: visual
Change-Id: I021bfdcce4fdb865f629c2da21149caad9b73b93
parent f6c0d1c3

AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line
@@ -1940,7 +1940,7 @@ 
                <action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter android:priority="50">

            <intent-filter android:priority="40">

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            <meta-data android:name="com.android.settings.category"
@@ -2484,11 +2484,11 @@ 
                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter android:priority="8">

            <intent-filter  android:priority="45">

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            <meta-data android:name="com.android.settings.category"

                android:value="com.android.settings.category.ia.accounts" />

                android:value="com.android.settings.category.ia.system" />

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.users.UserSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -6159,7 +6159,7 @@ 
    <skip/>









    <!-- User settings screen title [CHAR LIMIT=25] -->









    <string name="user_settings_title">Users</string>









    <string name="user_settings_title">Multiple users</string>









    <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->









    <string name="user_list_title">Users &amp; profiles</string>









    <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
































res/xml/system_dashboard_fragment.xml



+8
−8






























Original line number
Diff line number
Diff line







@@ -40,6 +40,14 @@







        <intent android:action="android.settings.BACKUP_AND_RESET_SETTINGS" />









    </Preference>



















    <Preference









        android:key="reset_dashboard"









        android:title="@string/reset_dashboard_title"









        android:summary="@string/reset_dashboard_summary"









        android:icon="@drawable/ic_restore"









        android:order="-50"









        android:fragment="com.android.settings.system.ResetDashboardFragment" />



















    <!-- System updates -->









    <Preference









        android:key="system_update_settings"








@@ -61,12 +69,4 @@







                android:targetClass="@string/additional_system_update_menu" />









    </Preference>



















    <Preference









        android:key="reset_dashboard"









        android:title="@string/reset_dashboard_title"









        android:summary="@string/reset_dashboard_summary"









        android:icon="@drawable/ic_restore"









        android:order="-20"









        android:fragment="com.android.settings.system.ResetDashboardFragment" />



















</PreferenceScreen>








 No newline at end of file