diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2015-04-17 19:02:30 -0700 |
---|---|---|
committer | Hyunyoung Song <hyunyoungs@google.com> | 2015-04-19 19:25:49 -0700 |
commit | 4cea4c830283e017fc36197cfe9d7ce713aec49d (patch) | |
tree | 786e402b2d907cb468ade930ce7a9643ca6b742c /res/layout | |
parent | 7af216ff04b7f0c3852119b476d8f692edfcaaa7 (diff) | |
download | android_packages_apps_Trebuchet-4cea4c830283e017fc36197cfe9d7ce713aec49d.tar.gz android_packages_apps_Trebuchet-4cea4c830283e017fc36197cfe9d7ce713aec49d.tar.bz2 android_packages_apps_Trebuchet-4cea4c830283e017fc36197cfe9d7ce713aec49d.zip |
WidgetTray UI tweak
- set fixed image view width
- fade in when widget bitmap populates
- widget dimension is next to the widget name text.
- elevation of the widgets content and the reveal view is the same
b/19897708
Change-Id: Ia656144412e7d63a491ce67ff15fb58c05d9a9d9
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/widget_cell.xml | 12 | ||||
-rw-r--r-- | res/layout/widgets_view.xml | 10 |
2 files changed, 10 insertions, 12 deletions
diff --git a/res/layout/widget_cell.xml b/res/layout/widget_cell.xml index a5b25aadb..f53b74ef8 100644 --- a/res/layout/widget_cell.xml +++ b/res/layout/widget_cell.xml @@ -16,16 +16,16 @@ <com.android.launcher3.widget.WidgetCell xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res-auto" - - android:layout_width="wrap_content" + android:layout_width="@dimen/widget_preview_container_width" android:layout_height="wrap_content" android:layout_weight="1" + android:paddingTop="@dimen/widget_preview_padding_top" android:orientation="vertical" android:background="@drawable/focusable_view_bg" android:focusable="true"> <LinearLayout - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingTop="@dimen/widget_preview_label_vertical_padding" android:paddingBottom="@dimen/widget_preview_label_vertical_padding" @@ -64,6 +64,7 @@ android:textColor="#FFFFFFFF" android:textSize="12sp" + android:textAlignment="viewStart" android:fontFamily="sans-serif-condensed" android:shadowRadius="2.0" android:shadowColor="#B0000000" /> @@ -73,12 +74,9 @@ <com.android.launcher3.widget.WidgetImageView android:id="@+id/widget_preview" style="@style/WidgetImageView" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:paddingTop="@dimen/widget_preview_padding_top" - android:paddingEnd="@dimen/widget_preview_padding_right" - android:paddingRight="@dimen/widget_preview_padding_right" android:scaleType="matrix" /> </com.android.launcher3.widget.WidgetCell> diff --git a/res/layout/widgets_view.xml b/res/layout/widgets_view.xml index 8e7ed161a..0800f59aa 100644 --- a/res/layout/widgets_view.xml +++ b/res/layout/widgets_view.xml @@ -25,16 +25,16 @@ android:paddingBottom="@dimen/widget_container_inset" android:descendantFocusability="afterDescendants"> - <!-- Temporary until finalizing on animation. --> - <include + <FrameLayout android:id="@+id/widgets_reveal_view" - layout="@layout/apps_reveal_view" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_gravity="center" /> + android:layout_gravity="center" + android:visibility="invisible" + android:focusable="false" /> <LinearLayout - android:id="@+id/content" + android:id="@+id/widgets_content" android:layout_width="match_parent" android:layout_height="match_parent" android:clipChildren="false" |