diff options
author | Raj Yengisetty <rajesh@cyngn.com> | 2014-11-25 09:55:59 -0800 |
---|---|---|
committer | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2014-12-02 01:20:12 +0000 |
commit | edd7c88897e3f2048047d4696fe5514c8fd3d96c (patch) | |
tree | de2faffb540f2dee101a7e95ad00f28d26cbba37 /src | |
parent | 48589f73feca7213df5d36648910ae1d521f9cf7 (diff) | |
download | android_packages_apps_Trebuchet-edd7c88897e3f2048047d4696fe5514c8fd3d96c.tar.gz android_packages_apps_Trebuchet-edd7c88897e3f2048047d4696fe5514c8fd3d96c.tar.bz2 android_packages_apps_Trebuchet-edd7c88897e3f2048047d4696fe5514c8fd3d96c.zip |
Adjustments for Live Settings:
- Fix view position of PageIndicators after settings update
- Fix outlines on Workspace after settings update
Change-Id: I2b24cc279e4a9c76ec0b532410c1388b26521b63
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index cf298f924..c92eae4cb 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -896,7 +896,7 @@ public class DeviceProfile { lp.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM; lp.width = LayoutParams.WRAP_CONTENT; lp.height = LayoutParams.WRAP_CONTENT; - lp.bottomMargin = hotseatBarHeightPx; + lp.bottomMargin = Math.max(hotseatBarHeightPx, lp.bottomMargin); pageIndicator.setLayoutParams(lp); } } diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 2541c3b8f..6ab3642ab 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -1544,7 +1544,7 @@ public class Workspace extends SmoothPagedView } void showOutlines() { - if (!workspaceInModalState() && !mIsSwitchingState) { + if (!mIsSwitchingState) { if (mChildrenOutlineFadeOutAnimation != null) mChildrenOutlineFadeOutAnimation.cancel(); if (mChildrenOutlineFadeInAnimation != null) mChildrenOutlineFadeInAnimation.cancel(); mChildrenOutlineFadeInAnimation = LauncherAnimUtils.ofFloat(this, "childrenOutlineAlpha", 1.0f); |