From 183cb71663320f16149d83eeebaff7795a4b55f2 Mon Sep 17 00:00:00 2001 From: linyuh Date: Wed, 27 Dec 2017 17:02:37 -0800 Subject: Remove field prefixes. Test: Existing tests PiperOrigin-RevId: 180230450 Change-Id: I0b2589cfeeaef81e42a04efa48af24b4e4d0e95f --- .../android/dialer/widget/EmptyContentView.java | 52 ++++++++-------- .../widget/FloatingActionButtonController.java | 69 +++++++++++----------- .../dialer/widget/ResizingTextEditText.java | 14 ++--- .../dialer/widget/ResizingTextTextView.java | 14 ++--- 4 files changed, 74 insertions(+), 75 deletions(-) (limited to 'java/com/android/dialer/widget') diff --git a/java/com/android/dialer/widget/EmptyContentView.java b/java/com/android/dialer/widget/EmptyContentView.java index a76ab98d6..5c2e4d501 100644 --- a/java/com/android/dialer/widget/EmptyContentView.java +++ b/java/com/android/dialer/widget/EmptyContentView.java @@ -35,10 +35,10 @@ public class EmptyContentView extends LinearLayout implements View.OnClickListen public static final int NO_LABEL = 0; public static final int NO_IMAGE = 0; - private ImageView mImageView; - private TextView mDescriptionView; - private TextView mActionView; - private OnEmptyViewActionButtonClickedListener mOnActionButtonClickedListener; + private ImageView imageView; + private TextView descriptionView; + private TextView actionView; + private OnEmptyViewActionButtonClickedListener onActionButtonClickedListener; private @StringRes int actionLabel; @@ -60,40 +60,40 @@ public class EmptyContentView extends LinearLayout implements View.OnClickListen // Don't let touches fall through the empty view. setClickable(true); - mImageView = (ImageView) findViewById(R.id.empty_list_view_image); - mDescriptionView = (TextView) findViewById(R.id.empty_list_view_message); - mActionView = (TextView) findViewById(R.id.empty_list_view_action); - mActionView.setOnClickListener(this); + imageView = (ImageView) findViewById(R.id.empty_list_view_image); + descriptionView = (TextView) findViewById(R.id.empty_list_view_message); + actionView = (TextView) findViewById(R.id.empty_list_view_action); + actionView.setOnClickListener(this); } public void setDescription(int resourceId) { if (resourceId == NO_LABEL) { - mDescriptionView.setText(null); - mDescriptionView.setVisibility(View.GONE); + descriptionView.setText(null); + descriptionView.setVisibility(View.GONE); } else { - mDescriptionView.setText(resourceId); - mDescriptionView.setVisibility(View.VISIBLE); + descriptionView.setText(resourceId); + descriptionView.setVisibility(View.VISIBLE); } } public void setImage(int resourceId) { if (resourceId == NO_LABEL) { - mImageView.setImageDrawable(null); - mImageView.setVisibility(View.GONE); + imageView.setImageDrawable(null); + imageView.setVisibility(View.GONE); } else { - mImageView.setImageResource(resourceId); - mImageView.setVisibility(View.VISIBLE); + imageView.setImageResource(resourceId); + imageView.setVisibility(View.VISIBLE); } } public void setActionLabel(@StringRes int resourceId) { actionLabel = resourceId; if (resourceId == NO_LABEL) { - mActionView.setText(null); - mActionView.setVisibility(View.GONE); + actionView.setText(null); + actionView.setVisibility(View.GONE); } else { - mActionView.setText(resourceId); - mActionView.setVisibility(View.VISIBLE); + actionView.setText(resourceId); + actionView.setVisibility(View.VISIBLE); } } @@ -102,19 +102,19 @@ public class EmptyContentView extends LinearLayout implements View.OnClickListen } public boolean isShowingContent() { - return mImageView.getVisibility() == View.VISIBLE - || mDescriptionView.getVisibility() == View.VISIBLE - || mActionView.getVisibility() == View.VISIBLE; + return imageView.getVisibility() == View.VISIBLE + || descriptionView.getVisibility() == View.VISIBLE + || actionView.getVisibility() == View.VISIBLE; } public void setActionClickedListener(OnEmptyViewActionButtonClickedListener listener) { - mOnActionButtonClickedListener = listener; + onActionButtonClickedListener = listener; } @Override public void onClick(View v) { - if (mOnActionButtonClickedListener != null) { - mOnActionButtonClickedListener.onEmptyViewActionButtonClicked(); + if (onActionButtonClickedListener != null) { + onActionButtonClickedListener.onEmptyViewActionButtonClicked(); } } diff --git a/java/com/android/dialer/widget/FloatingActionButtonController.java b/java/com/android/dialer/widget/FloatingActionButtonController.java index 1f9923dca..c89c1a8ce 100644 --- a/java/com/android/dialer/widget/FloatingActionButtonController.java +++ b/java/com/android/dialer/widget/FloatingActionButtonController.java @@ -36,24 +36,24 @@ public class FloatingActionButtonController { public static final int ALIGN_QUARTER_END = 1; public static final int ALIGN_END = 2; - private final int mAnimationDuration; - private final int mFloatingActionButtonWidth; - private final int mFloatingActionButtonMarginRight; - private final FloatingActionButton mFab; - private final Interpolator mFabInterpolator; - private int mFabIconId = -1; - private int mScreenWidth; + private final int animationDuration; + private final int floatingActionButtonWidth; + private final int floatingActionButtonMarginRight; + private final FloatingActionButton fab; + private final Interpolator fabInterpolator; + private int fabIconId = -1; + private int screenWidth; public FloatingActionButtonController(Activity activity, FloatingActionButton fab) { Resources resources = activity.getResources(); - mFabInterpolator = + fabInterpolator = AnimationUtils.loadInterpolator(activity, android.R.interpolator.fast_out_slow_in); - mFloatingActionButtonWidth = + floatingActionButtonWidth = resources.getDimensionPixelSize(R.dimen.floating_action_button_width); - mFloatingActionButtonMarginRight = + floatingActionButtonMarginRight = resources.getDimensionPixelOffset(R.dimen.floating_action_button_margin_right); - mAnimationDuration = resources.getInteger(R.integer.floating_action_button_animation_duration); - mFab = fab; + animationDuration = resources.getInteger(R.integer.floating_action_button_animation_duration); + this.fab = fab; } /** @@ -63,12 +63,12 @@ public class FloatingActionButtonController { * @param screenWidth The width of the screen in pixels. */ public void setScreenWidth(int screenWidth) { - mScreenWidth = screenWidth; + this.screenWidth = screenWidth; } /** @see FloatingActionButton#isShown() */ public boolean isVisible() { - return mFab.isShown(); + return fab.isShown(); } /** @@ -86,14 +86,14 @@ public class FloatingActionButtonController { } public void changeIcon(Context context, @DrawableRes int iconId, String description) { - if (this.mFabIconId != iconId) { - mFab.setImageResource(iconId); - mFab.setImageTintList( + if (this.fabIconId != iconId) { + fab.setImageResource(iconId); + fab.setImageTintList( ColorStateList.valueOf(context.getResources().getColor(android.R.color.white))); - this.mFabIconId = iconId; + this.fabIconId = iconId; } - if (!mFab.getContentDescription().equals(description)) { - mFab.setContentDescription(description); + if (!fab.getContentDescription().equals(description)) { + fab.setContentDescription(description); } } @@ -105,7 +105,7 @@ public class FloatingActionButtonController { public void onPageScrolled(float positionOffset) { // As the page is scrolling, if we're on the first tab, update the FAB position so it // moves along with it. - mFab.setTranslationX(positionOffset * getTranslationXForAlignment(ALIGN_END)); + fab.setTranslationX(positionOffset * getTranslationXForAlignment(ALIGN_END)); } /** @@ -127,38 +127,38 @@ public class FloatingActionButtonController { * @param animate Whether or not to animate the transition. */ private void align(int align, int offsetX, int offsetY, boolean animate) { - if (mScreenWidth == 0) { + if (screenWidth == 0) { return; } int translationX = getTranslationXForAlignment(align); // Skip animation if container is not shown; animation causes container to show again. - if (animate && mFab.isShown()) { - mFab.animate() + if (animate && fab.isShown()) { + fab.animate() .translationX(translationX + offsetX) .translationY(offsetY) - .setInterpolator(mFabInterpolator) - .setDuration(mAnimationDuration) + .setInterpolator(fabInterpolator) + .setDuration(animationDuration) .start(); } else { - mFab.setTranslationX(translationX + offsetX); - mFab.setTranslationY(offsetY); + fab.setTranslationX(translationX + offsetX); + fab.setTranslationY(offsetY); } } /** @see FloatingActionButton#show() */ public void scaleIn() { - mFab.show(); + fab.show(); } /** @see FloatingActionButton#hide() */ public void scaleOut() { - mFab.hide(); + fab.hide(); } public void scaleOut(OnVisibilityChangedListener listener) { - mFab.hide(listener); + fab.hide(listener); } /** @@ -176,12 +176,11 @@ public class FloatingActionButtonController { return 0; case ALIGN_QUARTER_END: // Moves the FAB a quarter of the screen width. - result = mScreenWidth / 4; + result = screenWidth / 4; break; case ALIGN_END: // Moves the FAB half the screen width. Same as aligning right with a marginRight. - result = - mScreenWidth / 2 - mFloatingActionButtonWidth / 2 - mFloatingActionButtonMarginRight; + result = screenWidth / 2 - floatingActionButtonWidth / 2 - floatingActionButtonMarginRight; break; default: throw Assert.createIllegalStateFailException("Invalid alignment value: " + align); @@ -193,6 +192,6 @@ public class FloatingActionButtonController { } private boolean isLayoutRtl() { - return mFab.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL; + return fab.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL; } } diff --git a/java/com/android/dialer/widget/ResizingTextEditText.java b/java/com/android/dialer/widget/ResizingTextEditText.java index fb894bd14..16b755241 100644 --- a/java/com/android/dialer/widget/ResizingTextEditText.java +++ b/java/com/android/dialer/widget/ResizingTextEditText.java @@ -25,27 +25,27 @@ import com.android.dialer.util.ViewUtil; /** EditText which resizes dynamically with respect to text length. */ public class ResizingTextEditText extends EditText { - private final int mOriginalTextSize; - private final int mMinTextSize; + private final int originalTextSize; + private final int minTextSize; public ResizingTextEditText(Context context, AttributeSet attrs) { super(context, attrs); - mOriginalTextSize = (int) getTextSize(); + originalTextSize = (int) getTextSize(); TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ResizingText); - mMinTextSize = - (int) a.getDimension(R.styleable.ResizingText_resizing_text_min_size, mOriginalTextSize); + minTextSize = + (int) a.getDimension(R.styleable.ResizingText_resizing_text_min_size, originalTextSize); a.recycle(); } @Override protected void onTextChanged(CharSequence text, int start, int lengthBefore, int lengthAfter) { super.onTextChanged(text, start, lengthBefore, lengthAfter); - ViewUtil.resizeText(this, mOriginalTextSize, mMinTextSize); + ViewUtil.resizeText(this, originalTextSize, minTextSize); } @Override protected void onSizeChanged(int w, int h, int oldw, int oldh) { super.onSizeChanged(w, h, oldw, oldh); - ViewUtil.resizeText(this, mOriginalTextSize, mMinTextSize); + ViewUtil.resizeText(this, originalTextSize, minTextSize); } } diff --git a/java/com/android/dialer/widget/ResizingTextTextView.java b/java/com/android/dialer/widget/ResizingTextTextView.java index 9b624414d..100b2ca29 100644 --- a/java/com/android/dialer/widget/ResizingTextTextView.java +++ b/java/com/android/dialer/widget/ResizingTextTextView.java @@ -25,27 +25,27 @@ import com.android.dialer.util.ViewUtil; /** TextView which resizes dynamically with respect to text length. */ public class ResizingTextTextView extends TextView { - private final int mOriginalTextSize; - private final int mMinTextSize; + private final int originalTextSize; + private final int minTextSize; public ResizingTextTextView(Context context, AttributeSet attrs) { super(context, attrs); - mOriginalTextSize = (int) getTextSize(); + originalTextSize = (int) getTextSize(); TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ResizingText); - mMinTextSize = - (int) a.getDimension(R.styleable.ResizingText_resizing_text_min_size, mOriginalTextSize); + minTextSize = + (int) a.getDimension(R.styleable.ResizingText_resizing_text_min_size, originalTextSize); a.recycle(); } @Override protected void onTextChanged(CharSequence text, int start, int lengthBefore, int lengthAfter) { super.onTextChanged(text, start, lengthBefore, lengthAfter); - ViewUtil.resizeText(this, mOriginalTextSize, mMinTextSize); + ViewUtil.resizeText(this, originalTextSize, minTextSize); } @Override protected void onSizeChanged(int w, int h, int oldw, int oldh) { super.onSizeChanged(w, h, oldw, oldh); - ViewUtil.resizeText(this, mOriginalTextSize, mMinTextSize); + ViewUtil.resizeText(this, originalTextSize, minTextSize); } } -- cgit v1.2.3