Merge "Add padding for the animation in the gestures settings." into nyc-mr1-dev

diff --git a/res/layout/gesture_preference.xml b/res/layout/gesture_preference.xml
index ebb43a4..2f593fe 100644 (file)
--- a/res/layout/gesture_preference.xml
+++ b/res/layout/gesture_preference.xml
@@ -61,7 +61,8 @@
             android:id="@+id/gesture_animation_frame"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="1">
+            android:layout_weight="1"
+            android:padding="@dimen/gesture_animation_padding">
 
             <TextureView
                 android:id="@+id/gesture_video"

diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index f18b34b..749a4e9 100755 (executable)
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -34,4 +34,8 @@
 
     <!-- Display, Screen zoom -->
     <dimen name="screen_zoom_preview_height">160dp</dimen>
+
+    <!-- Gestures -->
+    <dimen name="gesture_animation_padding">35dp</dimen>
+
 </resources>

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 9a97d30..09cd8f0 100755 (executable)
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -299,4 +299,5 @@
     <!-- Padding for Gestures settings screen -->
     <dimen name="gestures_settings_padding_top_bottom">20dp</dimen>
     <dimen name="gestures_play_button_size">36dp</dimen>
+    <dimen name="gesture_animation_padding">0dp</dimen>
 </resources>