summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2010-05-04 12:45:53 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-04 12:45:53 -0700
commitf24e66dbb99b52e3ef8e56b66c807ff1d5129fca (patch)
treef5dc2543becc23eddf53765b9c3d685ac49bcb30
parent6a22fb9bef2c7e7b5cf53b356e81339f6699e551 (diff)
parent342a3800b9b31929b337d298a24184d820f27f26 (diff)
downloadframeworks_base-f24e66dbb99b52e3ef8e56b66c807ff1d5129fca.zip
frameworks_base-f24e66dbb99b52e3ef8e56b66c807ff1d5129fca.tar.gz
frameworks_base-f24e66dbb99b52e3ef8e56b66c807ff1d5129fca.tar.bz2
am 342a3800: am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo
Merge commit '342a3800b9b31929b337d298a24184d820f27f26' into kraken * commit '342a3800b9b31929b337d298a24184d820f27f26': Increase the row height of menus by 1dip.
-rw-r--r--core/res/res/layout-land/icon_menu_layout.xml2
-rw-r--r--core/res/res/layout-port/icon_menu_layout.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/res/res/layout-land/icon_menu_layout.xml b/core/res/res/layout-land/icon_menu_layout.xml
index 58f7bfb..70e3e83 100644
--- a/core/res/res/layout-land/icon_menu_layout.xml
+++ b/core/res/res/layout-land/icon_menu_layout.xml
@@ -18,7 +18,7 @@
android:id="@+android:id/icon_menu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:rowHeight="65dip"
+ android:rowHeight="66dip"
android:maxItems="6"
android:maxRows="2"
android:maxItemsPerRow="6" />
diff --git a/core/res/res/layout-port/icon_menu_layout.xml b/core/res/res/layout-port/icon_menu_layout.xml
index c84f7d2..82082da 100644
--- a/core/res/res/layout-port/icon_menu_layout.xml
+++ b/core/res/res/layout-port/icon_menu_layout.xml
@@ -18,7 +18,7 @@
android:id="@+android:id/icon_menu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:rowHeight="65dip"
+ android:rowHeight="66dip"
android:maxItems="6"
android:maxRows="3"
android:maxItemsPerRow="3" />