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

Merge "Layout changes for new animation assets" into pi-dev

Browse Source 
am: 10e91c7e1b

Change-Id: Iac67bda32c2e545480c8d3439f5659f8e1a30f65
This commit is contained in:
Antony Sargent
2018-04-25 17:52:26 -07:00
committed by android-build-merger
parent 7d4a11e3d3 10e91c7e1b
commit 7746cd94e3
12 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/drawable-nodpi/gesture_swipe_up.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 20 KiB

BIN
res/raw/gesture_swipe_up.mp4
View File

Binary file not shown.

2
res/values/colors.xml
View File

@@ -95,7 +95,7 @@
<color name="usage_graph_dots">#B0BEC5</color>
<!-- Gestures settings -->
<color name="gestures_setting_background_color">#f4f4f4</color>
<color name="gestures_setting_background_color">#ffffff</color>
<color name="status_bar_color">#3c3c3c</color>

3
res/xml/assist_gesture_settings.xml
View File

@@ -30,6 +30,7 @@
android:key="gesture_assist"
android:title="@string/assist_gesture_title"
app:keywords="@string/keywords_assist_gesture_launch"
app:controller="com.android.settings.gestures.AssistGestureSettingsPreferenceController" />
app:controller="com.android.settings.gestures.AssistGestureSettingsPreferenceController"
app:allowDividerAbove="true" />
</PreferenceScreen>

3
res/xml/auto_brightness_detail.xml
View File

@@ -33,6 +33,7 @@
settings:keywords="@string/keywords_display_auto_brightness"
settings:controller="com.android.settings.display.AutoBrightnessPreferenceController"
settings:useAdminDisabledSummary="true"
settings:userRestriction="no_config_brightness" />
settings:userRestriction="no_config_brightness"
settings:allowDividerAbove="true" />
</PreferenceScreen>

3
res/xml/double_tap_power_settings.xml
View File

@@ -31,6 +31,7 @@
android:title="@string/double_tap_power_for_camera_title"
android:summary="@string/double_tap_power_for_camera_summary"
app:keywords="@string/keywords_gesture"
app:controller="com.android.settings.gestures.DoubleTapPowerPreferenceController" />
app:controller="com.android.settings.gestures.DoubleTapPowerPreferenceController"
app:allowDividerAbove="true" />
</PreferenceScreen>

3
res/xml/double_tap_screen_settings.xml
View File

@@ -31,6 +31,7 @@
android:title="@string/ambient_display_title"
android:summary="@string/ambient_display_summary"
app:keywords="@string/keywords_gesture"
app:controller="com.android.settings.gestures.DoubleTapScreenPreferenceController" />
app:controller="com.android.settings.gestures.DoubleTapScreenPreferenceController"
app:allowDividerAbove="true" />
</PreferenceScreen>

3
res/xml/double_twist_gesture_settings.xml
View File

@@ -31,6 +31,7 @@
android:title="@string/double_twist_for_camera_mode_title"
android:summary="@string/double_twist_for_camera_mode_summary"
app:keywords="@string/keywords_gesture"
app:controller="com.android.settings.gestures.DoubleTwistPreferenceController" />
app:controller="com.android.settings.gestures.DoubleTwistPreferenceController"
app:allowDividerAbove="true" />
</PreferenceScreen>

3
res/xml/pick_up_gesture_settings.xml
View File

@@ -31,6 +31,7 @@
android:title="@string/ambient_display_pickup_title"
android:summary="@string/ambient_display_pickup_summary"
app:keywords="@string/keywords_gesture"
app:controller="com.android.settings.gestures.PickupGesturePreferenceController" />
app:controller="com.android.settings.gestures.PickupGesturePreferenceController"
app:allowDividerAbove="true" />
</PreferenceScreen>

3
res/xml/prevent_ringing_gesture_settings.xml
View File

@@ -32,6 +32,7 @@
android:entries="@array/gesture_prevent_ringing_entries"
android:entryValues="@array/gesture_prevent_ringing_values"
app:controller="com.android.settings.gestures.PreventRingingPreferenceController"
app:keywords="@string/keywords_gesture" />
app:keywords="@string/keywords_gesture"
app:allowDividerAbove="true" />
</PreferenceScreen>

3
res/xml/swipe_to_notification_settings.xml
View File

@@ -30,6 +30,7 @@
android:title="@string/fingerprint_swipe_for_notifications_title"
android:summary="@string/fingerprint_swipe_for_notifications_summary"
app:keywords="@string/keywords_gesture"
app:controller="com.android.settings.gestures.SwipeToNotificationPreferenceController" />
app:controller="com.android.settings.gestures.SwipeToNotificationPreferenceController"
app:allowDividerAbove="true" />
</PreferenceScreen>

3
res/xml/swipe_up_gesture_settings.xml
View File

@@ -31,6 +31,7 @@
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:controller="com.android.settings.gestures.SwipeUpPreferenceController"
app:allowDividerAbove="true" />
</PreferenceScreen>