summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaj Yengisetty <rajesh@cyngn.com>2014-11-25 17:55:59 (GMT)
committerAbhisek Devkota <ciwrl@cyanogenmod.com>2014-12-02 01:20:12 (GMT)
commitedd7c88897e3f2048047d4696fe5514c8fd3d96c (patch)
treede2faffb540f2dee101a7e95ad00f28d26cbba37
parent48589f73feca7213df5d36648910ae1d521f9cf7 (diff)
downloadandroid_packages_apps_Trebuchet-edd7c88897e3f2048047d4696fe5514c8fd3d96c.zip
android_packages_apps_Trebuchet-edd7c88897e3f2048047d4696fe5514c8fd3d96c.tar.gz
android_packages_apps_Trebuchet-edd7c88897e3f2048047d4696fe5514c8fd3d96c.tar.bz2
Adjustments for Live Settings:
- Fix view position of PageIndicators after settings update - Fix outlines on Workspace after settings update Change-Id: I2b24cc279e4a9c76ec0b532410c1388b26521b63
-rw-r--r--src/com/android/launcher3/DeviceProfile.java2
-rw-r--r--src/com/android/launcher3/Workspace.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index cf298f9..c92eae4 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 2541c3b..6ab3642 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);