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

Merge "Move users to system dashboard"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-25 22:40:33 +00:00
committed by Android (Google) Code Review
parent 8a6cec13af c24930aaf2
commit b48bb6f0cf
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AndroidManifest.xml
View File

@@ -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"

2
res/values/strings.xml
View File

@@ -6141,7 +6141,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] -->

16
res/xml/system_dashboard_fragment.xml
View File

@@ -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>