diff options
| author | Hayden Schoen <hayden@cyngn.com> | 2015-04-02 14:04:28 -0700 |
|---|---|---|
| committer | Linus Lee <llee@cyngn.com> | 2015-04-02 21:51:37 +0000 |
| commit | 4c38ea9a1796dd55bd017a1742b3e95c4e583e84 (patch) | |
| tree | 5fac03f2744b73f32f8433a9d689b21b64620a2f /src | |
| parent | e002b691b3233629598c77ef50f1ef91eb1877f0 (diff) | |
| download | android_packages_apps_Trebuchet-4c38ea9a1796dd55bd017a1742b3e95c4e583e84.tar.gz android_packages_apps_Trebuchet-4c38ea9a1796dd55bd017a1742b3e95c4e583e84.tar.bz2 android_packages_apps_Trebuchet-4c38ea9a1796dd55bd017a1742b3e95c4e583e84.zip | |
AppDrawer: tweak animations and layout
Change-Id: If9d788b25fbabf21bd4d9d35b0dd82ddcca180f8
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/AppDrawerListAdapter.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/AppDrawerScrubber.java | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/com/android/launcher3/AppDrawerListAdapter.java b/src/com/android/launcher3/AppDrawerListAdapter.java index ea3243534..5a5e6cb9f 100644 --- a/src/com/android/launcher3/AppDrawerListAdapter.java +++ b/src/com/android/launcher3/AppDrawerListAdapter.java @@ -138,7 +138,7 @@ public class AppDrawerListAdapter extends RecyclerView.Adapter<AppDrawerListAdap public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) { // set the pivot of the text view - v.setPivotX(0); + v.setPivotX(v.getMeasuredWidth() / 4); v.setPivotY(v.getMeasuredHeight() / 2); } }; diff --git a/src/com/android/launcher3/AppDrawerScrubber.java b/src/com/android/launcher3/AppDrawerScrubber.java index 1670934d6..706ddfe96 100644 --- a/src/com/android/launcher3/AppDrawerScrubber.java +++ b/src/com/android/launcher3/AppDrawerScrubber.java @@ -163,7 +163,10 @@ public class AppDrawerScrubber extends LinearLayout { * Handles the animations of the scrubber indicator */ private class ScrubberAnimationState implements SeekBar.OnSeekBarChangeListener { - private static final long SCRUBBER_DISPLAY_DURATION = 150; + private static final long SCRUBBER_DISPLAY_DURATION_IN = 60; + private static final long SCRUBBER_DISPLAY_DURATION_OUT = 150; + private static final long SCRUBBER_DISPLAY_DELAY_IN = 0; + private static final long SCRUBBER_DISPLAY_DELAY_OUT = 200; private static final float SCRUBBER_SCALE_START = 0f; private static final float SCRUBBER_SCALE_END = 1f; private static final float SCRUBBER_ALPHA_START = 0f; @@ -191,7 +194,7 @@ public class AppDrawerScrubber extends LinearLayout { // start from a scratch position when animating in mScrubberIndicator.animate().cancel(); mScrubberIndicator.setPivotX(mScrubberIndicator.getMeasuredWidth() / 2); - mScrubberIndicator.setPivotY(mScrubberIndicator.getMeasuredHeight() * 0.8f); + mScrubberIndicator.setPivotY(mScrubberIndicator.getMeasuredHeight() * 0.9f); mScrubberIndicator.setAlpha(SCRUBBER_ALPHA_START); mScrubberIndicator.setScaleX(SCRUBBER_SCALE_START); mScrubberIndicator.setScaleY(SCRUBBER_SCALE_START); @@ -202,7 +205,8 @@ public class AppDrawerScrubber extends LinearLayout { .alpha(SCRUBBER_ALPHA_END) .scaleX(SCRUBBER_SCALE_END) .scaleY(SCRUBBER_SCALE_END) - .setDuration(SCRUBBER_DISPLAY_DURATION) + .setStartDelay(SCRUBBER_DISPLAY_DELAY_IN) + .setDuration(SCRUBBER_DISPLAY_DURATION_IN) .setListener(new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) { @@ -221,7 +225,8 @@ public class AppDrawerScrubber extends LinearLayout { .alpha(SCRUBBER_ALPHA_START) .scaleX(SCRUBBER_SCALE_START) .scaleY(SCRUBBER_SCALE_START) - .setDuration(SCRUBBER_DISPLAY_DURATION) + .setStartDelay(SCRUBBER_DISPLAY_DELAY_OUT) + .setDuration(SCRUBBER_DISPLAY_DURATION_OUT) .setListener(new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) { |