openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Fix bug where BubbleTextView text fades in after long press." into ub-launcher3-qt-dev

This commit is contained in:
TreeHugger Robot 2019-04-15 20:39:59 +00:00 committed by Android (Google) Code Review
parent 5235a8867b 83cdca67ba
commit 0edbac1132
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/launcher3/BubbleTextView.java
View File

@ -480,8 +480,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
*/
public ObjectAnimator createTextAlphaAnimator(boolean fadeIn) {
float toAlpha = shouldTextBeVisible() && fadeIn ? 1 : 0;
float fromAlpha = toAlpha == 1 ? 0 : 1f;
return ObjectAnimator.ofFloat(this, TEXT_ALPHA_PROPERTY, fromAlpha, toAlpha);
return ObjectAnimator.ofFloat(this, TEXT_ALPHA_PROPERTY, toAlpha);
}
@Override

8
src/com/android/launcher3/views/FloatingIconView.java
View File

@ -421,12 +421,6 @@ public class FloatingIconView extends View implements Animator.AnimatorListener,
@Override
public void onAnimationStart(Animator animation) {
originalView.setVisibility(VISIBLE);
if (originalView instanceof FolderIcon) {
FolderIcon folderIcon = (FolderIcon) originalView;
folderIcon.setBackgroundVisible(false);
folderIcon.getFolderName().setTextVisibility(false);
}
}
@Override
@ -441,6 +435,8 @@ public class FloatingIconView extends View implements Animator.AnimatorListener,
if (originalView instanceof FolderIcon) {
FolderIcon folderIcon = (FolderIcon) originalView;
folderIcon.setBackgroundVisible(false);
folderIcon.getFolderName().setTextVisibility(false);
fade.play(folderIcon.getFolderName().createTextAlphaAnimator(true));
fade.addListener(new AnimatorListenerAdapter() {
@Override