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

Merge "Adds Edge to Edge option in gesture settings page"

Browse Source
This commit is contained in:
Mehdi Alizadeh
2019-03-08 04:49:41 +00:00
committed by Android (Google) Code Review
parent 349df71c92 43502549a3
commit f514f1eecf
13 changed files with 788 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
res/values/strings.xml
View File

@@ -9799,8 +9799,11 @@
<!-- Title for settings suggestion for double twist for camera [CHAR LIMIT=60] -->
<string name="double_twist_for_camera_suggestion_title">Take selfies faster</string>
<!-- Title text for swipe up to switch apps [CHAR LIMIT=60] -->
<string name="swipe_up_to_switch_apps_title">Swipe up on Home button</string>
<!-- Title text for system navigation [CHAR LIMIT=60] [DO NOT TRANSLATE] -->
<string name="system_navigation_title" translatable="false">System navigation</string>
<!-- Title text for swipe up to switch apps [CHAR LIMIT=60] [DO NOT TRANSLATE] -->
<string name="swipe_up_to_switch_apps_title" translatable="false">2-button navigation</string>
<!-- Summary text for swipe up to switch apps [CHAR LIMIT=250] -->
<string name="swipe_up_to_switch_apps_summary">To switch apps, swipe up on the Home button. Swipe up again to see all apps. Works from any screen. You’ll no longer have an Overview button on the bottom right of your screen.</string>
<!-- Title for settings suggestion for swipe up to switch apps [CHAR LIMIT=60] -->
@@ -9808,6 +9811,16 @@
<!-- 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>
<!-- Title text for edge to edge navigation [CHAR LIMIT=60] [DO NOT TRANSLATE] -->
<string name="edge_to_edge_navigation_title" translatable="false">Fully gestural navigation</string>
<!-- Summary text for edge to edge navigation [CHAR LIMIT=None] [DO NOT TRANSLATE] -->
<string name="edge_to_edge_navigation_summary" translatable="false">To go Home, swipe up from the bottom of the screen. To go Back, swipe from either the left or right edge of the screen. To switch apps, start swiping up from the bottom of the screen and hold before releasing.</string>
<!-- Title text for 3-button navigation [CHAR LIMIT=60] [DO NOT TRANSLATE] -->
<string name="legacy_navigation_title" translatable="false">3-button navigation</string>
<!-- Summary text for 3-button navigation [CHAR LIMIT=250] [DO NOT TRANSLATE] -->
<string name="legacy_navigation_summary" translatable="false">Classic Android navigation mode where going Home, switching apps, and going Back are accessible via buttons.</string>
<!-- Preference and settings suggestion title text for ambient display double tap (phone) [CHAR LIMIT=60]-->
<string name="ambient_display_title" product="default">Double-tap to check phone</string>
<!-- Preference and settings suggestion title text for ambient display double tap (tablet) [CHAR LIMIT=60]-->

8
res/xml/gestures.xml
View File

@@ -52,10 +52,10 @@
settings:controller="com.android.settings.gestures.DoubleTwistPreferenceController" />
<Preference
android:key="gesture_swipe_up_input_summary"
android:title="@string/swipe_up_to_switch_apps_title"
android:fragment="com.android.settings.gestures.SwipeUpGestureSettings"
settings:controller="com.android.settings.gestures.SwipeUpPreferenceController" />
android:key="gesture_system_navigation_input_summary"
android:title="@string/system_navigation_title"
android:fragment="com.android.settings.gestures.SystemNavigationGestureSettings"
settings:controller="com.android.settings.gestures.SystemNavigationLegacyPreferenceController" />
<Preference
android:key="gesture_tap_screen_input_summary"

24
res/xml/swipe_up_gesture_settings.xml → res/xml/system_navigation_gesture_settings.xml
View File

@@ -18,20 +18,34 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:key="gesture_swipe_up_screen"
android:title="@string/swipe_up_to_switch_apps_title">
android:key="gesture_system_navigation_screen"
android:title="@string/system_navigation_title">
<com.android.settings.widget.VideoPreference
android:key="gesture_swipe_up_video"
app:animation="@raw/gesture_swipe_up"
app:preview="@drawable/gesture_swipe_up" />
<SwitchPreference
<com.android.settings.widget.RadioButtonPreference
android:key="gesture_edge_to_edge"
android:title="@string/edge_to_edge_navigation_title"
android:summary="@string/edge_to_edge_navigation_summary"
app:keywords="@string/keywords_gesture"
app:controller="com.android.settings.gestures.SystemNavigationEdgeToEdgePreferenceController"
app:allowDividerAbove="true" />
<com.android.settings.widget.RadioButtonPreference
android:key="gesture_swipe_up"
android:title="@string/swipe_up_to_switch_apps_title"
android:summary="@string/swipe_up_to_switch_apps_summary"
app:keywords="@string/keywords_gesture"
app:controller="com.android.settings.gestures.SwipeUpPreferenceController"
app:allowDividerAbove="true" />
app:controller="com.android.settings.gestures.SystemNavigationSwipeUpPreferenceController" />
<com.android.settings.widget.RadioButtonPreference
android:key="gesture_legacy"
android:title="@string/legacy_navigation_title"
android:summary="@string/legacy_navigation_summary"
app:keywords="@string/keywords_gesture"
app:controller="com.android.settings.gestures.SystemNavigationLegacyPreferenceController" />
</PreferenceScreen>