diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable-hdpi/wallpaper_divider.png | bin | 0 -> 277 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/wallpaper_divider.png | bin | 0 -> 115 bytes | |||
| -rw-r--r-- | res/layout/apps_customize_pane.xml | 4 | ||||
| -rw-r--r-- | res/layout/apps_customize_wallpaper.xml | 68 | ||||
| -rw-r--r-- | res/layout/apps_customize_widget.xml | 1 | ||||
| -rw-r--r-- | res/values-land/dimens.xml | 2 | ||||
| -rw-r--r-- | res/values-port/dimens.xml | 2 | ||||
| -rw-r--r-- | res/values-xlarge/styles.xml | 1 | ||||
| -rw-r--r-- | res/values/attrs.xml | 6 | ||||
| -rw-r--r-- | res/values/styles.xml | 6 |
10 files changed, 85 insertions, 5 deletions
diff --git a/res/drawable-hdpi/wallpaper_divider.png b/res/drawable-hdpi/wallpaper_divider.png Binary files differnew file mode 100644 index 000000000..2f92d6004 --- /dev/null +++ b/res/drawable-hdpi/wallpaper_divider.png diff --git a/res/drawable-mdpi/wallpaper_divider.png b/res/drawable-mdpi/wallpaper_divider.png Binary files differnew file mode 100644 index 000000000..1b453c5fa --- /dev/null +++ b/res/drawable-mdpi/wallpaper_divider.png diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml index 779f1e2ad..05884ef73 100644 --- a/res/layout/apps_customize_pane.xml +++ b/res/layout/apps_customize_pane.xml @@ -94,7 +94,9 @@ launcher:widgetCellWidthGap="@dimen/apps_customize_widget_cell_width_gap" launcher:widgetCellHeightGap="@dimen/apps_customize_widget_cell_height_gap" launcher:widgetCountX="@integer/apps_customize_widget_cell_count_x" - launcher:widgetCountY="@integer/apps_customize_widget_cell_count_y" /> + launcher:widgetCountY="@integer/apps_customize_widget_cell_count_y" + launcher:wallpaperCountX="@integer/apps_customize_wallpaper_cell_count_x" + launcher:wallpaperCountY="@integer/apps_customize_wallpaper_cell_count_y" /> </FrameLayout> </LinearLayout> </com.android.launcher2.AppsCustomizeTabHost> diff --git a/res/layout/apps_customize_wallpaper.xml b/res/layout/apps_customize_wallpaper.xml new file mode 100644 index 000000000..d93825f8c --- /dev/null +++ b/res/layout/apps_customize_wallpaper.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<com.android.launcher2.PagedViewWidget + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1" + android:orientation="vertical" + + launcher:blurColor="#FF6B8CF0" + launcher:outlineColor="#FF8CD2FF" + + android:background="@drawable/focusable_view_bg" + android:focusable="true"> + + <!-- The wallpaper preview. --> + <ImageView + android:id="@+id/widget_preview" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1" + android:paddingBottom="10dp" + android:adjustViewBounds="true" + android:scaleType="fitStart" /> + + <!-- The divider image. --> + <ImageView + android:id="@+id/divider" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0" + android:paddingTop="10dp" + android:paddingBottom="10dp" + android:src="@drawable/widget_divider" /> + + <!-- The name of the wallpaper. --> + <TextView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/widget_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0" + android:gravity="left|bottom" + + android:textColor="#FFFFFFFF" + android:textSize="14sp" + android:shadowColor="#FF000000" + android:shadowDx="0.0" + android:shadowDy="1.0" + android:shadowRadius="1.0" + + android:maxLines="2" + android:fadingEdge="horizontal" /> +</com.android.launcher2.PagedViewWidget> diff --git a/res/layout/apps_customize_widget.xml b/res/layout/apps_customize_widget.xml index 6ba65c811..9d0764cbb 100644 --- a/res/layout/apps_customize_widget.xml +++ b/res/layout/apps_customize_widget.xml @@ -34,6 +34,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="1" + android:paddingBottom="5dp" android:adjustViewBounds="true" android:scaleType="fitStart" /> diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml index 9b8c92e1b..e1b021428 100644 --- a/res/values-land/dimens.xml +++ b/res/values-land/dimens.xml @@ -34,4 +34,6 @@ <dimen name="apps_customize_widget_cell_height_gap">0dp</dimen> <integer name="apps_customize_widget_cell_count_x">3</integer> <integer name="apps_customize_widget_cell_count_y">1</integer> + <integer name="apps_customize_wallpaper_cell_count_x">3</integer> + <integer name="apps_customize_wallpaper_cell_count_y">1</integer> </resources> diff --git a/res/values-port/dimens.xml b/res/values-port/dimens.xml index 98e3fc47d..7d50c1a0c 100644 --- a/res/values-port/dimens.xml +++ b/res/values-port/dimens.xml @@ -33,4 +33,6 @@ <dimen name="apps_customize_widget_cell_height_gap">40dp</dimen> <integer name="apps_customize_widget_cell_count_x">2</integer> <integer name="apps_customize_widget_cell_count_y">2</integer> + <integer name="apps_customize_wallpaper_cell_count_x">1</integer> + <integer name="apps_customize_wallpaper_cell_count_y">1</integer> </resources> diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml index 96d9cc9ff..bcbe038ac 100644 --- a/res/values-xlarge/styles.xml +++ b/res/values-xlarge/styles.xml @@ -47,6 +47,7 @@ <item name="android:paddingRight">40dp</item> <item name="android:paddingTop">15dp</item> <item name="android:paddingBottom">20dp</item> + <item name="android:textSize">20sp</item> </style> <style name="config_orientation"> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 2323358c6..75b93bf0d 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -112,7 +112,7 @@ <!-- AppsCustomizePagedView specific attributes. These attributes are used to customize an AppsCustomizePagedView in xml files. --> <declare-styleable name="AppsCustomizePagedView"> - <!-- Horizontal spacing between widgets --> + <!-- Horizontal spacing between widgets and wallpapers --> <attr name="widgetCellWidthGap" format="dimension" /> <!-- Vertical spacing between widgets --> <attr name="widgetCellHeightGap" format="dimension" /> @@ -120,6 +120,10 @@ <attr name="widgetCountX" format="integer" /> <!-- Number of widgets vertically --> <attr name="widgetCountY" format="integer" /> + <!-- Number of wallpaper pickers horizontally --> + <attr name="wallpaperCountX" format="integer" /> + <!-- Number of wallpaper pickers vertically --> + <attr name="wallpaperCountY" format="integer" /> </declare-styleable> <!-- CustomizePagedView specific attributes. These attributes are used to customize diff --git a/res/values/styles.xml b/res/values/styles.xml index ac7d4df73..abe6ac4c6 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -72,13 +72,13 @@ <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">match_parent</item> <item name="android:gravity">center</item> - <item name="android:paddingLeft">30dp</item> - <item name="android:paddingRight">30dp</item> + <item name="android:paddingLeft">15dp</item> + <item name="android:paddingRight">15dp</item> <item name="android:paddingTop">10dp</item> <item name="android:paddingBottom">15dp</item> <item name="android:background">@drawable/tab_widget_indicator_selector</item> <item name="android:textColor">@color/tab_widget_indicator_color</item> - <item name="android:textSize">20sp</item> + <item name="android:textSize">16sp</item> <item name="android:shadowColor">#393939</item> <item name="android:shadowDx">0.0</item> <item name="android:shadowDy">1.0</item> |
