diff options
author | Mark Brophy <mbrophy@google.com> | 2014-08-11 12:42:57 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-08 18:15:47 +0000 |
commit | 5337aea1536c11e5bfef49a14297fd4649baa3a3 (patch) | |
tree | c7ed85e7d1f17182475da9d336dae9c4257c221a /res | |
parent | d3ad9828d15f9c8fa435f2d59cd5a18e9ebee100 (diff) | |
parent | fd0f02ce428880e7dc59ebc94717c3e25d22cbb7 (diff) | |
download | android_packages_apps_Trebuchet-5337aea1536c11e5bfef49a14297fd4649baa3a3.tar.gz android_packages_apps_Trebuchet-5337aea1536c11e5bfef49a14297fd4649baa3a3.tar.bz2 android_packages_apps_Trebuchet-5337aea1536c11e5bfef49a14297fd4649baa3a3.zip |
Merge "Revert "Updating the widget tray"" into ub-now-porkchop
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/quantum_panel.9.png | bin | 636 -> 557 bytes | |||
-rw-r--r-- | res/drawable-hdpi/quantum_panel_dark.9.png | bin | 713 -> 0 bytes | |||
-rw-r--r-- | res/drawable-mdpi/quantum_panel.9.png | bin | 438 -> 406 bytes | |||
-rw-r--r-- | res/drawable-mdpi/quantum_panel_dark.9.png | bin | 494 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/quantum_panel.9.png | bin | 908 -> 764 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/quantum_panel_dark.9.png | bin | 951 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/quantum_panel.9.png | bin | 1380 -> 1073 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/quantum_panel_dark.9.png | bin | 1425 -> 0 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, 25 insertions, 41 deletions
diff --git a/res/drawable-hdpi/quantum_panel.9.png b/res/drawable-hdpi/quantum_panel.9.png Binary files differindex a005e0baa..d86d7bc1d 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 differdeleted file mode 100644 index 057efd157..000000000 --- a/res/drawable-hdpi/quantum_panel_dark.9.png +++ /dev/null diff --git a/res/drawable-mdpi/quantum_panel.9.png b/res/drawable-mdpi/quantum_panel.9.png Binary files differindex 785f573ee..061c80adb 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 differdeleted file mode 100644 index 7837e4808..000000000 --- a/res/drawable-mdpi/quantum_panel_dark.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/quantum_panel.9.png b/res/drawable-xhdpi/quantum_panel.9.png Binary files differindex 5726fd215..8605cfd26 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 differdeleted file mode 100644 index 8944a8f98..000000000 --- a/res/drawable-xhdpi/quantum_panel_dark.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/quantum_panel.9.png b/res/drawable-xxhdpi/quantum_panel.9.png Binary files differindex 035cdc4ad..9a1a79c7b 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 differdeleted file mode 100644 index b74f1a65c..000000000 --- a/res/drawable-xxhdpi/quantum_panel_dark.9.png +++ /dev/null diff --git a/res/layout/apps_customize_widget.xml b/res/layout/apps_customize_widget.xml index e299b32b0..7c98b4a9b 100644 --- a/res/layout/apps_customize_widget.xml +++ b/res/layout/apps_customize_widget.xml @@ -25,45 +25,24 @@ android:background="@drawable/focusable_view_bg" android:focusable="true"> - <LinearLayout - android:orientation="horizontal" + <!-- 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="wrap_content" - 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> - + 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" /> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - 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: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:orientation="horizontal"> <!-- The name of the widget. --> <TextView xmlns:android="http://schemas.android.com/apk/res/android" @@ -77,7 +56,7 @@ android:fadingEdge="horizontal" android:textColor="#FFFFFFFF" - android:textSize="12sp" + android:textSize="13sp" android:textAlignment="viewStart" android:fontFamily="sans-serif-condensed" android:shadowRadius="2.0" @@ -94,7 +73,7 @@ android:layout_weight="0" android:gravity="start" - android:textColor="#FFFFFFFF" + android:textColor="#FFAAAAAA" 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 12fa3cd2b..f3bfcec61 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -98,6 +98,11 @@ <!-- 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 41f38921f..27a5b61ee 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -36,7 +36,6 @@ <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 893d7c0db..8e561cfc0 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">0dp</dimen> + <dimen name="apps_customize_horizontal_padding">4dp</dimen> <!-- The AppsCustomize page indicator --> <dimen name="apps_customize_page_indicator_height">12dp</dimen> @@ -89,8 +89,9 @@ <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_vertical_padding">8dp</dimen> - <dimen name="app_widget_preview_label_horizontal_padding">8dp</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> <!-- Padding applied to shortcut previews --> <dimen name="shortcut_preview_padding_left">0dp</dimen> |