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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-01-07 22:39:06 +00:00
committed by Android (Google) Code Review
parent 24267318a2 9b1fb77b54
commit 76c649968f
11 changed files with 255 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
res/drawable/ic_homepage_emergency.xml Normal file
View File

@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
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.
-->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<com.android.settingslib.widget.AdaptiveIconShapeDrawable
android:width="@dimen/dashboard_tile_image_size"
android:height="@dimen/dashboard_tile_image_size"
android:color="@color/homepage_emergency_background" />
</item>
<item
android:width="@dimen/dashboard_tile_foreground_image_size"
android:height="@dimen/dashboard_tile_foreground_image_size"
android:start="@dimen/dashboard_tile_foreground_image_inset"
android:top="@dimen/dashboard_tile_foreground_image_inset"
android:drawable="@drawable/ic_settings_emergency" />
</layer-list>

24
res/drawable/ic_settings_emergency.xml Normal file
View File

@@ -0,0 +1,24 @@
<!--
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.
-->
<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">
<path
android:pathData="M9.3207,2V7.359L4.6795,4.6795L2,9.3207L6.6412,12L2,14.6795L4.6795,19.3205L9.3207,16.641V22H14.6797V16.641L19.3207,19.3205L22.0002,14.6795L17.359,12L22.0002,9.3207L19.3207,4.6795L14.6797,7.3588V2H9.3207Z"
android:fillColor="?android:attr/colorPrimary"/>
</vector>

1
res/values/colors.xml
View File

@@ -92,6 +92,7 @@
<color name="homepage_security_background">#0F9D58</color>
<color name="homepage_accounts_background">#F15B8D</color>
<color name="homepage_accessibility_background">#5011C1</color>
<color name="homepage_emergency_background">#F28B82</color>
<color name="homepage_system_background">#9E9E9E</color>
<color name="homepage_support_background">#26459C</color>
<color name="homepage_generic_icon_background">#1A73E8</color>

3
res/values/strings.xml
View File

@@ -10986,6 +10986,9 @@
<!-- Summary for settings suggestion for swipe up to switch apps [CHAR LIMIT=60] -->
<string name="swipe_up_to_switch_apps_suggestion_summary">Turn on the new gesture to switch apps</string>
<!-- Preference title for "Safety & emergency" settings page [CHAR LIMIT=60]-->
<string name="emergency_settings_preference_title">Safety &amp; emergency</string>
<!-- Title text for edge to edge navigation [CHAR LIMIT=60] -->
<string name="edge_to_edge_navigation_title">Gesture navigation</string>
<!-- Summary text for edge to edge navigation [CHAR LIMIT=NONE] -->

22
res/xml/emergency_settings.xml Normal file
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>

8
res/xml/top_level_settings.xml
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"

7
res/xml/top_level_settings_grouped.xml
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