diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2015-05-11 22:52:36 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-11 22:52:36 +0000 |
commit | f385e3c058f052073af5ac559c8fd5627046870c (patch) | |
tree | 6dc49b84c4899eeabe8f8aa7f2cbf42761d10130 /res | |
parent | 814f1eb8058565f6a1299dd1cd858b163f4cbfdc (diff) | |
parent | 4b69f2ca91d63a59dfa921ba965b92de7f604f5a (diff) | |
download | android_packages_apps_Trebuchet-f385e3c058f052073af5ac559c8fd5627046870c.tar.gz android_packages_apps_Trebuchet-f385e3c058f052073af5ac559c8fd5627046870c.tar.bz2 android_packages_apps_Trebuchet-f385e3c058f052073af5ac559c8fd5627046870c.zip |
Merge "Ensure that clipping widget size is 20~40% of its width on every devices" into ub-launcher3-burnaby
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/widget_cell.xml | 6 | ||||
-rw-r--r-- | res/layout/widgets_list_row_view.xml | 11 | ||||
-rw-r--r-- | res/values/dimens.xml | 6 |
3 files changed, 12 insertions, 11 deletions
diff --git a/res/layout/widget_cell.xml b/res/layout/widget_cell.xml index ab23b842e..196dfca66 100644 --- a/res/layout/widget_cell.xml +++ b/res/layout/widget_cell.xml @@ -19,10 +19,11 @@ android:layout_width="@dimen/widget_preview_container_width" android:layout_height="@dimen/widget_cell_height" android:layout_weight="1" - android:layout_marginRight="@dimen/widget_row_divider" + android:layout_marginEnd="@dimen/widget_row_divider" android:orientation="vertical" android:background="@color/widgets_cell_color" - android:focusable="true"> + android:focusable="true" + android:gravity="center_horizontal"> <LinearLayout android:layout_width="wrap_content" @@ -43,7 +44,6 @@ android:singleLine="true" android:ellipsize="end" android:fadingEdge="horizontal" - android:textColor="@color/widgets_view_item_text_color" android:textSize="16sp" android:textAlignment="viewStart" diff --git a/res/layout/widgets_list_row_view.xml b/res/layout/widgets_list_row_view.xml index 12f6401e4..ea95d2407 100644 --- a/res/layout/widgets_list_row_view.xml +++ b/res/layout/widgets_list_row_view.xml @@ -55,17 +55,18 @@ </LinearLayout> <!-- Widget list --> - <RelativeLayout + <com.android.launcher3.widget.WidgetRowView + android:id="@+id/widget_row" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="@dimen/widget_cell_height" android:layout_gravity="end" + android:layout_marginLeft="@dimen/widget_row_padding" android:background="@color/widgets_cell_color" > <HorizontalScrollView android:id="@+id/widgets_scroll_container" android:layout_width="match_parent" - android:layout_height="@dimen/widget_cell_height" - android:layout_marginLeft="@dimen/widget_row_padding" + android:layout_height="match_parent" android:scrollbars="none" > <LinearLayout android:id="@+id/widgets_cell_list" @@ -74,5 +75,5 @@ android:orientation="horizontal" android:background="@color/widget_text_panel"/> </HorizontalScrollView> - </RelativeLayout> + </com.android.launcher3.widget.WidgetRowView> </LinearLayout> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 0d066bb7a..5447371a4 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -88,7 +88,7 @@ <!-- Widget tray --> <dimen name="widget_container_inset">8dp</dimen> - <dimen name="widget_preview_size">120dp</dimen> + <dimen name="widget_preview_size">130dp</dimen> <dimen name="widget_preview_padding_top">8dp</dimen> <dimen name="widget_preview_label_vertical_padding">8dp</dimen> <dimen name="widget_preview_label_horizontal_padding">8dp</dimen> @@ -100,10 +100,10 @@ <dimen name="widget_section_icon_horizontal_padding">16dp</dimen> <!-- Equation: widget_preview_size + 2 * widget_preview_padding_horizontal --> - <dimen name="widget_preview_container_width">136dp</dimen> + <dimen name="widget_preview_container_width">146dp</dimen> <dimen name="widget_cell_height">150dp</dimen> <dimen name="widget_row_padding">8dp</dimen> - <dimen name="widget_row_divider">1dp</dimen> + <dimen name="widget_row_divider">2dp</dimen> <!-- Padding applied to shortcut previews --> <dimen name="shortcut_preview_padding_left">0dp</dimen> |