summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2015-06-05 18:09:35 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-05 18:09:35 +0000
commit6103501fa6c70ca112ac867e18e5f82021bf4f7c (patch)
tree7a371d309afdabb03f7db35bb17288ecc065cdf4 /res/layout
parent7501adf4b71bb17d0785a5939efbcac4b39125c3 (diff)
parent2c6e5ccbcd7c3f87e7e85029782440600dc0a3d8 (diff)
downloadandroid_packages_apps_Trebuchet-6103501fa6c70ca112ac867e18e5f82021bf4f7c.tar.gz
android_packages_apps_Trebuchet-6103501fa6c70ca112ac867e18e5f82021bf4f7c.tar.bz2
android_packages_apps_Trebuchet-6103501fa6c70ca112ac867e18e5f82021bf4f7c.zip
Merge "Ensuring that we use the screen width more optimally in AllApps." into ub-launcher3-burnaby
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/all_apps_container.xml1
-rw-r--r--res/layout/all_apps_icon.xml2
-rw-r--r--res/layout/all_apps_prediction_bar_icon.xml2
3 files changed, 3 insertions, 2 deletions
diff --git a/res/layout/all_apps_container.xml b/res/layout/all_apps_container.xml
index a20ab46d8..fc77cd31f 100644
--- a/res/layout/all_apps_container.xml
+++ b/res/layout/all_apps_container.xml
@@ -38,6 +38,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_apps_search_bar_height"
+ android:paddingBottom="@dimen/all_apps_prediction_bar_bottom_padding"
android:orientation="horizontal"
android:descendantFocusability="afterDescendants"
android:focusable="true"
diff --git a/res/layout/all_apps_icon.xml b/res/layout/all_apps_icon.xml
index 10ed25c47..0985e95c0 100644
--- a/res/layout/all_apps_icon.xml
+++ b/res/layout/all_apps_icon.xml
@@ -20,7 +20,7 @@
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="left|center_vertical"
+ android:layout_gravity="center"
android:paddingTop="@dimen/all_apps_icon_top_bottom_padding"
android:paddingBottom="@dimen/all_apps_icon_top_bottom_padding"
android:focusable="true"
diff --git a/res/layout/all_apps_prediction_bar_icon.xml b/res/layout/all_apps_prediction_bar_icon.xml
index 1e75d14b6..5f63f6bdb 100644
--- a/res/layout/all_apps_prediction_bar_icon.xml
+++ b/res/layout/all_apps_prediction_bar_icon.xml
@@ -19,7 +19,7 @@
style="@style/Icon.AllApps"
android:id="@+id/icon"
android:layout_width="0dp"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:focusable="true"