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

Merge \"Fix layout transition from Display->Ambient Display to Gestures\" into nyc-mr1-dev

Browse Source 
am: 3633058181

Change-Id: I75ed59bcdb3cf2382b8bc6fb9eb99f280fc1df72
This commit is contained in:
Doris Ling
2016-07-06 22:20:07 +00:00
committed by android-build-merger
parent 5efd8009df 3633058181
commit e4b305a0f0
6 changed files with 110 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/layout/gesture_preference.xml
View File

@@ -57,7 +57,7 @@
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:orientation="horizontal">
<FrameLayout
<com.android.settings.widget.AspectRatioFrameLayout
android:id="@+id/gesture_animation_frame"
android:layout_width="0dp"
android:layout_height="match_parent"
@@ -73,7 +73,7 @@
android:id="@+id/gesture_image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"/>
android:background="@color/gestures_setting_background_color"/>
<ImageView
android:id="@+id/gesture_play_button"
@@ -81,10 +81,9 @@
android:layout_height="@dimen/gestures_play_button_size"
android:src="@drawable/ic_gesture_play_button"
android:gravity="center"
android:layout_gravity="center"
android:visibility="gone"/>
android:layout_gravity="center"/>
</FrameLayout>
</com.android.settings.widget.AspectRatioFrameLayout>
<TextView
android:id="@android:id/summary"