PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 829f37f3: Merge "Workaround for remove stuck (issue 11080792)" into jb-ub-now-jetsonic

Browse Source 
* commit '829f37f3a02a66cd88967cf021e0a96308e49d4b':
  Workaround for remove stuck (issue 11080792)
This commit is contained in:
Adam Cohen
2013-11-01 17:26:31 -07:00
committed by Android Git Automerger
parent 476883c54e 829f37f3a0
commit ec2247fb4a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/SearchDropTargetBar.java
+4 -4
View File
@@ -71,10 +71,10 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D
mDeleteDropTarget.setLauncher(launcher); mDeleteDropTarget.setLauncher(launcher);
mQSBSearchBar = launcher.getQsbBar(); mQSBSearchBar = launcher.getQsbBar();
if (mEnableDropDownDropTargets) { if (mEnableDropDownDropTargets) {
mQSBSearchBarAnim = LauncherAnimUtils.ofFloat(mQSBSearchBar, "translationY", 0, mQSBSearchBarAnim = ObjectAnimator.ofFloat(mQSBSearchBar, "translationY", 0f,
-mBarHeight); -mBarHeight);
} else { } else {
mQSBSearchBarAnim = LauncherAnimUtils.ofFloat(mQSBSearchBar, "alpha", 1f, 0f); mQSBSearchBarAnim = ObjectAnimator.ofFloat(mQSBSearchBar, "alpha", 1f, 0f);
} }
setupAnimation(mQSBSearchBarAnim, mQSBSearchBar); setupAnimation(mQSBSearchBarAnim, mQSBSearchBar);
} }
@@ -117,12 +117,12 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D
DeviceProfile grid = app.getDynamicGrid().getDeviceProfile(); DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
mBarHeight = grid.searchBarSpaceHeightPx; mBarHeight = grid.searchBarSpaceHeightPx;
mDropTargetBar.setTranslationY(-mBarHeight); mDropTargetBar.setTranslationY(-mBarHeight);
mDropTargetBarAnim = LauncherAnimUtils.ofFloat(mDropTargetBar, "translationY", mDropTargetBarAnim = ObjectAnimator.ofFloat(mDropTargetBar, "translationY",
-mBarHeight, 0f); -mBarHeight, 0f);
} else { } else {
mDropTargetBar.setAlpha(0f); mDropTargetBar.setAlpha(0f);
mDropTargetBarAnim = LauncherAnimUtils.ofFloat(mDropTargetBar, "alpha", 0f, 1f); mDropTargetBarAnim = ObjectAnimator.ofFloat(mDropTargetBar, "alpha", 0f, 1f);
} }
setupAnimation(mDropTargetBarAnim, mDropTargetBar); setupAnimation(mDropTargetBarAnim, mDropTargetBar);
} }