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

Merge "Remove some emergency setting items scattered in settings"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-01-12 02:06:33 +00:00
committed by Android (Google) Code Review
parent 12797dc986 3440b9529f
commit bd4b0687a6
4 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/gestures.xml
View File

@@ -20,12 +20,6 @@
xmlns:settings="http://schemas.android.com/apk/res-auto" xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/gesture_preference_title"> android:title="@string/gesture_preference_title">
<Preference
android:key="gesture_emergency_summary"
android:title="@string/emergency_gesture_screen_title"
android:fragment="com.android.settings.gestures.EmergencyGestureSettings"
settings:controller="com.android.settings.gestures.EmergencyGestureEntrypointPreferenceController" />
<Preference <Preference
android:key="gesture_assist_input_summary" android:key="gesture_assist_input_summary"
android:title="@string/assist_gesture_title" android:title="@string/assist_gesture_title"

7
res/xml/my_device_info.xml
View File

@@ -56,13 +56,6 @@
settings:controller="com.android.settings.deviceinfo.PhoneNumberPreferenceController" settings:controller="com.android.settings.deviceinfo.PhoneNumberPreferenceController"
settings:enableCopying="true"/> settings:enableCopying="true"/>
<Preference
android:key="emergency_info"
android:order="14"
android:title="@string/emergency_info_title"
android:summary="@string/summary_placeholder"
settings:controller="com.android.settings.accounts.EmergencyInfoPreferenceController"/>
<!-- Legal information --> <!-- Legal information -->
<Preference <Preference
android:key="legal_container" android:key="legal_container"

13
res/xml/top_level_settings.xml
View File

@@ -125,13 +125,12 @@
android:fragment="com.android.settings.accessibility.AccessibilitySettings" android:fragment="com.android.settings.accessibility.AccessibilitySettings"
settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"/> settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"/>
<!-- TODO(b/175158310): Enable this tile when the setting content is more flushed out--> <Preference
<!-- <Preference--> android:key="top_level_emergency"
<!-- android:key="top_level_emergency"--> android:title="@string/emergency_settings_preference_title"
<!-- android:title="@string/emergency_settings_preference_title"--> android:icon="@drawable/ic_homepage_emergency"
<!-- android:icon="@drawable/ic_homepage_emergency"--> android:order="-10"
<!-- android:order="-10"--> android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"/>
<!-- android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"/>-->
<Preference <Preference
android:key="top_level_system" android:key="top_level_system"

15
res/xml/top_level_settings_grouped.xml
View File

@@ -134,13 +134,14 @@
android:order="-20" android:order="-20"
android:title="@string/security_settings_title" android:title="@string/security_settings_title"
settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/> settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/>
<!-- TODO(b/175158310): Enable this tile when the setting content is more flushed out-->
<!-- <Preference--> <Preference
<!-- android:key="top_level_emergency"--> android:key="top_level_emergency"
<!-- android:title="@string/emergency_settings_preference_title"--> android:title="@string/emergency_settings_preference_title"
<!-- android:icon="@drawable/ic_homepage_emergency"--> android:icon="@drawable/ic_homepage_emergency"
<!-- android:order="-10"--> android:order="-10"
<!-- android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"/>--> android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"/>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory