diff options
author | Adam Cohen <adamcohen@google.com> | 2014-08-11 15:42:28 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-09 00:40:15 +0000 |
commit | 6551b7ef07b4d73c096cbfb22002e080b498cbbb (patch) | |
tree | c99b07defc44f522cf51bdf9006c5bc7e139530c /res | |
parent | 5337aea1536c11e5bfef49a14297fd4649baa3a3 (diff) | |
parent | 4e243a2dad3700868035256af1882d7a4fee2385 (diff) | |
download | android_packages_apps_Trebuchet-6551b7ef07b4d73c096cbfb22002e080b498cbbb.tar.gz android_packages_apps_Trebuchet-6551b7ef07b4d73c096cbfb22002e080b498cbbb.tar.bz2 android_packages_apps_Trebuchet-6551b7ef07b4d73c096cbfb22002e080b498cbbb.zip |
Merge "Updating the widget tray" into ub-now-porkchop
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/quantum_panel.9.png | bin | 557 -> 636 bytes | |||
-rw-r--r-- | res/drawable-hdpi/quantum_panel_dark.9.png | bin | 0 -> 713 bytes | |||
-rw-r--r-- | res/drawable-mdpi/quantum_panel.9.png | bin | 406 -> 438 bytes | |||
-rw-r--r-- | res/drawable-mdpi/quantum_panel_dark.9.png | bin | 0 -> 494 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/quantum_panel.9.png | bin | 764 -> 908 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/quantum_panel_dark.9.png | bin | 0 -> 951 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/quantum_panel.9.png | bin | 1073 -> 1380 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/quantum_panel_dark.9.png | bin | 0 -> 1425 bytes | |||
-rw-r--r-- | res/layout/apps_customize_widget.xml | 51 | ||||
-rw-r--r-- | res/values/attrs.xml | 5 | ||||
-rw-r--r-- | res/values/colors.xml | 3 | ||||
-rw-r--r-- | res/values/dimens.xml | 7 |
12 files changed, 41 insertions, 25 deletions
diff --git a/res/drawable-hdpi/quantum_panel.9.png b/res/drawable-hdpi/quantum_panel.9.png Binary files differindex d86d7bc1d..a005e0baa 100644 --- a/res/drawable-hdpi/quantum_panel.9.png +++ b/res/drawable-hdpi/quantum_panel.9.png diff --git a/res/drawable-hdpi/quantum_panel_dark.9.png b/res/drawable-hdpi/quantum_panel_dark.9.png Binary files differnew file mode 100644 index 000000000..057efd157 --- /dev/null +++ b/res/drawable-hdpi/quantum_panel_dark.9.png diff --git a/res/drawable-mdpi/quantum_panel.9.png b/res/drawable-mdpi/quantum_panel.9.png Binary files differindex 061c80adb..785f573ee 100644 --- a/res/drawable-mdpi/quantum_panel.9.png +++ b/res/drawable-mdpi/quantum_panel.9.png diff --git a/res/drawable-mdpi/quantum_panel_dark.9.png b/res/drawable-mdpi/quantum_panel_dark.9.png Binary files differnew file mode 100644 index 000000000..7837e4808 --- /dev/null +++ b/res/drawable-mdpi/quantum_panel_dark.9.png diff --git a/res/drawable-xhdpi/quantum_panel.9.png b/res/drawable-xhdpi/quantum_panel.9.png Binary files differindex 8605cfd26..5726fd215 100644 --- a/res/drawable-xhdpi/quantum_panel.9.png +++ b/res/drawable-xhdpi/quantum_panel.9.png diff --git a/res/drawable-xhdpi/quantum_panel_dark.9.png b/res/drawable-xhdpi/quantum_panel_dark.9.png Binary files differnew file mode 100644 index 000000000..8944a8f98 --- /dev/null +++ b/res/drawable-xhdpi/quantum_panel_dark.9.png diff --git a/res/drawable-xxhdpi/quantum_panel.9.png b/res/drawable-xxhdpi/quantum_panel.9.png Binary files differindex 9a1a79c7b..035cdc4ad 100644 --- a/res/drawable-xxhdpi/quantum_panel.9.png +++ b/res/drawable-xxhdpi/quantum_panel.9.png diff --git a/res/drawable-xxhdpi/quantum_panel_dark.9.png b/res/drawable-xxhdpi/quantum_panel_dark.9.png Binary files differnew file mode 100644 index 000000000..b74f1a65c --- /dev/null +++ b/res/drawable-xxhdpi/quantum_panel_dark.9.png diff --git a/res/layout/apps_customize_widget.xml b/res/layout/apps_customize_widget.xml index 7c98b4a9b..e299b32b0 100644 --- a/res/layout/apps_customize_widget.xml +++ b/res/layout/apps_customize_widget.xml @@ -25,24 +25,45 @@ android:background="@drawable/focusable_view_bg" android:focusable="true"> - <!-- The preview of the widget or shortcut. --> - <com.android.launcher3.PagedViewWidgetImageView - android:id="@+id/widget_preview" - style="@style/PagedViewWidgetImageView" + <LinearLayout + android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingTop="@dimen/app_widget_preview_padding_top" - android:paddingEnd="@dimen/app_widget_preview_padding_right" - android:paddingRight="@dimen/app_widget_preview_padding_right" - android:scaleType="matrix" - android:background="@drawable/screenpanel" /> + android:layout_weight="1"> + <FrameLayout + android:id="@+id/left_border" + android:layout_width="1dp" + android:layout_height="match_parent" + android:background="@color/widget_text_panel" + android:visibility="gone" /> + + <!-- The preview of the widget or shortcut. --> + <com.android.launcher3.PagedViewWidgetImageView + android:id="@+id/widget_preview" + style="@style/PagedViewWidgetImageView" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1" + android:paddingTop="@dimen/app_widget_preview_padding_top" + android:paddingEnd="@dimen/app_widget_preview_padding_right" + android:paddingRight="@dimen/app_widget_preview_padding_right" + android:scaleType="matrix" /> + <FrameLayout + android:id="@+id/right_border" + android:layout_width="1dp" + android:layout_height="match_parent" + android:background="@color/widget_text_panel" + android:visibility="gone" /> + </LinearLayout> + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/app_widget_preview_label_margin_top" - android:layout_marginStart="@dimen/app_widget_preview_label_margin_left" - android:layout_marginEnd="@dimen/app_widget_preview_label_margin_right" + android:paddingTop="@dimen/app_widget_preview_label_vertical_padding" + android:paddingBottom="@dimen/app_widget_preview_label_vertical_padding" + android:paddingLeft="@dimen/app_widget_preview_label_horizontal_padding" + android:paddingRight="@dimen/app_widget_preview_label_horizontal_padding" + android:background="@color/widget_text_panel" android:orientation="horizontal"> <!-- The name of the widget. --> <TextView xmlns:android="http://schemas.android.com/apk/res/android" @@ -56,7 +77,7 @@ android:fadingEdge="horizontal" android:textColor="#FFFFFFFF" - android:textSize="13sp" + android:textSize="12sp" android:textAlignment="viewStart" android:fontFamily="sans-serif-condensed" android:shadowRadius="2.0" @@ -73,7 +94,7 @@ android:layout_weight="0" android:gravity="start" - android:textColor="#FFAAAAAA" + android:textColor="#FFFFFFFF" android:textSize="12sp" android:fontFamily="sans-serif-condensed" android:shadowRadius="2.0" diff --git a/res/values/attrs.xml b/res/values/attrs.xml index f3bfcec61..12fa3cd2b 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -98,11 +98,6 @@ <!-- A spacing override for the icons within a page --> <attr name="pageLayoutWidthGap" format="dimension" /> <attr name="pageLayoutHeightGap" format="dimension" /> - <!-- The padding of the pages that are dynamically created per page --> - <attr name="pageLayoutPaddingTop" format="dimension" /> - <attr name="pageLayoutPaddingBottom" format="dimension" /> - <attr name="pageLayoutPaddingLeft" format="dimension" /> - <attr name="pageLayoutPaddingRight" format="dimension" /> <!-- The page indicator for this workspace --> <attr name="pageIndicator" format="reference" /> diff --git a/res/values/colors.xml b/res/values/colors.xml index 27a5b61ee..41f38921f 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -36,6 +36,7 @@ <color name="quantum_panel_text_shadow_color">#FFC4C4C4</color> <color name="folder_items_glow_color">#FFCCCCCC</color> <color name="outline_color">#FFFFFFFF</color> - + <color name="widget_text_panel">#FF374248</color> + <color name="first_run_cling_circle_background_color">#64b1ea</color> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 8e561cfc0..893d7c0db 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -62,7 +62,7 @@ <dimen name="apps_customize_tab_bar_height">52dp</dimen> <dimen name="apps_customize_tab_bar_margin_top">0dp</dimen> <dimen name="app_icon_size">48dp</dimen> - <dimen name="apps_customize_horizontal_padding">4dp</dimen> + <dimen name="apps_customize_horizontal_padding">0dp</dimen> <!-- The AppsCustomize page indicator --> <dimen name="apps_customize_page_indicator_height">12dp</dimen> @@ -89,9 +89,8 @@ <dimen name="app_widget_preview_padding_left">16dp</dimen> <dimen name="app_widget_preview_padding_right">16dp</dimen> <dimen name="app_widget_preview_padding_top">32dp</dimen> - <dimen name="app_widget_preview_label_margin_top">4dp</dimen> - <dimen name="app_widget_preview_label_margin_left">2dp</dimen> - <dimen name="app_widget_preview_label_margin_right">2dp</dimen> + <dimen name="app_widget_preview_label_vertical_padding">8dp</dimen> + <dimen name="app_widget_preview_label_horizontal_padding">8dp</dimen> <!-- Padding applied to shortcut previews --> <dimen name="shortcut_preview_padding_left">0dp</dimen> |