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

am: 1b41dd7f8c

Change-Id: I047b71720315408c432b1bd4d430b1724ea48536
This commit is contained in:
Doris Ling
2016-07-07 17:11:12 +00:00
committed by android-build-merger
3 changed files with 7 additions and 1 deletions

View File

@@ -61,7 +61,8 @@
android:id="@+id/gesture_animation_frame" android:id="@+id/gesture_animation_frame"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"> android:layout_weight="1"
android:padding="@dimen/gesture_animation_padding">
<TextureView <TextureView
android:id="@+id/gesture_video" android:id="@+id/gesture_video"

View File

@@ -34,4 +34,8 @@
<!-- Display, Screen zoom --> <!-- Display, Screen zoom -->
<dimen name="screen_zoom_preview_height">160dp</dimen> <dimen name="screen_zoom_preview_height">160dp</dimen>
<!-- Gestures -->
<dimen name="gesture_animation_padding">35dp</dimen>
</resources> </resources>

View File

@@ -299,4 +299,5 @@
<!-- Padding for Gestures settings screen --> <!-- Padding for Gestures settings screen -->
<dimen name="gestures_settings_padding_top_bottom">20dp</dimen> <dimen name="gestures_settings_padding_top_bottom">20dp</dimen>
<dimen name="gestures_play_button_size">36dp</dimen> <dimen name="gestures_play_button_size">36dp</dimen>
<dimen name="gesture_animation_padding">0dp</dimen>
</resources> </resources>