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

res/values/colors.xml

@@ -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>
 

res/xml/assist_gesture_settings.xml

@@ -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>

res/xml/auto_brightness_detail.xml

@@ -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>

res/xml/double_tap_power_settings.xml

@@ -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>

res/xml/double_tap_screen_settings.xml

@@ -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>

res/xml/double_twist_gesture_settings.xml

@@ -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>

res/xml/pick_up_gesture_settings.xml

@@ -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>

res/xml/prevent_ringing_gesture_settings.xml

@@ -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>

res/xml/swipe_to_notification_settings.xml

@@ -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>

res/xml/swipe_up_gesture_settings.xml

@@ -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>