summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2015-04-08 18:37:21 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-08 18:37:21 +0000
commitb471b0869bc4b0bbcc0dc3a15d3b12ab1b1c0a73 (patch)
tree3a88e20807d4bcd0ad2e041949382b79c4b74d11 /res
parent73621503de4edb5fe4d17f5bf453261e68b88a7f (diff)
parentbd808530dbfa765a33fa4fbfce46d1e0fcfcc5ca (diff)
downloadandroid_packages_apps_Trebuchet-b471b0869bc4b0bbcc0dc3a15d3b12ab1b1c0a73.tar.gz
android_packages_apps_Trebuchet-b471b0869bc4b0bbcc0dc3a15d3b12ab1b1c0a73.tar.bz2
android_packages_apps_Trebuchet-b471b0869bc4b0bbcc0dc3a15d3b12ab1b1c0a73.zip
Merge "Temporarily tweaking the all apps layout to fit the screen on tablets." into ub-launcher3-burnaby
Diffstat (limited to 'res')
-rw-r--r--res/layout-sw600dp/apps_view.xml11
-rw-r--r--res/values-sw600dp/dimens.xml4
-rw-r--r--res/values/dimens.xml1
3 files changed, 10 insertions, 6 deletions
diff --git a/res/layout-sw600dp/apps_view.xml b/res/layout-sw600dp/apps_view.xml
index 6f22460fa..fba170b2e 100644
--- a/res/layout-sw600dp/apps_view.xml
+++ b/res/layout-sw600dp/apps_view.xml
@@ -18,16 +18,17 @@
android:id="@+id/apps_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#22000000"
+ android:padding="@dimen/apps_container_inset"
+ android:background="@drawable/apps_customize_bg"
android:descendantFocusability="afterDescendants">
<include
layout="@layout/apps_reveal_view"
- android:layout_width="@dimen/apps_container_width"
- android:layout_height="540dp"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:layout_gravity="center" />
<include
layout="@layout/apps_list_view"
- android:layout_width="@dimen/apps_container_width"
- android:layout_height="540dp"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:layout_gravity="center" />
</com.android.launcher3.AppsContainerView> \ No newline at end of file
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index d9075872a..d80f18c9e 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -18,7 +18,9 @@
<dimen name="app_icon_size">64dp</dimen>
<!-- Apps view -->
- <dimen name="apps_container_width">480dp</dimen>
+ <dimen name="apps_container_inset">24dp</dimen>
+ <dimen name="apps_grid_view_start_margin">64dp</dimen>
+ <dimen name="apps_view_section_text_size">26sp</dimen>
<dimen name="apps_view_row_height">76dp</dimen>
<!-- AppsCustomize -->
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c327ec2d4..735373d69 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -48,6 +48,7 @@
<!-- Apps view -->
<dimen name="apps_container_width">0dp</dimen>
+ <dimen name="apps_container_height">0dp</dimen>
<dimen name="apps_container_inset">8dp</dimen>
<dimen name="apps_grid_view_start_margin">52dp</dimen>
<dimen name="apps_view_row_height">64dp</dimen>