commit 74e473f7eef4558e4bb21a5ee3e37b2d272a0e9d
author Hyunyoung Song <hyunyoungs@google.com> Tue Jun 21 18:39:37 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jun 21 18:39:37 2016 +0000
tree 72b13bb72751909b7d538469273ddc4cb930ac1d
parent 8c4b2bdc8b62aaa5cdf3b809e072d9e0d32e5b5e
parent 314d53fbafa591aa310639b9ce085c5304a24535

Merge \"Fix container horizontal padding\" into ub-launcher3-calgary
am: 314d53fbaf

Change-Id: Ia16127fa4a868de5b51f1ce9d96cb349edfd2162

src/com/android/launcher3/BaseContainerView.java

diff --git a/src/com/android/launcher3/BaseContainerView.java b/src/com/android/launcher3/BaseContainerView.java
index d7dec6e..84bd88d 100644
--- a/src/com/android/launcher3/BaseContainerView.java
+++ b/src/com/android/launcher3/BaseContainerView.java
@@ -53,7 +53,7 @@
         Launcher launcher = Launcher.getLauncher(context);
         int width = launcher.getDeviceProfile().availableWidthPx;
         if (FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP &&
-                this instanceof AllAppsContainerView && launcher.getDeviceProfile().isLandscape) {
+                this instanceof AllAppsContainerView && !launcher.getDeviceProfile().isLandscape) {
             mHorizontalPadding = 0;
         } else {
             mHorizontalPadding = DeviceProfile.getContainerPadding(context, width);