diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-03-05 16:27:37 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2015-03-05 16:27:37 -0800 |
commit | ee995106d8a50b691e65988f5b3df5d2d83ca69a (patch) | |
tree | e6c6a4ac9e2b87b4707e2a9e7581f670b1f96829 /src/com/android/launcher3 | |
parent | cd851f18132ffad6f79f7a664aa1999257545297 (diff) | |
download | android_packages_apps_Trebuchet-ee995106d8a50b691e65988f5b3df5d2d83ca69a.tar.gz android_packages_apps_Trebuchet-ee995106d8a50b691e65988f5b3df5d2d83ca69a.tar.bz2 android_packages_apps_Trebuchet-ee995106d8a50b691e65988f5b3df5d2d83ca69a.zip |
Some parameter cleanup
Change-Id: Iedc7c97bd9c513ff046f7bf64a6e13f1fc8e8b54
Diffstat (limited to 'src/com/android/launcher3')
-rw-r--r-- | src/com/android/launcher3/FocusIndicatorView.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/com/android/launcher3/FocusIndicatorView.java b/src/com/android/launcher3/FocusIndicatorView.java index 53dc2e22b..af3b97634 100644 --- a/src/com/android/launcher3/FocusIndicatorView.java +++ b/src/com/android/launcher3/FocusIndicatorView.java @@ -40,8 +40,6 @@ public class FocusIndicatorView extends View implements View.OnFocusChangeListen private View mLastFocusedView; private boolean mInitiated; - private View mCommonParent; - private Pair<View, Boolean> mPendingCall; public FocusIndicatorView(Context context) { @@ -79,8 +77,7 @@ public class FocusIndicatorView extends View implements View.OnFocusChangeListen if (!mInitiated) { // The parent view should always the a parent of the target view. - mCommonParent = (View) this.getParent(); - computeLocationRelativeToParent(this, mCommonParent, mIndicatorPos); + computeLocationRelativeToParent(this, (View) getParent(), mIndicatorPos); mInitiated = true; } @@ -93,7 +90,7 @@ public class FocusIndicatorView extends View implements View.OnFocusChangeListen nextState.scaleX = v.getScaleX() * v.getWidth() / indicatorWidth; nextState.scaleY = v.getScaleY() * v.getHeight() / indicatorHeight; - computeLocationRelativeToParent(v, mCommonParent, mTargetViewPos); + computeLocationRelativeToParent(v, (View) getParent(), mTargetViewPos); nextState.x = mTargetViewPos[0] - mIndicatorPos[0] - (1 - nextState.scaleX) * indicatorWidth / 2; nextState.y = mTargetViewPos[1] - mIndicatorPos[1] - (1 - nextState.scaleY) * indicatorHeight / 2; |