summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaj Yengisetty <rajesh@cyngn.com>2014-07-08 23:12:45 (GMT)
committerRaj Yengisetty <rajesh@cyngn.com>2014-07-08 23:12:45 (GMT)
commit8efcdccdfdc723d9998cd86d4bd2cbbd84799361 (patch)
treee43c0b4a57d0b96f8c2e3e45e4c9b40ea2f8d25c
parent7a812e245677db527b863060821e47b0ba3b0105 (diff)
downloadandroid_packages_apps_Trebuchet-8efcdccdfdc723d9998cd86d4bd2cbbd84799361.zip
android_packages_apps_Trebuchet-8efcdccdfdc723d9998cd86d4bd2cbbd84799361.tar.gz
android_packages_apps_Trebuchet-8efcdccdfdc723d9998cd86d4bd2cbbd84799361.tar.bz2
Fixes:
- Hide search bar if live settings are toggled in overview mode - Restore workspace outlines in overview mode after live settings changes Change-Id: Iee9894f674c78ba3c82486de97e34d610c04a2a5
-rw-r--r--src/com/android/launcher3/OverviewSettingsPanel.java2
-rw-r--r--src/com/android/launcher3/Workspace.java11
2 files changed, 7 insertions, 6 deletions
diff --git a/src/com/android/launcher3/OverviewSettingsPanel.java b/src/com/android/launcher3/OverviewSettingsPanel.java
index d7994f3..9c0e4b4 100644
--- a/src/com/android/launcher3/OverviewSettingsPanel.java
+++ b/src/com/android/launcher3/OverviewSettingsPanel.java
@@ -221,7 +221,7 @@ public class OverviewSettingsPanel {
if (mLauncher.updateGridIfNeeded()) {
mLauncher.getWorkspace().showOutlines();
- mLauncher.mSearchDropTargetBar.showSearchBar(false);
+ mLauncher.mSearchDropTargetBar.hideSearchBar(false);
}
}
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 78af5f9..3523be0 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -55,6 +55,7 @@ import android.view.Display;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
+import android.view.ViewPropertyAnimator;
import android.view.accessibility.AccessibilityManager;
import android.view.animation.AccelerateDecelerateInterpolator;
import android.view.animation.Animation;
@@ -2506,11 +2507,12 @@ public class Workspace extends SmoothPagedView
overviewPanel.setScaleY(2.0f);
mOverviewPanelSlideScale = 1.0f;
}
- final LauncherViewPropertyAnimator overviewPanelScale = new LauncherViewPropertyAnimator(overviewPanel);
+
+ final ViewPropertyAnimator overviewPanelScale = overviewPanel.animate();
overviewPanelScale.scaleY(mOverviewPanelSlideScale)
.alpha(finalOverviewPanelAlpha)
.setInterpolator(new AccelerateDecelerateInterpolator());
- overviewPanelScale.addListener(new AnimatorListener() {
+ overviewPanelScale.setListener(new AnimatorListener() {
@Override
public void onAnimationStart(Animator animation) {
if (workspaceToOverview) {
@@ -2526,19 +2528,18 @@ public class Workspace extends SmoothPagedView
overviewPanel.setAlpha(finalOverviewPanelAlpha);
AlphaUpdateListener.updateVisibility(overviewPanel);
}
- overviewPanelScale.removeAllListeners();
+ overviewPanelScale.setListener(null);
}
@Override
public void onAnimationCancel(Animator animation) {
overviewPanel.setAlpha(finalOverviewPanelAlpha);
AlphaUpdateListener.updateVisibility(overviewPanel);
- overviewPanelScale.removeAllListeners();
+ overviewPanelScale.setListener(null);
}
@Override
public void onAnimationRepeat(Animator animation) {}
});
- anim.play(overviewPanelScale);
if (mShowSearchBar) anim.play(searchBarAlpha);
anim.play(pageIndicatorAlpha);