summaryrefslogtreecommitdiffstats
path: root/src
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 /src
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 'src')
-rw-r--r--src/com/android/launcher3/DeviceProfile.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 73f54ab70..331695acc 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,