summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2016-08-23 18:11:24 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-08-23 18:11:25 +0000
commit6b5e60d0e4a9b5e49ae3c544893eac3fc02af968 (patch)
tree2c74cb3e9bedba9351627c15e0ce610b59b0ad0d /src
parent5f2ea1e9ce0dd7b9f40b8198381ebecdac11fcda (diff)
parent9d96fd579039d07a6a36887ae699907631014c8d (diff)
downloadandroid_packages_apps_Trebuchet-6b5e60d0e4a9b5e49ae3c544893eac3fc02af968.tar.gz
android_packages_apps_Trebuchet-6b5e60d0e4a9b5e49ae3c544893eac3fc02af968.tar.bz2
android_packages_apps_Trebuchet-6b5e60d0e4a9b5e49ae3c544893eac3fc02af968.zip
Merge "Landscape container padding update. b/30021487" into ub-launcher3-calgary-polish
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/DeviceProfile.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 15f47b4fc..e6802bd27 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -589,9 +589,9 @@ public class DeviceProfile {
return new int[] {0, 0};
}
- // In landscape, we just match the vertical display width
- int containerWidth = heightPx;
- int padding = (availableWidthPx - containerWidth) / 2;
+ // In landscape, we match the width of the workspace
+ int padding = (pageIndicatorLandGutterRightNavBarPx +
+ hotseatBarHeightPx + hotseatLandGutterPx + mInsets.left) / 2;
return new int[]{ padding, padding };
}
}