diff options
author | Winson Chung <winsonc@google.com> | 2010-09-10 11:44:42 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2010-09-15 14:45:11 -0700 |
commit | e3193b93ad7bf33e2e45319084a99b9fc986622b (patch) | |
tree | 7d9676014362869b928faefa0a9323d2e8a3edb9 /res | |
parent | 1ff706b8c03063740ca74868fea46fa47d71bb27 (diff) | |
download | android_packages_apps_Trebuchet-e3193b93ad7bf33e2e45319084a99b9fc986622b.tar.gz android_packages_apps_Trebuchet-e3193b93ad7bf33e2e45319084a99b9fc986622b.tar.bz2 android_packages_apps_Trebuchet-e3193b93ad7bf33e2e45319084a99b9fc986622b.zip |
Initital changes for new customization drawer/widget tab design.
Change-Id: I160c8777fe2657ab303acfa20934f2e90f9e953e
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable/default_widget_preview.9.png | bin | 3976 -> 634 bytes | |||
-rw-r--r-- | res/drawable/widget_divider.png | bin | 0 -> 115 bytes | |||
-rw-r--r-- | res/layout-xlarge-land/customization_drawer.xml | 22 | ||||
-rw-r--r-- | res/layout-xlarge-port/customization_drawer.xml | 22 | ||||
-rw-r--r-- | res/layout-xlarge/customize_paged_view_widget.xml | 74 | ||||
-rw-r--r-- | res/layout-xlarge/launcher.xml | 2 | ||||
-rw-r--r-- | res/values-xlarge/dimens.xml | 2 | ||||
-rw-r--r-- | res/values/attrs.xml | 7 |
8 files changed, 111 insertions, 18 deletions
diff --git a/res/drawable/default_widget_preview.9.png b/res/drawable/default_widget_preview.9.png Binary files differindex b3ddada41..5fedcc881 100644 --- a/res/drawable/default_widget_preview.9.png +++ b/res/drawable/default_widget_preview.9.png diff --git a/res/drawable/widget_divider.png b/res/drawable/widget_divider.png Binary files differnew file mode 100644 index 000000000..1b453c5fa --- /dev/null +++ b/res/drawable/widget_divider.png diff --git a/res/layout-xlarge-land/customization_drawer.xml b/res/layout-xlarge-land/customization_drawer.xml new file mode 100644 index 000000000..4fcf761d1 --- /dev/null +++ b/res/layout-xlarge-land/customization_drawer.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 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.CustomizePagedView + 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" + launcher:widgetCellCountX="16" />
\ No newline at end of file diff --git a/res/layout-xlarge-port/customization_drawer.xml b/res/layout-xlarge-port/customization_drawer.xml new file mode 100644 index 000000000..6e4bc4c23 --- /dev/null +++ b/res/layout-xlarge-port/customization_drawer.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 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.CustomizePagedView + 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" + launcher:widgetCellCountX="12" />
\ No newline at end of file diff --git a/res/layout-xlarge/customize_paged_view_widget.xml b/res/layout-xlarge/customize_paged_view_widget.xml index da5342b0b..4d70a1268 100644 --- a/res/layout-xlarge/customize_paged_view_widget.xml +++ b/res/layout-xlarge/customize_paged_view_widget.xml @@ -13,20 +13,62 @@ See the License for the specific language governing permissions and limitations under the License. --> - -<TextView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/name" - android:layout_width="match_parent" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" android:layout_height="match_parent" - android:gravity="center_horizontal" - android:paddingTop="2dip" - - 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" /> + android:paddingLeft="12.5dp" + android:paddingRight="12.5dp" + android:paddingTop="40dp" + android:paddingBottom="50dp" + android:gravity="top" + android:orientation="vertical"> + + <!-- The icon of the widget. --> + <ImageView + android:id="@+id/icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1.0" + android:scaleType="fitStart" /> + + <!-- The divider image. --> + <ImageView + android:id="@+id/divider" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingTop="10dp" + android:paddingBottom="10dp" + android:src="@drawable/widget_divider" /> + + <!-- The name of the widget. --> + <TextView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="left" + + 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/dims" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="left" + + android:textColor="#FF999999" + android:textSize="14sp" + android:shadowColor="#99000000" + android:shadowDx="0.0" + android:shadowDy="1.0" + android:shadowRadius="1.0" /> +</LinearLayout> diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml index a3c7558e3..c6acec39a 100644 --- a/res/layout-xlarge/launcher.xml +++ b/res/layout-xlarge/launcher.xml @@ -128,7 +128,7 @@ <TabHost android:id="@android:id/tabhost" android:layout_width="match_parent" - android:layout_height="550dip" + android:layout_height="500dip" android:layout_gravity="bottom"> <LinearLayout android:orientation="vertical" diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml index 9c658977c..4662aad9f 100644 --- a/res/values-xlarge/dimens.xml +++ b/res/values-xlarge/dimens.xml @@ -23,7 +23,7 @@ <dimen name="smallScreenExtraSpacing">0dip</dimen> <!-- vertical spacing between edge of screen and mini screen thumbnails --> - <dimen name="smallScreenVerticalMargin">20dip</dimen> + <dimen name="smallScreenVerticalMargin">60dip</dimen> <dimen name="toolbar_padding">10dip</dimen> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 09fb0dace..8aa6efbf9 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -64,6 +64,13 @@ <attr name="cellCountY" /> </declare-styleable> + <!-- CustomizePagedView specific attributes. These attributes are used to customize + a CustomizePagedView view in XML files. --> + <declare-styleable name="CustomizePagedView"> + <!-- The number of horizontal cells for the widget tab --> + <attr name="widgetCellCountX" format="integer" /> + </declare-styleable> + <!-- DeleteZone specific attributes. These attributes are used to customize a DeleteZone view in XML files. --> <declare-styleable name="DeleteZone"> |