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

Consolidate wake-screen settings page

Browse Source 
UX decided to have a single settings page instead of two

Test: manual
Bug: 111414690
Change-Id: I8e0eee3ea00b1eb9cbe534cc60bfccec43cf8e31
This commit is contained in:
Lucas Dupin
2019-01-18 16:17:44 -08:00
parent 27bbfb73f5
commit b55e5f1360
9 changed files with 14 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/gestures.xml
View File

@@ -33,12 +33,6 @@
android:fragment="com.android.settings.gestures.WakeScreenGestureSettings"
settings:controller="com.android.settings.gestures.WakeScreenGesturePreferenceController" />
<Preference
android:key="gesture_wake_lock_screen_summary"
android:title="@string/ambient_display_wake_lock_screen_title"
android:fragment="com.android.settings.gestures.WakeLockScreenGestureSettings"
settings:controller="com.android.settings.gestures.WakeLockScreenGesturePreferenceController" />
<Preference
android:key="gesture_swipe_down_fingerprint_input_summary"
android:title="@string/fingerprint_swipe_for_notifications_title"

37
res/xml/wake_lock_screen_gesture_settings.xml
View File

@@ -1,37 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2018 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:app="http://schemas.android.com/apk/res-auto"
android:key="gesture_wake_lock_screen_screen"
android:title="@string/ambient_display_wake_lock_screen_title">
<com.android.settings.widget.VideoPreference
android:key="gesture_wake_lock_screen_video"
app:animation="@raw/gesture_ambient_wake_lock_screen"
app:preview="@drawable/gesture_ambient_wake_lock_screen" />
<SwitchPreference
android:key="gesture_wake_lock_screen"
android:title="@string/ambient_display_wake_lock_screen_title"
android:summary="@string/ambient_display_wake_lock_screen_summary"
app:keywords="@string/keywords_gesture"
app:controller="com.android.settings.gestures.WakeLockScreenGesturePreferenceController"
app:allowDividerAbove="true" />
</PreferenceScreen>