summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2010-06-01 14:48:12 -0700
committerDaniel Sandler <dsandler@android.com>2010-06-03 10:35:44 -0700
commit86b40541a8f48287fed0663f1e6ac10610523d32 (patch)
treee408b11a173ef07231392bed57a0bd6a32dab7ca /res
parent8802e960495e61803c18ea3dda2e30ef0a611d8f (diff)
downloadandroid_packages_apps_Trebuchet-86b40541a8f48287fed0663f1e6ac10610523d32.tar.gz
android_packages_apps_Trebuchet-86b40541a8f48287fed0663f1e6ac10610523d32.tar.bz2
android_packages_apps_Trebuchet-86b40541a8f48287fed0663f1e6ac10610523d32.zip
Make 2D All Apps work better in landscape and on hdpi.
* Correct the density (or, rather, remove the density) of the icons in the cache to ensure they're drawn px-for-px. * Create a new landscape layout for 2DAA that aligns things properly (viz: Home icon at right, padding tuned, 6 columns). * Performance improvement: Make the app grid, icons, and home icon all opaque (by setting a black background) and move the home icon so it doesn't overlap the grid. Change-Id: I961323e9e39cb122cdc694853706e7fcdd10142f
Diffstat (limited to 'res')
-rw-r--r--res/layout-land/all_apps_2d.xml63
-rw-r--r--res/layout-port/all_apps_2d.xml (renamed from res/layout/all_apps_2d.xml)4
-rw-r--r--res/values/dimens.xml4
3 files changed, 69 insertions, 2 deletions
diff --git a/res/layout-land/all_apps_2d.xml b/res/layout-land/all_apps_2d.xml
new file mode 100644
index 000000000..a253b937b
--- /dev/null
+++ b/res/layout-land/all_apps_2d.xml
@@ -0,0 +1,63 @@
+<?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.
+-->
+
+<!-- Sapphire gets 2D all apps view -->
+<com.android.launcher2.AllApps2D
+ xmlns:android="http://schemas.android.com/apk/res/android"
+
+ android:id="@+id/all_apps_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="6"
+ android:fadingEdgeLength="48dip"
+ android:cacheColorHint="#FF000000"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignParentRight="true"
+ android:layout_marginRight="@dimen/button_bar_height_portrait"
+ android:nextFocusRight="@+id/all_apps_2d_home"
+ android:nextFocusUp="@null"
+ android:nextFocusLeft="@null"
+ android:nextFocusDown="@null"
+ />
+
+ <view
+ class="com.android.launcher2.AllApps2D$HomeButton"
+ android:id="@+id/all_apps_2d_home"
+ android:tag="all_apps_2d_home"
+ android:src="@drawable/home_button"
+ android:background="#FF000000"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:layout_height="wrap_content"
+ android:layout_width="@dimen/button_bar_height_portrait"
+ android:paddingBottom="@dimen/status_bar_height"
+ android:nextFocusLeft="@+id/all_apps_2d_grid"
+ android:nextFocusDown="@null"
+ android:nextFocusUp="@null"
+ android:nextFocusRight="@null"
+ />
+
+</com.android.launcher2.AllApps2D>
diff --git a/res/layout/all_apps_2d.xml b/res/layout-port/all_apps_2d.xml
index 7bbfa91e7..0607d62cc 100644
--- a/res/layout/all_apps_2d.xml
+++ b/res/layout-port/all_apps_2d.xml
@@ -36,7 +36,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentBottom="true"
- android:layout_marginBottom="28dip"
+ android:layout_marginBottom="@dimen/button_bar_height"
android:layout_marginTop="8dip"
android:nextFocusDown="@+id/all_apps_2d_home"
android:nextFocusUp="@null"
@@ -49,7 +49,7 @@
android:id="@+id/all_apps_2d_home"
android:tag="all_apps_2d_home"
android:src="@drawable/home_button"
- android:background="#00000000"
+ android:background="#FF000000"
android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true"
android:layout_width="wrap_content"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 26cb7e630..790f83599 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -24,6 +24,10 @@
button_bar_height changes -->
<dimen name="button_bar_height_portrait">56dip</dimen>
+ <!-- roughly a status bar (for vertically centering the all apps
+ home icon in landscape) -->
+ <dimen name="status_bar_height">25dip</dimen>
+
<!-- roughly half a status bar (for vertically centering the right-hand
button cluster in landscape) -->
<dimen name="half_status_bar_height">12dip</dimen>