diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-01-12 10:35:32 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-01-12 10:35:55 -0800 |
commit | ecdc24f6f667319db56a16dd7d1efda16dfe662e (patch) | |
tree | 2ce76cff46526b5204708896b367d732deefc7e0 /src/com/android/launcher3/LauncherRootView.java | |
parent | e70fb6f8ef03561b7875b872d0efa4ae2a5926af (diff) | |
download | android_packages_apps_Trebuchet-ecdc24f6f667319db56a16dd7d1efda16dfe662e.tar.gz android_packages_apps_Trebuchet-ecdc24f6f667319db56a16dd7d1efda16dfe662e.tar.bz2 android_packages_apps_Trebuchet-ecdc24f6f667319db56a16dd7d1efda16dfe662e.zip |
Fixing custom content screen not aligned properly in landscape
Bug: 26413100
Change-Id: I1a111c9d2b0dfdfbc3cbd566e5784a1ed2bb6719
Diffstat (limited to 'src/com/android/launcher3/LauncherRootView.java')
-rw-r--r-- | src/com/android/launcher3/LauncherRootView.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/LauncherRootView.java b/src/com/android/launcher3/LauncherRootView.java index 71ccd85fc..55a512fb5 100644 --- a/src/com/android/launcher3/LauncherRootView.java +++ b/src/com/android/launcher3/LauncherRootView.java @@ -14,6 +14,7 @@ public class LauncherRootView extends InsettableFrameLayout { private final Paint mOpaquePaint; private boolean mDrawRightInsetBar; + private int mRightInsetBarWidth; private View mAlignedView; @@ -41,9 +42,10 @@ public class LauncherRootView extends InsettableFrameLayout { mDrawRightInsetBar = insets.right > 0 && (!Utilities.ATLEAST_MARSHMALLOW || getContext().getSystemService(ActivityManager.class).isLowRamDevice()); + mRightInsetBarWidth = insets.right; setInsets(mDrawRightInsetBar ? new Rect(0, insets.top, 0, insets.bottom) : insets); - if (mAlignedView != null) { + if (mAlignedView != null && mDrawRightInsetBar) { // Apply margins on aligned view to handle left/right insets. MarginLayoutParams lp = (MarginLayoutParams) mAlignedView.getLayoutParams(); if (lp.leftMargin != insets.left || lp.rightMargin != insets.right) { @@ -63,7 +65,7 @@ public class LauncherRootView extends InsettableFrameLayout { // If the right inset is opaque, draw a black rectangle to ensure that is stays opaque. if (mDrawRightInsetBar) { int width = getWidth(); - canvas.drawRect(width - mInsets.right, 0, width, getHeight(), mOpaquePaint); + canvas.drawRect(width - mRightInsetBarWidth, 0, width, getHeight(), mOpaquePaint); } } }
\ No newline at end of file |