summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/BaseContainerView.java
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2016-06-28 12:16:47 -0700
committerHyunyoung Song <hyunyoungs@google.com>2016-06-28 12:27:41 -0700
commitf7e5e374feeb7a5b6fe5166085c545e445bf6b72 (patch)
treeec3ec96f27c4dcf19cb7fafefbfe419af3a24db0 /src/com/android/launcher3/BaseContainerView.java
parent4a582162bc22f1141c5c1a68741e8609c4f7d54d (diff)
downloadandroid_packages_apps_Trebuchet-f7e5e374feeb7a5b6fe5166085c545e445bf6b72.tar.gz
android_packages_apps_Trebuchet-f7e5e374feeb7a5b6fe5166085c545e445bf6b72.tar.bz2
android_packages_apps_Trebuchet-f7e5e374feeb7a5b6fe5166085c545e445bf6b72.zip
Prevent all apps transition NPE
b/29643291 b/29642263 > Also do not change status bar when landscape mode Change-Id: I1e44af8e031856a50a7413ad297c437245e8b2aa
Diffstat (limited to 'src/com/android/launcher3/BaseContainerView.java')
-rw-r--r--src/com/android/launcher3/BaseContainerView.java3
1 files changed, 2 insertions, 1 deletions
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);