diff options
| author | Winson Chung <winsonc@google.com> | 2015-04-08 11:07:53 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2015-04-08 11:10:12 -0700 |
| commit | bd808530dbfa765a33fa4fbfce46d1e0fcfcc5ca (patch) | |
| tree | ec0f3285dd26a9f16cbea293da2a51efe45eedbb | |
| parent | adb75416488f04c237b724f30deeb7f6e3fe8a52 (diff) | |
| download | android_packages_apps_Trebuchet-bd808530dbfa765a33fa4fbfce46d1e0fcfcc5ca.tar.gz android_packages_apps_Trebuchet-bd808530dbfa765a33fa4fbfce46d1e0fcfcc5ca.tar.bz2 android_packages_apps_Trebuchet-bd808530dbfa765a33fa4fbfce46d1e0fcfcc5ca.zip | |
Temporarily tweaking the all apps layout to fit the screen on tablets.
Change-Id: I2f8fe8e39a39cd6a055f22696881c51be7624832
| -rw-r--r-- | res/layout-sw600dp/apps_view.xml | 11 | ||||
| -rw-r--r-- | res/values-sw600dp/dimens.xml | 4 | ||||
| -rw-r--r-- | res/values/dimens.xml | 1 | ||||
| -rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 2 |
4 files changed, 11 insertions, 7 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> diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index b4d225e8b..2d07b8436 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -429,7 +429,7 @@ public class DeviceProfile { int availableAppsWidthPx = (appsContainerViewPx > 0) ? appsContainerViewPx : availableWidthPx; appsViewNumCols = (availableAppsWidthPx - appsViewLeftMarginPx) / - (allAppsCellWidthPx + allAppsCellPaddingPx); + (allAppsCellWidthPx + 2 * allAppsCellPaddingPx); } void updateFromConfiguration(Context context, Resources resources, int wPx, int hPx, |