diff options
Diffstat (limited to 'java/com/android/dialer/app/widget/ActionBarController.java')
| -rw-r--r-- | java/com/android/dialer/app/widget/ActionBarController.java | 88 |
1 files changed, 22 insertions, 66 deletions
diff --git a/java/com/android/dialer/app/widget/ActionBarController.java b/java/com/android/dialer/app/widget/ActionBarController.java index 7fe056c51..d0eb326ab 100644 --- a/java/com/android/dialer/app/widget/ActionBarController.java +++ b/java/com/android/dialer/app/widget/ActionBarController.java @@ -16,12 +16,9 @@ package com.android.dialer.app.widget; import android.animation.ValueAnimator; -import android.animation.ValueAnimator.AnimatorUpdateListener; import android.os.Bundle; -import android.support.annotation.VisibleForTesting; -import android.util.Log; import com.android.dialer.animation.AnimUtils.AnimationCallback; -import com.android.dialer.app.DialtactsActivity; +import com.android.dialer.common.LogUtil; /** * Controls the various animated properties of the actionBar: showing/hiding, fading/revealing, and @@ -30,8 +27,6 @@ import com.android.dialer.app.DialtactsActivity; */ public class ActionBarController { - public static final boolean DEBUG = DialtactsActivity.DEBUG; - public static final String TAG = "ActionBarController"; private static final String KEY_IS_SLID_UP = "key_actionbar_is_slid_up"; private static final String KEY_IS_FADED_OUT = "key_actionbar_is_faded_out"; private static final String KEY_IS_EXPANDED = "key_actionbar_is_expanded"; @@ -66,9 +61,8 @@ public class ActionBarController { /** Called when the user has tapped on the collapsed search box, to start a new search query. */ public void onSearchBoxTapped() { - if (DEBUG) { - Log.d(TAG, "OnSearchBoxTapped: isInSearchUi " + mActivityUi.isInSearchUi()); - } + LogUtil.d( + "ActionBarController.onSearchBoxTapped", "isInSearchUi " + mActivityUi.isInSearchUi()); if (!mActivityUi.isInSearchUi()) { mSearchBox.expand(true /* animate */, true /* requestFocus */); } @@ -76,16 +70,11 @@ public class ActionBarController { /** Called when search UI has been exited for some reason. */ public void onSearchUiExited() { - if (DEBUG) { - Log.d( - TAG, - "OnSearchUIExited: isExpanded " - + mSearchBox.isExpanded() - + " isFadedOut: " - + mSearchBox.isFadedOut() - + " shouldShowActionBar: " - + mActivityUi.shouldShowActionBar()); - } + LogUtil.d( + "ActionBarController.onSearchUIExited", + "isExpanded: %b, isFadedOut %b", + mSearchBox.isExpanded(), + mSearchBox.isFadedOut()); if (mSearchBox.isExpanded()) { mSearchBox.collapse(true /* animate */); } @@ -93,11 +82,7 @@ public class ActionBarController { mSearchBox.fadeIn(); } - if (mActivityUi.shouldShowActionBar()) { - slideActionBar(false /* slideUp */, false /* animate */); - } else { - slideActionBar(true /* slideUp */, false /* animate */); - } + slideActionBar(false /* slideUp */, false /* animate */); } /** @@ -105,18 +90,13 @@ public class ActionBarController { * state changes have actually occurred. */ public void onDialpadDown() { - if (DEBUG) { - Log.d( - TAG, - "OnDialpadDown: isInSearchUi " - + mActivityUi.isInSearchUi() - + " hasSearchQuery: " - + mActivityUi.hasSearchQuery() - + " isFadedOut: " - + mSearchBox.isFadedOut() - + " isExpanded: " - + mSearchBox.isExpanded()); - } + LogUtil.d( + "ActionBarController.onDialpadDown", + "isInSearchUi: %b, hasSearchQuery: %b, isFadedOut: %b, isExpanded: %b", + mActivityUi.isInSearchUi(), + mActivityUi.hasSearchQuery(), + mSearchBox.isFadedOut(), + mSearchBox.isExpanded()); if (mActivityUi.isInSearchUi()) { if (mActivityUi.hasSearchQuery()) { if (mSearchBox.isFadedOut()) { @@ -137,9 +117,7 @@ public class ActionBarController { * state changes have actually occurred. */ public void onDialpadUp() { - if (DEBUG) { - Log.d(TAG, "OnDialpadUp: isInSearchUi " + mActivityUi.isInSearchUi()); - } + LogUtil.d("ActionBarController.onDialpadUp", "isInSearchUi " + mActivityUi.isInSearchUi()); if (mActivityUi.isInSearchUi()) { slideActionBar(true /* slideUp */, true /* animate */); } else { @@ -149,18 +127,14 @@ public class ActionBarController { } public void slideActionBar(boolean slideUp, boolean animate) { - if (DEBUG) { - Log.d(TAG, "Sliding actionBar - up: " + slideUp + " animate: " + animate); - } + LogUtil.d("ActionBarController.slidingActionBar", "up: %b, animate: %b", slideUp, animate); + if (animate) { ValueAnimator animator = slideUp ? ValueAnimator.ofFloat(0, 1) : ValueAnimator.ofFloat(1, 0); animator.addUpdateListener( - new AnimatorUpdateListener() { - @Override - public void onAnimationUpdate(ValueAnimator animation) { - final float value = (float) animation.getAnimatedValue(); - setHideOffset((int) (mActivityUi.getActionBarHeight() * value)); - } + animation -> { + final float value = (float) animation.getAnimatedValue(); + setHideOffset((int) (mActivityUi.getActionBarHeight() * value)); }); animator.start(); } else { @@ -173,20 +147,11 @@ public class ActionBarController { mSearchBox.animate().alpha(alphaValue).start(); } - /** @return The offset the action bar is being translated upwards by */ - public int getHideOffset() { - return mActivityUi.getActionBarHideOffset(); - } - public void setHideOffset(int offset) { mIsActionBarSlidUp = offset >= mActivityUi.getActionBarHeight(); mActivityUi.setActionBarHideOffset(offset); } - public int getActionBarHeight() { - return mActivityUi.getActionBarHeight(); - } - /** Saves the current state of the action bar into a provided {@link Bundle} */ public void saveInstanceState(Bundle outState) { outState.putBoolean(KEY_IS_SLID_UP, mIsActionBarSlidUp); @@ -225,23 +190,14 @@ public class ActionBarController { slideActionBar(mIsActionBarSlidUp /* slideUp */, false /* animate */); } - @VisibleForTesting - public boolean getIsActionBarSlidUp() { - return mIsActionBarSlidUp; - } - public interface ActivityUi { boolean isInSearchUi(); boolean hasSearchQuery(); - boolean shouldShowActionBar(); - int getActionBarHeight(); - int getActionBarHideOffset(); - void setActionBarHideOffset(int offset); } } |