Refactoring instance variable for ArrowPopup.java
refactoring naming for instance variables to be more in sync with java codestyle
Test: presubmit
Bug: 278291850
Flag: not needed
Change-Id: I24eb1433941b44404871b305acf0d2d145662080
diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuViewWithArrow.kt b/quickstep/src/com/android/quickstep/views/TaskMenuViewWithArrow.kt
index 428bd95..8ee0fbb 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuViewWithArrow.kt
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuViewWithArrow.kt
@@ -77,10 +77,10 @@
shouldScaleArrow = true
mIsArrowRotated = true
// This synchronizes the arrow and menu to open at the same time
- OPEN_CHILD_FADE_START_DELAY = OPEN_FADE_START_DELAY
- OPEN_CHILD_FADE_DURATION = OPEN_FADE_DURATION
- CLOSE_FADE_START_DELAY = CLOSE_CHILD_FADE_START_DELAY
- CLOSE_FADE_DURATION = CLOSE_CHILD_FADE_DURATION
+ mOpenChildFadeStartDelay = mOpenFadeStartDelay
+ mOpenChildFadeDuration = mOpenFadeDuration
+ mCloseFadeStartDelay = mCloseChildFadeStartDelay
+ mCloseFadeDuration = mCloseChildFadeDuration
}
private var alignedOptionIndex: Int = 0
@@ -213,7 +213,7 @@
scrim?.let {
anim.play(
ObjectAnimator.ofFloat(it, View.ALPHA, 0f, scrimAlpha)
- .setDuration(OPEN_DURATION.toLong())
+ .setDuration(mOpenDuration.toLong())
)
}
}
@@ -222,7 +222,7 @@
scrim?.let {
anim.play(
ObjectAnimator.ofFloat(it, View.ALPHA, scrimAlpha, 0f)
- .setDuration(CLOSE_DURATION.toLong())
+ .setDuration(mCloseDuration.toLong())
)
}
}
diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java
index 5b493c2..b59b37a 100644
--- a/src/com/android/launcher3/popup/ArrowPopup.java
+++ b/src/com/android/launcher3/popup/ArrowPopup.java
@@ -70,17 +70,17 @@
extends AbstractFloatingView {
// Duration values (ms) for popup open and close animations.
- protected int OPEN_DURATION = 276;
- protected int OPEN_FADE_START_DELAY = 0;
- protected int OPEN_FADE_DURATION = 38;
- protected int OPEN_CHILD_FADE_START_DELAY = 38;
- protected int OPEN_CHILD_FADE_DURATION = 76;
+ protected int mOpenDuration = 276;
+ protected int mOpenFadeStartDelay = 0;
+ protected int mOpenFadeDuration = 38;
+ protected int mOpenChildFadeStartDelay = 38;
+ protected int mOpenChildFadeDuration = 76;
- protected int CLOSE_DURATION = 200;
- protected int CLOSE_FADE_START_DELAY = 140;
- protected int CLOSE_FADE_DURATION = 50;
- protected int CLOSE_CHILD_FADE_START_DELAY = 0;
- protected int CLOSE_CHILD_FADE_DURATION = 140;
+ protected int mCloseDuration = 200;
+ protected int mCloseFadeStartDelay = 140;
+ protected int mCloseFadeDuration = 50;
+ protected int mCloseChildFadeStartDelay = 0;
+ protected int mCloseChildFadeDuration = 140;
private static final int OPEN_DURATION_U = 200;
private static final int OPEN_FADE_START_DELAY_U = 0;
@@ -583,11 +583,11 @@
EMPHASIZED_DECELERATE)
: getOpenCloseAnimator(
true,
- OPEN_DURATION,
- OPEN_FADE_START_DELAY,
- OPEN_FADE_DURATION,
- OPEN_CHILD_FADE_START_DELAY,
- OPEN_CHILD_FADE_DURATION,
+ mOpenDuration,
+ mOpenFadeStartDelay,
+ mOpenFadeDuration,
+ mOpenChildFadeStartDelay,
+ mOpenChildFadeDuration,
DECELERATED_EASE);
onCreateOpenAnimation(mOpenCloseAnimator);
@@ -672,8 +672,8 @@
}
mIsOpen = false;
- mOpenCloseAnimator = getOpenCloseAnimator(false, CLOSE_DURATION, CLOSE_FADE_START_DELAY,
- CLOSE_FADE_DURATION, CLOSE_CHILD_FADE_START_DELAY, CLOSE_CHILD_FADE_DURATION,
+ mOpenCloseAnimator = getOpenCloseAnimator(false, mCloseDuration, mCloseFadeStartDelay,
+ mCloseFadeDuration, mCloseChildFadeStartDelay, mCloseChildFadeDuration,
ACCELERATED_EASE);
mOpenCloseAnimator = ENABLE_MATERIAL_U_POPUP.get()
@@ -686,11 +686,11 @@
CLOSE_CHILD_FADE_DURATION_U,
EMPHASIZED_ACCELERATE)
: getOpenCloseAnimator(false,
- CLOSE_DURATION,
- CLOSE_FADE_START_DELAY,
- CLOSE_FADE_DURATION,
- CLOSE_CHILD_FADE_START_DELAY,
- CLOSE_CHILD_FADE_DURATION,
+ mCloseDuration,
+ mCloseFadeStartDelay,
+ mCloseFadeDuration,
+ mCloseChildFadeStartDelay,
+ mCloseChildFadeDuration,
ACCELERATED_EASE);
onCreateCloseAnimation(mOpenCloseAnimator);