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

Merge "Refactors the System Navigation settings page" into qt-dev

Browse Source 
am: e575fc44f5

Change-Id: I6e308e2b0bd2e1c6c8cc0dd55f184480e4b2145c
This commit is contained in:
Mehdi Alizadeh
2019-05-13 18:22:43 -07:00
committed by android-build-merger
parent cdd91541c1 e575fc44f5
commit e53b5845b9
17 changed files with 351 additions and 769 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
res/drawable-nodpi/gesture_swipe_up.png → res/drawable-nodpi/system_nav_2_button.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

BIN
res/drawable-nodpi/system_nav_3_button.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
res/drawable-nodpi/system_nav_fully_gestural.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

0
res/raw/gesture_swipe_up.mp4 → res/raw/system_nav_2_button.mp4
View File

BIN
res/raw/system_nav_3_button.mp4 Normal file
View File

Binary file not shown.

BIN
res/raw/system_nav_fully_gestural.mp4 Normal file
View File

Binary file not shown.

2
res/xml/gestures.xml
View File

@@ -49,7 +49,7 @@
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" />
settings:controller="com.android.settings.gestures.SystemNavigationPreferenceController" />
<Preference
android:key="gesture_tap_screen_input_summary"

34
res/xml/system_navigation_gesture_settings.xml
View File

@@ -17,35 +17,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:settings="http://schemas.android.com/apk/res-auto"
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" />
<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.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>
android:title="@string/system_navigation_title"
settings:keywords="@string/keywords_system_navigation"/>