diff options
author | Jon Miranda <jonmiranda@google.com> | 2019-09-06 11:35:34 -0700 |
---|---|---|
committer | Jon Miranda <jonmiranda@google.com> | 2019-09-06 11:35:34 -0700 |
commit | a87abbad31ac1f7889803f60cda55db979a03e9f (patch) | |
tree | 98806ec8037ee844595200978bed368d61692fa7 /src/com/android/launcher3/popup/PopupContainerWithArrow.java | |
parent | 72fddba837afb28ad31f775b566ee4ba3f02eab9 (diff) | |
parent | 1bd96b1e96a663c835cb263cbc4aa54a7841ab28 (diff) | |
download | android_packages_apps_Trebuchet-a87abbad31ac1f7889803f60cda55db979a03e9f.tar.gz android_packages_apps_Trebuchet-a87abbad31ac1f7889803f60cda55db979a03e9f.tar.bz2 android_packages_apps_Trebuchet-a87abbad31ac1f7889803f60cda55db979a03e9f.zip |
resolve merge conflicts of 1bd96b1e96a663c835cb263cbc4aa54a7841ab28 to ub-launcher3-qt-future-dev
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Ide6c914d4e69eb4fa70d6634780324cd45a21610
Diffstat (limited to 'src/com/android/launcher3/popup/PopupContainerWithArrow.java')
-rw-r--r-- | src/com/android/launcher3/popup/PopupContainerWithArrow.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java index 2a40d683e..c2aabca2c 100644 --- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java +++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java @@ -300,7 +300,7 @@ public class PopupContainerWithArrow extends ArrowPopup implements DragSource, } mLauncher.getDragController().addDragListener(this); - mOriginalIcon.forceHideDot(true); + mOriginalIcon.setForceHideDot(true); // All views are added. Animate layout from now on. setLayoutTransition(new LayoutTransition()); @@ -562,13 +562,13 @@ public class PopupContainerWithArrow extends ArrowPopup implements DragSource, protected void onCreateCloseAnimation(AnimatorSet anim) { // Animate original icon's text back in. anim.play(mOriginalIcon.createTextAlphaAnimator(true /* fadeIn */)); - mOriginalIcon.forceHideDot(false); + mOriginalIcon.setForceHideDot(false); } @Override protected void closeComplete() { mOriginalIcon.setTextVisibility(mOriginalIcon.shouldTextBeVisible()); - mOriginalIcon.forceHideDot(false); + mOriginalIcon.setForceHideDot(false); super.closeComplete(); } |