From f7e5e374feeb7a5b6fe5166085c545e445bf6b72 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Tue, 28 Jun 2016 12:16:47 -0700
Subject: Prevent all apps transition NPE

b/29643291
b/29642263

> Also do not change status bar when landscape mode

Change-Id: I1e44af8e031856a50a7413ad297c437245e8b2aa
---
 src/com/android/launcher3/BaseContainerView.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/com/android/launcher3/BaseContainerView.java')

diff --git a/src/com/android/launcher3/BaseContainerView.java b/src/com/android/launcher3/BaseContainerView.java
index 84bd88dc4..45d0b5243 100644
--- a/src/com/android/launcher3/BaseContainerView.java
+++ b/src/com/android/launcher3/BaseContainerView.java
@@ -53,7 +53,8 @@ public abstract class BaseContainerView extends FrameLayout {
         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().isVerticalBarLayout()) {
             mHorizontalPadding = 0;
         } else {
             mHorizontalPadding = DeviceProfile.getContainerPadding(context, width);
-- 
cgit v1.2.3