diff options
author | Winson Chung <winsonc@google.com> | 2011-04-27 17:40:20 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2011-04-28 14:53:51 -0700 |
commit | 4b576be59e58072cc03b5a8d36afb6a322513575 (patch) | |
tree | 4bb56e5ca8dfc2438bf71739a32a24d7687021bf /res | |
parent | 9e87bd8ee7bcd900bce27784a42fecd878016090 (diff) | |
download | android_packages_apps_Trebuchet-4b576be59e58072cc03b5a8d36afb6a322513575.tar.gz android_packages_apps_Trebuchet-4b576be59e58072cc03b5a8d36afb6a322513575.tar.bz2 android_packages_apps_Trebuchet-4b576be59e58072cc03b5a8d36afb6a322513575.zip |
Adding back the widgets pane to the merged AllApps.
- Fixing issue with holographic drag outlines being drawn offset
Change-Id: Ie0e89d76ce6714b44f9cd2ddf99ad608b51bf005
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/apps_customize_pane.xml | 6 | ||||
-rw-r--r-- | res/layout/apps_customize_widget.xml | 72 | ||||
-rw-r--r-- | res/values-land/dimens.xml | 5 | ||||
-rw-r--r-- | res/values-port/dimens.xml | 5 | ||||
-rw-r--r-- | res/values/attrs.xml | 13 |
5 files changed, 100 insertions, 1 deletions
diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml index 2b768b618..779f1e2ad 100644 --- a/res/layout/apps_customize_pane.xml +++ b/res/layout/apps_customize_pane.xml @@ -90,7 +90,11 @@ launcher:pageLayoutPaddingTop="@dimen/all_apps_view_pageLayoutPaddingTop" launcher:pageLayoutPaddingBottom="@dimen/all_apps_view_pageLayoutPaddingBottom" launcher:pageLayoutPaddingLeft="@dimen/all_apps_view_pageLayoutPaddingLeft" - launcher:pageLayoutPaddingRight="@dimen/all_apps_view_pageLayoutPaddingRight" /> + launcher:pageLayoutPaddingRight="@dimen/all_apps_view_pageLayoutPaddingRight" + 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" /> </FrameLayout> </LinearLayout> </com.android.launcher2.AppsCustomizeTabHost> diff --git a/res/layout/apps_customize_widget.xml b/res/layout/apps_customize_widget.xml new file mode 100644 index 000000000..0a196d0bf --- /dev/null +++ b/res/layout/apps_customize_widget.xml @@ -0,0 +1,72 @@ +<?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:focusable="true"> + + <!-- The icon of the widget. --> + <ImageView + android:id="@+id/widget_preview" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1" + android:adjustViewBounds="true" + android:scaleType="fitStart" /> + + <!-- The name of the widget. --> + <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" /> + + <!-- The original dimensions of the widget (can't be the same text as above due to different + style. --> + <TextView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/widget_dims" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0" + android:gravity="left|bottom" + + android:textColor="#FF999999" + android:textSize="14sp" + android:shadowColor="#99000000" + android:shadowDx="0.0" + android:shadowDy="1.0" + android:shadowRadius="1.0" /> +</com.android.launcher2.PagedViewWidget> diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml index 111a70657..9b8c92e1b 100644 --- a/res/values-land/dimens.xml +++ b/res/values-land/dimens.xml @@ -29,4 +29,9 @@ <dimen name="all_apps_view_pageLayoutPaddingBottom">10dp</dimen> <dimen name="all_apps_view_pageLayoutPaddingLeft">2dp</dimen> <dimen name="all_apps_view_pageLayoutPaddingRight">2dp</dimen> + + <dimen name="apps_customize_widget_cell_width_gap">30dp</dimen> + <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> </resources> diff --git a/res/values-port/dimens.xml b/res/values-port/dimens.xml index 5bd566fe8..98e3fc47d 100644 --- a/res/values-port/dimens.xml +++ b/res/values-port/dimens.xml @@ -28,4 +28,9 @@ <dimen name="all_apps_view_pageLayoutPaddingBottom">15dp</dimen> <dimen name="all_apps_view_pageLayoutPaddingLeft">0dp</dimen> <dimen name="all_apps_view_pageLayoutPaddingRight">0dp</dimen> + + <dimen name="apps_customize_widget_cell_width_gap">20dp</dimen> + <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> </resources> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 4f4425311..2323358c6 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -109,6 +109,19 @@ <attr name="pageSpacing" format="dimension" /> </declare-styleable> + <!-- AppsCustomizePagedView specific attributes. These attributes are used to + customize an AppsCustomizePagedView in xml files. --> + <declare-styleable name="AppsCustomizePagedView"> + <!-- Horizontal spacing between widgets --> + <attr name="widgetCellWidthGap" format="dimension" /> + <!-- Vertical spacing between widgets --> + <attr name="widgetCellHeightGap" format="dimension" /> + <!-- Number of widgets horizontally --> + <attr name="widgetCountX" format="integer" /> + <!-- Number of widgets vertically --> + <attr name="widgetCountY" format="integer" /> + </declare-styleable> + <!-- CustomizePagedView specific attributes. These attributes are used to customize a CustomizePagedView view in XML files. --> <declare-styleable name="CustomizePagedView"> |