diff options
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/dynamic_grid_size_screen.xml | 3 | ||||
-rw-r--r-- | res/layout/settings_pane_list_item.xml | 26 | ||||
-rw-r--r-- | res/layout/settings_transitions_screen.xml | 27 |
3 files changed, 23 insertions, 33 deletions
diff --git a/res/layout/dynamic_grid_size_screen.xml b/res/layout/dynamic_grid_size_screen.xml index 234c3b9c9..984f24a0f 100644 --- a/res/layout/dynamic_grid_size_screen.xml +++ b/res/layout/dynamic_grid_size_screen.xml @@ -17,11 +17,12 @@ 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:layout_width="wrap_content" diff --git a/res/layout/settings_pane_list_item.xml b/res/layout/settings_pane_list_item.xml index 4bfb2880b..b968dc526 100644 --- a/res/layout/settings_pane_list_item.xml +++ b/res/layout/settings_pane_list_item.xml @@ -3,42 +3,36 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal|bottom" android:background="@drawable/listitem_bg" - android:paddingLeft="@dimen/overview_panel_list_padding" - android:paddingRight="@dimen/overview_panel_list_padding" + android:paddingStart="@dimen/overview_panel_list_padding" + android:paddingEnd="@dimen/overview_panel_list_padding" + android:paddingBottom="@dimen/overview_panel_list_padding" + android:paddingTop="@dimen/overview_panel_list_padding" android:orientation="horizontal" > <TextView - android:id="@+id/item_name" + android:id="@+id/item_state" android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="4dp" android:fontFamily="sans-serif-condensed" - android:gravity="left" - android:paddingBottom="@dimen/overview_panel_list_padding" - android:paddingTop="@dimen/overview_panel_list_padding" android:textSize="20sp" + android:textAllCaps="true" android:textColor="@color/listitem_text" - android:layout_alignParentLeft="true" - android:scrollHorizontally="true" + android:layout_alignParentEnd="true" android:ellipsize="end" android:maxLines="1"/> <TextView - android:id="@+id/item_state" + android:id="@+id/item_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" android:drawablePadding="4dp" android:fontFamily="sans-serif-condensed" - android:gravity="right" - android:paddingBottom="@dimen/overview_panel_list_padding" - android:paddingTop="@dimen/overview_panel_list_padding" android:textSize="20sp" - android:textAllCaps="true" android:textColor="@color/listitem_text" - android:layout_toRightOf="@id/item_name" - android:scrollHorizontally="true" + android:layout_toStartOf="@id/item_state" + android:layout_alignParentStart="true" android:ellipsize="end" android:maxLines="1"/> - </RelativeLayout> diff --git a/res/layout/settings_transitions_screen.xml b/res/layout/settings_transitions_screen.xml index 5850e27c5..b87c1fcd4 100644 --- a/res/layout/settings_transitions_screen.xml +++ b/res/layout/settings_transitions_screen.xml @@ -18,15 +18,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" @@ -39,22 +40,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 |