diff options
| author | Winson Chung <winsonc@google.com> | 2012-05-23 11:28:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-23 11:28:19 -0700 |
| commit | cb54509b7ea1cb9fde7381e03bb8f8b46e38191b (patch) | |
| tree | 75c28f53cd1a86b8d6d6d176416f1e5bf3ea9ee7 | |
| parent | bf2589fb51613f185b65140c40c4c52541af7b29 (diff) | |
| parent | eff06b06a5a29b699338ce04396a59735e9fd71a (diff) | |
| download | android_packages_apps_Trebuchet-cb54509b7ea1cb9fde7381e03bb8f8b46e38191b.tar.gz android_packages_apps_Trebuchet-cb54509b7ea1cb9fde7381e03bb8f8b46e38191b.tar.bz2 android_packages_apps_Trebuchet-cb54509b7ea1cb9fde7381e03bb8f8b46e38191b.zip | |
am eff06b06: Merge "Fixing regression in landscape launcher, and enlarging the voice search proxy touch view." into jb-dev
* commit 'eff06b06a5a29b699338ce04396a59735e9fd71a':
Fixing regression in landscape launcher, and enlarging the voice search proxy touch view.
| -rw-r--r-- | res/layout-land/launcher.xml | 10 | ||||
| -rw-r--r-- | res/layout-port/launcher.xml | 4 | ||||
| -rw-r--r-- | res/values-sw600dp-land/dimens.xml | 6 |
3 files changed, 18 insertions, 2 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 99d4181f9..6b65f5666 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -76,6 +76,16 @@ android:id="@+id/qsb_bar" layout="@layout/qsb_bar" /> + <com.android.launcher2.DrawableStateProxyView + android:id="@+id/voice_button_proxy" + android:layout_width="@dimen/qsb_bar_height" + android:layout_height="@dimen/app_icon_size" + android:layout_gravity="bottom|left" + android:clickable="true" + android:onClick="onClickVoiceButton" + android:importantForAccessibility="no" + launcher:sourceViewId="@+id/voice_button" /> + <include layout="@layout/apps_customize_pane" android:id="@+id/apps_customize_pane" android:layout_width="match_parent" diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index f60a204da..a4275010b 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -75,9 +75,9 @@ <com.android.launcher2.DrawableStateProxyView android:id="@+id/voice_button_proxy" - android:layout_width="@dimen/qsb_bar_height" + android:layout_width="80dp" android:layout_height="@dimen/qsb_bar_height" - android:layout_gravity="right" + android:layout_gravity="top|right" android:clickable="true" android:onClick="onClickVoiceButton" android:importantForAccessibility="no" diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml index 9c54cf3db..109372950 100644 --- a/res/values-sw600dp-land/dimens.xml +++ b/res/values-sw600dp-land/dimens.xml @@ -31,4 +31,10 @@ <!-- QSB --> <dimen name="qsb_bar_height">82dp</dimen> + +<!-- Workspace --> + <dimen name="workspace_divider_padding_top">12dp</dimen> + <dimen name="workspace_divider_padding_bottom">12dp</dimen> + <dimen name="workspace_divider_padding_left">0dp</dimen> + <dimen name="workspace_divider_padding_right">0dp</dimen> </resources> |