Merge "Add a empty page to host Safety/emergency settings"

This commit is contained in:
TreeHugger Robot
2021-01-07 22:39:06 +00:00
committed by Android (Google) Code Review
11 changed files with 255 additions and 69 deletions

View File

@@ -0,0 +1,22 @@
<!--
~ Copyright (C) 2021 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.
-->
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/emergency_settings_preference_title">
</PreferenceScreen>

View File

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

View File

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