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

Moves "Factory data reset" to a different page.

Browse Source 
Test: manual

Change-Id: Ibd4a28b9b15f3625e852938727ad775537ee9251
This commit is contained in:
Anton Philippov
2017-01-12 22:41:50 +00:00
parent c3fdc3e813
commit 3fdd9fa9c4
4 changed files with 41 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
res/drawable/ic_restore.xml Normal file
View File

@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2017 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24.0dp"
android:height="24.0dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0"
android:tint="?android:attr/colorControlNormal">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M13 3c-4.97 0-9 4.03-9 9H1l3.89 3.89 .07 .14L9 12H6c0-3.87 3.13-7 7-7s7 3.13 7
7-3.13 7-7 7c-1.93 0-3.68-.79-4.94-2.06l-1.42 1.42C8.27 19.99 10.51 21 13
21c4.97 0 9-4.03 9-9s-4.03-9-9-9zm-1 5v5l4.28 2.54 .72 -1.21-3.5-2.08V8H12z" />
</vector>

6
res/values/strings.xml
View File

@@ -4739,10 +4739,8 @@
<string name="emergency_tone_summary">Set behavior when an emergency call is placed</string>
<!-- Backup and reset Settings screen --><skip />
<!-- Backup and reset settings menu title -->
<string name="privacy_settings">Backup &amp; reset</string>
<!-- Privacy settings activity title -->
<string name="privacy_settings_title">Backup &amp; reset</string>
<!-- Backup and reset settings menu and activity title -->
<string name="privacy_settings_title">Backup</string>
<!-- Backup section title -->
<string name="backup_section_title">Backup &amp; restore</string>
<!-- Personal data section title -->

9
res/xml/privacy_settings.xml
View File

@@ -50,13 +50,4 @@
android:enabled="false"
android:selectable="false" />
<!-- Factory reset -->
<com.android.settingslib.RestrictedPreference
android:key="factory_reset"
android:title="@string/master_clear_title"
settings:keywords="@string/keywords_factory_data_reset"
settings:userRestriction="no_factory_reset"
settings:useAdminDisabledSummary="true"
android:fragment="com.android.settings.MasterClear" />
</PreferenceScreen>

11
res/xml/system_dashboard_fragment.xml
View File

@@ -16,6 +16,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
android:title="@string/header_category_system">
<!-- System updates -->
@@ -37,4 +38,14 @@
android:targetClass="@string/additional_system_update_menu"/>
</Preference>
<!-- Factory reset -->
<com.android.settingslib.RestrictedPreference
android:key="factory_reset"
android:title="@string/device_reset_title"
android:icon="@drawable/ic_restore"
android:order="-20"
settings:keywords="@string/keywords_factory_data_reset"
settings:userRestriction="no_factory_reset"
settings:useAdminDisabledSummary="true"
android:fragment="com.android.settings.MasterClear" />
</PreferenceScreen>