diff options
author | Brint E. Kriebel <bekit@cyngn.com> | 2014-11-03 18:33:49 -0800 |
---|---|---|
committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-11-03 18:33:49 -0800 |
commit | 6fbf5b61db891070a3feee8ba7069b573384d3e0 (patch) | |
tree | d21d71eb530fe25a28e85e9272f87f0b5daae692 /res/layout/settings_transitions_screen.xml | |
parent | 4e90e2adf167eaa7bfba5d609ed5524832f09f79 (diff) | |
parent | 956a856a47d2faefa0101d1fae7b6ab0967234ea (diff) | |
download | packages_apps_Trebuchet-6fbf5b61db891070a3feee8ba7069b573384d3e0.tar.gz packages_apps_Trebuchet-6fbf5b61db891070a3feee8ba7069b573384d3e0.tar.bz2 packages_apps_Trebuchet-6fbf5b61db891070a3feee8ba7069b573384d3e0.zip |
Merge branch 'cm-11.0' into stable/cm-11.0
Diffstat (limited to 'res/layout/settings_transitions_screen.xml')
-rw-r--r-- | res/layout/settings_transitions_screen.xml | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/res/layout/settings_transitions_screen.xml b/res/layout/settings_transitions_screen.xml index dd47636e2..fca36a87f 100644 --- a/res/layout/settings_transitions_screen.xml +++ b/res/layout/settings_transitions_screen.xml @@ -17,15 +17,16 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:background="@drawable/listitem_bg" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:clickable="true" > <ImageView + android:id="@+id/nav_prev" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:adjustViewBounds="true" - android:src="@drawable/action_navigation_previous_light" /> + android:src="@drawable/ic_navigation_prev" /> <TextView android:id="@+id/transition_effect_title" @@ -38,22 +39,16 @@ android:textSize="16sp" /> </LinearLayout> - <LinearLayout + <ImageView + android:id="@+id/transition_options_menu" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_alignParentRight="true" - android:background="@drawable/listitem_bg" - android:clickable="true" > - - <ImageView - android:id="@+id/transition_options_menu" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:adjustViewBounds="true" - android:src="@drawable/overflow_options_menu" /> - </LinearLayout> + android:layout_gravity="right" + android:paddingStart="10dip" + android:paddingEnd="10dip" + android:adjustViewBounds="true" + android:layout_alignParentEnd="true" + android:src="@drawable/overflow_options_menu" /> </RelativeLayout> <ImageView @@ -70,4 +65,4 @@ android:layout_height="wrap_content" android:listSelector="@android:color/transparent" android:splitMotionEvents="false"/> -</LinearLayout>
\ No newline at end of file +</LinearLayout> |