summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/PagedView.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/launcher2/PagedView.java')
-rw-r--r--src/com/android/launcher2/PagedView.java56
1 files changed, 3 insertions, 53 deletions
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index 596ef50bb..292ccd740 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -163,14 +163,13 @@ public abstract class PagedView extends ViewGroup {
// Scrolling indicator
private ValueAnimator mScrollIndicatorAnimator;
- private android.animation.ValueAnimator mDockDividerAnimator;
private ImageView mScrollIndicator;
private int mScrollIndicatorPaddingLeft;
private int mScrollIndicatorPaddingRight;
private boolean mHasScrollIndicator = true;
- private static final int sScrollIndicatorFadeInDuration = 150;
- private static final int sScrollIndicatorFadeOutDuration = 650;
- private static final int sScrollIndicatorFlashDuration = 650;
+ protected static final int sScrollIndicatorFadeInDuration = 150;
+ protected static final int sScrollIndicatorFadeOutDuration = 650;
+ protected static final int sScrollIndicatorFlashDuration = 650;
// If set, will defer loading associated pages until the scrolling settles
private boolean mDeferLoadAssociatedPagesUntilScrollCompletes;
@@ -1740,55 +1739,6 @@ public abstract class PagedView extends ViewGroup {
}
}
- void showDockDivider(boolean immediately) {
- final ViewGroup parent = (ViewGroup) getParent();
- final View divider = (ImageView) (parent.findViewById(R.id.dock_divider));
- if (divider != null) {
- divider.setVisibility(View.VISIBLE);
- if (mDockDividerAnimator != null) {
- mDockDividerAnimator.cancel();
- }
- if (immediately) {
- divider.setAlpha(1f);
- } else {
- mDockDividerAnimator = ObjectAnimator.ofFloat(divider, "alpha", 1f);
- mDockDividerAnimator.setDuration(sScrollIndicatorFadeInDuration);
- mDockDividerAnimator.start();
- }
- }
- }
-
- void hideDockDivider(boolean immediately) {
- final ViewGroup parent = (ViewGroup) getParent();
- final View divider = (ImageView) (parent.findViewById(R.id.dock_divider));
- if (divider != null) {
- if (mDockDividerAnimator != null) {
- mDockDividerAnimator.cancel();
- }
- if (immediately) {
- divider.setVisibility(View.GONE);
- divider.setAlpha(0f);
- } else {
- mDockDividerAnimator = ObjectAnimator.ofFloat(divider, "alpha", 0f);
- mDockDividerAnimator.setDuration(sScrollIndicatorFadeOutDuration);
- mDockDividerAnimator.addListener(new AnimatorListenerAdapter() {
- private boolean cancelled = false;
- @Override
- public void onAnimationCancel(android.animation.Animator animation) {
- cancelled = true;
- }
- @Override
- public void onAnimationEnd(android.animation.Animator animation) {
- if (!cancelled) {
- divider.setVisibility(View.GONE);
- }
- }
- });
- mDockDividerAnimator.start();
- }
- }
- }
-
/**
* To be overridden by subclasses to determine whether the scroll indicator should stretch to
* fill its space on the track or not.