summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2010-08-09 13:37:56 -0700
committerWinson Chung <winsonc@google.com>2010-08-16 15:50:40 -0700
commit321e9ee68848d9e782fd557f69cc070308ffbc9c (patch)
tree0b3d38f48a16e16147b18da62e1f6d32bd3089c6 /res
parentf0d03e4e7fd8640b6b50e163c4f555d03b874ca6 (diff)
downloadandroid_packages_apps_Trebuchet-321e9ee68848d9e782fd557f69cc070308ffbc9c.tar.gz
android_packages_apps_Trebuchet-321e9ee68848d9e782fd557f69cc070308ffbc9c.tar.bz2
android_packages_apps_Trebuchet-321e9ee68848d9e782fd557f69cc070308ffbc9c.zip
Creating generic Workspace/CellLayout for paged views in Launcher.
Adding SimpleWorkspace, SimpleCellLayout and an AllApps implementation of the SimpleWorkspace. Making SimpleWorkspace support content with smaller dimensions than the workspace dimensions itself. Temporary change to AllApps tabs styling until we get new assets for tabs in general. Change-Id: Ibe3c56603223853d232816b6695e4ddd757857ba
Diffstat (limited to 'res')
-rw-r--r--res/layout-xlarge/all_apps_paged_view_application.xml29
-rw-r--r--res/layout-xlarge/all_apps_tabbed.xml39
-rw-r--r--res/values/attrs.xml9
3 files changed, 51 insertions, 26 deletions
diff --git a/res/layout-xlarge/all_apps_paged_view_application.xml b/res/layout-xlarge/all_apps_paged_view_application.xml
new file mode 100644
index 000000000..98c27377d
--- /dev/null
+++ b/res/layout-xlarge/all_apps_paged_view_application.xml
@@ -0,0 +1,29 @@
+<?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.
+-->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/name"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center_horizontal"
+
+ android:textColor="#FFFFFFFF"
+ android:shadowColor="#FF000000"
+ android:shadowDx="0.0"
+ android:shadowDy="1.0"
+
+ android:maxLines="2"
+ android:fadingEdge="horizontal" />
diff --git a/res/layout-xlarge/all_apps_tabbed.xml b/res/layout-xlarge/all_apps_tabbed.xml
index 0842fd085..dbe192ce5 100644
--- a/res/layout-xlarge/all_apps_tabbed.xml
+++ b/res/layout-xlarge/all_apps_tabbed.xml
@@ -13,44 +13,31 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.launcher2.AllAppsTabbed xmlns:android="http://schemas.android.com/apk/res/android">
+<com.android.launcher2.AllAppsTabbed
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:background="#30000000">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TabWidget
android:id="@android:id/tabs"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:tabStripEnabled="false"
+ android:paddingBottom="10dp" />
<FrameLayout
android:id="@android:id/tabcontent"
android:layout_width="match_parent"
android:layout_height="match_parent">
-
- <com.android.launcher2.AllApps2D
- android:id="@+id/all_apps_2d"
+ <com.android.launcher2.AllAppsPagedView
+ android:id="@+id/all_apps_paged_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:padding="2dip">
- <GridView android:id="@+id/all_apps_2d_grid"
- android:tag="all_apps_2d_grid"
- android:scrollbars="none"
- android:drawSelectorOnTop="false"
- android:listSelector="@drawable/grid_selector"
- android:verticalSpacing="10dip"
- android:numColumns="8"
- android:fadingEdgeLength="0dip"
- android:cacheColorHint="#00000000"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_alignParentBottom="true"
- android:layout_marginBottom="8dip"
- android:layout_marginTop="8dip"
- android:nextFocusDown="@+id/all_apps_2d_home"
- android:nextFocusUp="@null"
- android:nextFocusLeft="@null"
- android:nextFocusRight="@null" />
- </com.android.launcher2.AllApps2D>
+ cellCountX="8"
+ cellCountY="4">
+ </com.android.launcher2.AllAppsPagedView>
</FrameLayout>
</LinearLayout>
</com.android.launcher2.AllAppsTabbed>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index be2728879..09fb0dace 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -55,6 +55,15 @@
<attr name="yAxisEndPadding" format="dimension" />
</declare-styleable>
+ <!-- PagedView specific attributes. These attributes are used to customize
+ a PagedView view in XML files. -->
+ <declare-styleable name="PagedView">
+ <!-- The number of horizontal cells in a page -->
+ <attr name="cellCountX" />
+ <!-- The number of vertical cells in a page -->
+ <attr name="cellCountY" />
+ </declare-styleable>
+
<!-- DeleteZone specific attributes. These attributes are used to customize
a DeleteZone view in XML files. -->
<declare-styleable name="DeleteZone">