From f1b6f5c09df4976714107039a77c7937887f3a33 Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Tue, 8 Mar 2022 20:23:10 -0800 Subject: [PATCH 1/5] Fix Javadoc-related lint erros under a.i.navigationbar This is a mechanical cleanup CL. There should be no behavior change. Bug: 215443343 Test: prebuilts/checkstyle/checkstyle.py -f \ frameworks/base/core/java/android/inputmethodservice/navigationbar/ \ | grep "Missing a Javadoc comment" Change-Id: I5cb365b69864a145e7eaf7ff4454c261324ab845 --- .../navigationbar/KeyButtonView.java | 3 ++- .../NavigationBarInflaterView.java | 6 ++--- .../navigationbar/NavigationBarView.java | 24 ++++++++++--------- .../navigationbar/ReverseLinearLayout.java | 3 +-- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/core/java/android/inputmethodservice/navigationbar/KeyButtonView.java b/core/java/android/inputmethodservice/navigationbar/KeyButtonView.java index 74d30f8f8806e..dfe893a446fff 100644 --- a/core/java/android/inputmethodservice/navigationbar/KeyButtonView.java +++ b/core/java/android/inputmethodservice/navigationbar/KeyButtonView.java @@ -272,12 +272,13 @@ public class KeyButtonView extends ImageView implements ButtonInterface { : KeyButtonRipple.Type.ROUNDED_RECT); } + @Override public void playSoundEffect(int soundConstant) { if (!mPlaySounds) return; mAudioManager.playSoundEffect(soundConstant); } - public void sendEvent(int action, int flags) { + private void sendEvent(int action, int flags) { sendEvent(action, flags, SystemClock.uptimeMillis()); } diff --git a/core/java/android/inputmethodservice/navigationbar/NavigationBarInflaterView.java b/core/java/android/inputmethodservice/navigationbar/NavigationBarInflaterView.java index d488890b27d44..ffa314637485e 100644 --- a/core/java/android/inputmethodservice/navigationbar/NavigationBarInflaterView.java +++ b/core/java/android/inputmethodservice/navigationbar/NavigationBarInflaterView.java @@ -121,7 +121,7 @@ public final class NavigationBarInflaterView extends FrameLayout { return CONFIG_NAV_BAR_LAYOUT_HANDLE; } - public void setButtonDispatchers(SparseArray buttonDispatchers) { + void setButtonDispatchers(SparseArray buttonDispatchers) { mButtonDispatchers = buttonDispatchers; for (int i = 0; i < buttonDispatchers.size(); i++) { initiallyFill(buttonDispatchers.valueAt(i)); @@ -376,7 +376,7 @@ public final class NavigationBarInflaterView extends FrameLayout { } */ - public static String extractSize(String buttonSpec) { + private static String extractSize(String buttonSpec) { if (!buttonSpec.contains(SIZE_MOD_START)) { return null; } @@ -384,7 +384,7 @@ public final class NavigationBarInflaterView extends FrameLayout { return buttonSpec.substring(sizeStart + 1, buttonSpec.indexOf(SIZE_MOD_END)); } - public static String extractButton(String buttonSpec) { + private static String extractButton(String buttonSpec) { if (!buttonSpec.contains(SIZE_MOD_START)) { return buttonSpec; } diff --git a/core/java/android/inputmethodservice/navigationbar/NavigationBarView.java b/core/java/android/inputmethodservice/navigationbar/NavigationBarView.java index a2d71054c65d5..875f53fdd94ea 100644 --- a/core/java/android/inputmethodservice/navigationbar/NavigationBarView.java +++ b/core/java/android/inputmethodservice/navigationbar/NavigationBarView.java @@ -181,7 +181,7 @@ public final class NavigationBarView extends FrameLayout { } } - public KeyButtonDrawable getBackDrawable() { + private KeyButtonDrawable getBackDrawable() { KeyButtonDrawable drawable = getDrawable(com.android.internal.R.drawable.ic_ime_nav_back); orientBackButton(drawable); return drawable; @@ -233,6 +233,11 @@ public final class NavigationBarView extends FrameLayout { super.setLayoutDirection(layoutDirection); } + /** + * Updates the navigation icons based on {@code hints}. + * + * @param hints bit flags defined in {@link StatusBarManager}. + */ public void setNavigationIconHints(int hints) { if (hints == mNavigationIconHints) return; final boolean newBackAlt = (hints & StatusBarManager.NAVIGATION_HINT_BACK_ALT) != 0; @@ -250,15 +255,7 @@ public final class NavigationBarView extends FrameLayout { updateNavButtonIcons(); } - public void setDisabledFlags(int disabledFlags) { - if (mDisabledFlags == disabledFlags) return; - - mDisabledFlags = disabledFlags; - - updateNavButtonIcons(); - } - - public void updateNavButtonIcons() { + private void updateNavButtonIcons() { // We have to replace or restore the back and home button icons when exiting or entering // carmode, respectively. Recents are not available in CarMode in nav bar so change // to recent icon is not required. @@ -319,7 +316,7 @@ public final class NavigationBarView extends FrameLayout { mHorizontal.setVisibility(View.GONE); } - public void reorient() { + private void reorient() { updateCurrentView(); final android.inputmethodservice.navigationbar.NavigationBarFrame frame = @@ -372,6 +369,11 @@ public final class NavigationBarView extends FrameLayout { } } + /** + * Updates the dark intensity. + * + * @param intensity The intensity of darkness from {@code 0.0f} to {@code 1.0f}. + */ public void setDarkIntensity(@FloatRange(from = 0.0f, to = 1.0f) float intensity) { for (int i = 0; i < mButtonDispatchers.size(); ++i) { mButtonDispatchers.valueAt(i).setDarkIntensity(intensity); diff --git a/core/java/android/inputmethodservice/navigationbar/ReverseLinearLayout.java b/core/java/android/inputmethodservice/navigationbar/ReverseLinearLayout.java index 68163c35f7843..72e720f535eb7 100644 --- a/core/java/android/inputmethodservice/navigationbar/ReverseLinearLayout.java +++ b/core/java/android/inputmethodservice/navigationbar/ReverseLinearLayout.java @@ -30,9 +30,8 @@ import java.util.ArrayList; /** * Automatically reverses the order of children as they are added. * Also reverse the width and height values of layout params - * @hide */ -public class ReverseLinearLayout extends LinearLayout { +class ReverseLinearLayout extends LinearLayout { /** If true, the layout is reversed vs. a regular linear layout */ private boolean mIsLayoutReverse; From dc4679a818d7aab7b82148c1547d7f5aa05ab67f Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Tue, 8 Mar 2022 20:23:17 -0800 Subject: [PATCH 2/5] Fix modifier-related lint erros under a.i.navigationbar This is a mechanical cleanup CL. There should be no behavior change. Bug: 215443343 Test: prebuilts/checkstyle/checkstyle.py -f \ frameworks/base/core/java/android/inputmethodservice/navigationbar/ \ | grep "modifier" Change-Id: Idf3c8d13c63770397e895bc05ba2374c10fb3bd1 --- .../inputmethodservice/navigationbar/ButtonDispatcher.java | 2 +- .../android/inputmethodservice/navigationbar/DeadZone.java | 2 +- .../inputmethodservice/navigationbar/KeyButtonDrawable.java | 6 +++--- .../inputmethodservice/navigationbar/KeyButtonRipple.java | 2 +- .../inputmethodservice/navigationbar/NavigationBarView.java | 4 ++-- .../navigationbar/ReverseLinearLayout.java | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core/java/android/inputmethodservice/navigationbar/ButtonDispatcher.java b/core/java/android/inputmethodservice/navigationbar/ButtonDispatcher.java index 3f26fa461097a..ab0d0a55e7d13 100644 --- a/core/java/android/inputmethodservice/navigationbar/ButtonDispatcher.java +++ b/core/java/android/inputmethodservice/navigationbar/ButtonDispatcher.java @@ -67,7 +67,7 @@ final class ButtonDispatcher { } }; - public ButtonDispatcher(int id) { + ButtonDispatcher(int id) { mId = id; } diff --git a/core/java/android/inputmethodservice/navigationbar/DeadZone.java b/core/java/android/inputmethodservice/navigationbar/DeadZone.java index 4adc84bf0b6fa..15715c0fdb095 100644 --- a/core/java/android/inputmethodservice/navigationbar/DeadZone.java +++ b/core/java/android/inputmethodservice/navigationbar/DeadZone.java @@ -82,7 +82,7 @@ final class DeadZone { } }; - public DeadZone(NavigationBarView view) { + DeadZone(NavigationBarView view) { mNavigationBarView = view; onConfigurationChanged(Surface.ROTATION_0); } diff --git a/core/java/android/inputmethodservice/navigationbar/KeyButtonDrawable.java b/core/java/android/inputmethodservice/navigationbar/KeyButtonDrawable.java index 25a443de916bc..cd645843550df 100644 --- a/core/java/android/inputmethodservice/navigationbar/KeyButtonDrawable.java +++ b/core/java/android/inputmethodservice/navigationbar/KeyButtonDrawable.java @@ -100,7 +100,7 @@ final class KeyButtonDrawable extends Drawable { } }; - public KeyButtonDrawable(Drawable d, @ColorInt int lightColor, @ColorInt int darkColor, + KeyButtonDrawable(Drawable d, @ColorInt int lightColor, @ColorInt int darkColor, boolean horizontalFlip, Color ovalBackgroundColor) { this(d, new ShadowDrawableState(lightColor, darkColor, d instanceof AnimatedVectorDrawable, horizontalFlip, ovalBackgroundColor)); @@ -433,8 +433,8 @@ final class KeyButtonDrawable extends Drawable { final boolean mSupportsAnimation; final Color mOvalBackgroundColor; - public ShadowDrawableState(@ColorInt int lightColor, @ColorInt int darkColor, - boolean animated, boolean horizontalFlip, Color ovalBackgroundColor) { + ShadowDrawableState(@ColorInt int lightColor, @ColorInt int darkColor, boolean animated, + boolean horizontalFlip, Color ovalBackgroundColor) { mLightColor = lightColor; mDarkColor = darkColor; mSupportsAnimation = animated; diff --git a/core/java/android/inputmethodservice/navigationbar/KeyButtonRipple.java b/core/java/android/inputmethodservice/navigationbar/KeyButtonRipple.java index 38a63b661ac07..7d1d4fbf16de9 100644 --- a/core/java/android/inputmethodservice/navigationbar/KeyButtonRipple.java +++ b/core/java/android/inputmethodservice/navigationbar/KeyButtonRipple.java @@ -90,7 +90,7 @@ final class KeyButtonRipple extends Drawable { private Type mType = Type.ROUNDED_RECT; - public KeyButtonRipple(Context ctx, View targetView, @DimenRes int maxWidthResource) { + KeyButtonRipple(Context ctx, View targetView, @DimenRes int maxWidthResource) { mMaxWidthResource = maxWidthResource; mMaxWidth = ctx.getResources().getDimensionPixelSize(maxWidthResource); mTargetView = targetView; diff --git a/core/java/android/inputmethodservice/navigationbar/NavigationBarView.java b/core/java/android/inputmethodservice/navigationbar/NavigationBarView.java index 875f53fdd94ea..67129eed20864 100644 --- a/core/java/android/inputmethodservice/navigationbar/NavigationBarView.java +++ b/core/java/android/inputmethodservice/navigationbar/NavigationBarView.java @@ -48,8 +48,8 @@ import java.util.function.Consumer; * @hide */ public final class NavigationBarView extends FrameLayout { - final static boolean DEBUG = false; - final static String TAG = "NavBarView"; + private static final boolean DEBUG = false; + private static final String TAG = "NavBarView"; // Copied from com.android.systemui.animation.Interpolators#FAST_OUT_SLOW_IN private static final Interpolator FAST_OUT_SLOW_IN = new PathInterpolator(0.4f, 0f, 0.2f, 1f); diff --git a/core/java/android/inputmethodservice/navigationbar/ReverseLinearLayout.java b/core/java/android/inputmethodservice/navigationbar/ReverseLinearLayout.java index 72e720f535eb7..9b36cc54b6571 100644 --- a/core/java/android/inputmethodservice/navigationbar/ReverseLinearLayout.java +++ b/core/java/android/inputmethodservice/navigationbar/ReverseLinearLayout.java @@ -39,7 +39,7 @@ class ReverseLinearLayout extends LinearLayout { /** If true, the layout is opposite to it's natural reversity from the layout direction */ private boolean mIsAlternativeOrder; - public ReverseLinearLayout(Context context, @Nullable AttributeSet attrs) { + ReverseLinearLayout(Context context, @Nullable AttributeSet attrs) { super(context, attrs); } @@ -128,7 +128,7 @@ class ReverseLinearLayout extends LinearLayout { public static class ReverseRelativeLayout extends RelativeLayout implements Reversible { - public ReverseRelativeLayout(Context context) { + ReverseRelativeLayout(Context context) { super(context); } From 76adda5ef3c0dfb39d58ab293de4807bdf07969f Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Tue, 8 Mar 2022 20:23:22 -0800 Subject: [PATCH 3/5] Fix whitespace-related lint erros under a.i.navigationbar This is a mechanical cleanup CL. There should be no behavior change. Bug: 215443343 Test: prebuilts/checkstyle/checkstyle.py -f \ frameworks/base/core/java/android/inputmethodservice/navigationbar/ \ | grep "whitespace" Change-Id: I342af73d675f6432b16acd2604d2e43a5055b701 --- .../navigationbar/KeyButtonRipple.java | 14 +++++++------- .../navigationbar/KeyButtonView.java | 4 ++-- .../navigationbar/NavigationBarInflaterView.java | 2 +- .../navigationbar/NavigationBarView.java | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/java/android/inputmethodservice/navigationbar/KeyButtonRipple.java b/core/java/android/inputmethodservice/navigationbar/KeyButtonRipple.java index 7d1d4fbf16de9..cf77c89898589 100644 --- a/core/java/android/inputmethodservice/navigationbar/KeyButtonRipple.java +++ b/core/java/android/inputmethodservice/navigationbar/KeyButtonRipple.java @@ -126,7 +126,7 @@ final class KeyButtonRipple extends Drawable { private void drawSoftware(Canvas canvas) { if (mGlowAlpha > 0f) { final Paint p = getRipplePaint(); - p.setAlpha((int)(mGlowAlpha * 255f)); + p.setAlpha((int) (mGlowAlpha * 255f)); final float w = getBounds().width(); final float h = getBounds().height(); @@ -412,7 +412,7 @@ final class KeyButtonRipple extends Drawable { mDrawingHardwareGlow = true; setExtendStart(CanvasProperty.createFloat(getExtendSize() / 2)); final RenderNodeAnimator startAnim = new RenderNodeAnimator(getExtendStart(), - getExtendSize()/2 - GLOW_MAX_SCALE_FACTOR * getRippleSize()/2); + getExtendSize() / 2 - GLOW_MAX_SCALE_FACTOR * getRippleSize() / 2); startAnim.setDuration(ANIMATION_DURATION_SCALE); startAnim.setInterpolator(mInterpolator); startAnim.addListener(mAnimatorListener); @@ -420,7 +420,7 @@ final class KeyButtonRipple extends Drawable { setExtendEnd(CanvasProperty.createFloat(getExtendSize() / 2)); final RenderNodeAnimator endAnim = new RenderNodeAnimator(getExtendEnd(), - getExtendSize()/2 + GLOW_MAX_SCALE_FACTOR * getRippleSize()/2); + getExtendSize() / 2 + GLOW_MAX_SCALE_FACTOR * getRippleSize() / 2); endAnim.setDuration(ANIMATION_DURATION_SCALE); endAnim.setInterpolator(mInterpolator); endAnim.addListener(mAnimatorListener); @@ -430,13 +430,13 @@ final class KeyButtonRipple extends Drawable { if (isHorizontal()) { mTopProp = CanvasProperty.createFloat(0f); mBottomProp = CanvasProperty.createFloat(getBounds().height()); - mRxProp = CanvasProperty.createFloat(getBounds().height()/2); - mRyProp = CanvasProperty.createFloat(getBounds().height()/2); + mRxProp = CanvasProperty.createFloat(getBounds().height() / 2); + mRyProp = CanvasProperty.createFloat(getBounds().height() / 2); } else { mLeftProp = CanvasProperty.createFloat(0f); mRightProp = CanvasProperty.createFloat(getBounds().width()); - mRxProp = CanvasProperty.createFloat(getBounds().width()/2); - mRyProp = CanvasProperty.createFloat(getBounds().width()/2); + mRxProp = CanvasProperty.createFloat(getBounds().width() / 2); + mRyProp = CanvasProperty.createFloat(getBounds().width() / 2); } mGlowScale = GLOW_MAX_SCALE_FACTOR; diff --git a/core/java/android/inputmethodservice/navigationbar/KeyButtonView.java b/core/java/android/inputmethodservice/navigationbar/KeyButtonView.java index dfe893a446fff..db9a099ec95e6 100644 --- a/core/java/android/inputmethodservice/navigationbar/KeyButtonView.java +++ b/core/java/android/inputmethodservice/navigationbar/KeyButtonView.java @@ -200,8 +200,8 @@ public class KeyButtonView extends ImageView implements ButtonInterface { postDelayed(mCheckLongPress, ViewConfiguration.getLongPressTimeout()); break; case MotionEvent.ACTION_MOVE: - x = (int)ev.getRawX(); - y = (int)ev.getRawY(); + x = (int) ev.getRawX(); + y = (int) ev.getRawY(); float slop = getQuickStepTouchSlopPx(getContext()); if (Math.abs(x - mTouchDownX) > slop || Math.abs(y - mTouchDownY) > slop) { diff --git a/core/java/android/inputmethodservice/navigationbar/NavigationBarInflaterView.java b/core/java/android/inputmethodservice/navigationbar/NavigationBarInflaterView.java index ffa314637485e..94f8c79cd4bab 100644 --- a/core/java/android/inputmethodservice/navigationbar/NavigationBarInflaterView.java +++ b/core/java/android/inputmethodservice/navigationbar/NavigationBarInflaterView.java @@ -398,7 +398,7 @@ public final class NavigationBarInflaterView extends FrameLayout { mButtonDispatchers.valueAt(indexOfKey).addView(v); } if (v instanceof ViewGroup) { - final ViewGroup viewGroup = (ViewGroup)v; + final ViewGroup viewGroup = (ViewGroup) v; final int N = viewGroup.getChildCount(); for (int i = 0; i < N; i++) { addToDispatchers(viewGroup.getChildAt(i)); diff --git a/core/java/android/inputmethodservice/navigationbar/NavigationBarView.java b/core/java/android/inputmethodservice/navigationbar/NavigationBarView.java index 67129eed20864..7380b7852cbd1 100644 --- a/core/java/android/inputmethodservice/navigationbar/NavigationBarView.java +++ b/core/java/android/inputmethodservice/navigationbar/NavigationBarView.java @@ -211,7 +211,7 @@ public final class NavigationBarView extends FrameLayout { // Animate the back button's rotation to the new degrees and only in portrait move up the // back button to line up with the other buttons float targetY = useAltBack - ? - dpToPx(NAVBAR_BACK_BUTTON_IME_OFFSET, getResources()) + ? -dpToPx(NAVBAR_BACK_BUTTON_IME_OFFSET, getResources()) : 0; ObjectAnimator navBarAnimator = ObjectAnimator.ofPropertyValuesHolder(drawable, PropertyValuesHolder.ofFloat(KeyButtonDrawable.KEY_DRAWABLE_ROTATE, degrees), From 0b1522bce4471d32ce3c10528debee2a7964a138 Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Tue, 8 Mar 2022 20:23:26 -0800 Subject: [PATCH 4/5] Fix camel-case-related lint erros under a.i.navigationbar This is a mechanical cleanup CL. There should be no behavior change. Bug: 215443343 Test: prebuilts/checkstyle/checkstyle.py -f \ frameworks/base/core/java/android/inputmethodservice/navigationbar/ \ | grep "camel-case" Change-Id: I05b25b11c6b571407bc4a707161fb993960603f9 --- .../navigationbar/ButtonDispatcher.java | 48 +++++++++---------- .../NavigationBarInflaterView.java | 4 +- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/core/java/android/inputmethodservice/navigationbar/ButtonDispatcher.java b/core/java/android/inputmethodservice/navigationbar/ButtonDispatcher.java index ab0d0a55e7d13..6b2db7d01a542 100644 --- a/core/java/android/inputmethodservice/navigationbar/ButtonDispatcher.java +++ b/core/java/android/inputmethodservice/navigationbar/ButtonDispatcher.java @@ -125,8 +125,8 @@ final class ButtonDispatcher { public void setImageDrawable(KeyButtonDrawable drawable) { mImageDrawable = drawable; - final int N = mViews.size(); - for (int i = 0; i < N; i++) { + final int numViews = mViews.size(); + for (int i = 0; i < numViews; i++) { if (mViews.get(i) instanceof ButtonInterface) { ((ButtonInterface) mViews.get(i)).setImageDrawable(mImageDrawable); } @@ -143,8 +143,8 @@ final class ButtonDispatcher { } mVisibility = visibility; - final int N = mViews.size(); - for (int i = 0; i < N; i++) { + final int numViews = mViews.size(); + for (int i = 0; i < numViews; i++) { mViews.get(i).setVisibility(mVisibility); } } @@ -188,8 +188,8 @@ final class ButtonDispatcher { int nextAlpha = (int) (alpha * 255); if (prevAlpha != nextAlpha) { mAlpha = nextAlpha / 255f; - final int N = mViews.size(); - for (int i = 0; i < N; i++) { + final int numViews = mViews.size(); + for (int i = 0; i < numViews; i++) { mViews.get(i).setAlpha(mAlpha); } } @@ -198,8 +198,8 @@ final class ButtonDispatcher { public void setDarkIntensity(float darkIntensity) { mDarkIntensity = darkIntensity; - final int N = mViews.size(); - for (int i = 0; i < N; i++) { + final int numViews = mViews.size(); + for (int i = 0; i < numViews; i++) { if (mViews.get(i) instanceof ButtonInterface) { ((ButtonInterface) mViews.get(i)).setDarkIntensity(darkIntensity); } @@ -208,8 +208,8 @@ final class ButtonDispatcher { public void setDelayTouchFeedback(boolean delay) { mDelayTouchFeedback = delay; - final int N = mViews.size(); - for (int i = 0; i < N; i++) { + final int numViews = mViews.size(); + for (int i = 0; i < numViews; i++) { if (mViews.get(i) instanceof ButtonInterface) { ((ButtonInterface) mViews.get(i)).setDelayTouchFeedback(delay); } @@ -218,55 +218,55 @@ final class ButtonDispatcher { public void setOnClickListener(View.OnClickListener clickListener) { mClickListener = clickListener; - final int N = mViews.size(); - for (int i = 0; i < N; i++) { + final int numViews = mViews.size(); + for (int i = 0; i < numViews; i++) { mViews.get(i).setOnClickListener(mClickListener); } } public void setOnTouchListener(View.OnTouchListener touchListener) { mTouchListener = touchListener; - final int N = mViews.size(); - for (int i = 0; i < N; i++) { + final int numViews = mViews.size(); + for (int i = 0; i < numViews; i++) { mViews.get(i).setOnTouchListener(mTouchListener); } } public void setLongClickable(boolean isLongClickable) { mLongClickable = isLongClickable; - final int N = mViews.size(); - for (int i = 0; i < N; i++) { + final int numViews = mViews.size(); + for (int i = 0; i < numViews; i++) { mViews.get(i).setLongClickable(mLongClickable); } } public void setOnLongClickListener(View.OnLongClickListener longClickListener) { mLongClickListener = longClickListener; - final int N = mViews.size(); - for (int i = 0; i < N; i++) { + final int numViews = mViews.size(); + for (int i = 0; i < numViews; i++) { mViews.get(i).setOnLongClickListener(mLongClickListener); } } public void setOnHoverListener(View.OnHoverListener hoverListener) { mOnHoverListener = hoverListener; - final int N = mViews.size(); - for (int i = 0; i < N; i++) { + final int numViews = mViews.size(); + for (int i = 0; i < numViews; i++) { mViews.get(i).setOnHoverListener(mOnHoverListener); } } public void setAccessibilityDelegate(AccessibilityDelegate delegate) { mAccessibilityDelegate = delegate; - final int N = mViews.size(); - for (int i = 0; i < N; i++) { + final int numViews = mViews.size(); + for (int i = 0; i < numViews; i++) { mViews.get(i).setAccessibilityDelegate(delegate); } } public void setTranslation(int x, int y, int z) { - final int N = mViews.size(); - for (int i = 0; i < N; i++) { + final int numViews = mViews.size(); + for (int i = 0; i < numViews; i++) { final View view = mViews.get(i); view.setTranslationX(x); view.setTranslationY(y); diff --git a/core/java/android/inputmethodservice/navigationbar/NavigationBarInflaterView.java b/core/java/android/inputmethodservice/navigationbar/NavigationBarInflaterView.java index 94f8c79cd4bab..e93bda2fa9390 100644 --- a/core/java/android/inputmethodservice/navigationbar/NavigationBarInflaterView.java +++ b/core/java/android/inputmethodservice/navigationbar/NavigationBarInflaterView.java @@ -399,8 +399,8 @@ public final class NavigationBarInflaterView extends FrameLayout { } if (v instanceof ViewGroup) { final ViewGroup viewGroup = (ViewGroup) v; - final int N = viewGroup.getChildCount(); - for (int i = 0; i < N; i++) { + final int numChildViews = viewGroup.getChildCount(); + for (int i = 0; i < numChildViews; i++) { addToDispatchers(viewGroup.getChildAt(i)); } } From 63fc97c8d0d4de279cc84f3a353a7579bdf4f457 Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Tue, 8 Mar 2022 20:23:30 -0800 Subject: [PATCH 5/5] Fix remaining lint erros under a.i.navigationbar This is a mechanical cleanup CL. There should be no behavior change. Bug: 215443343 Test: prebuilts/checkstyle/checkstyle.py -f \ frameworks/base/core/java/android/inputmethodservice/navigationbar/ \ | grep ".java:" Change-Id: Ib9dcddc675bdd540ae93a1eb5b1db00d1dccecb1 --- .../navigationbar/DeadZone.java | 11 +++-- .../navigationbar/KeyButtonDrawable.java | 40 +++++++++---------- .../navigationbar/KeyButtonView.java | 4 +- .../navigationbar/NavigationBarFrame.java | 2 +- .../navigationbar/NavigationBarView.java | 2 +- 5 files changed, 31 insertions(+), 28 deletions(-) diff --git a/core/java/android/inputmethodservice/navigationbar/DeadZone.java b/core/java/android/inputmethodservice/navigationbar/DeadZone.java index 15715c0fdb095..4cfd8139d912f 100644 --- a/core/java/android/inputmethodservice/navigationbar/DeadZone.java +++ b/core/java/android/inputmethodservice/navigationbar/DeadZone.java @@ -92,13 +92,15 @@ final class DeadZone { } private float getSize(long now) { - if (mSizeMax == 0) + if (mSizeMax == 0) { return 0; + } long dt = (now - mLastPokeTime); - if (dt > mHold + mDecay) + if (dt > mHold + mDecay) { return mSizeMin; - if (dt < mHold) + } else if (dt < mHold) { return mSizeMax; + } return (int) lerp(mSizeMax, mSizeMin, (float) (dt - mHold) / mDecay); } @@ -177,8 +179,9 @@ final class DeadZone { private void poke(MotionEvent event) { mLastPokeTime = event.getEventTime(); - if (DEBUG) + if (DEBUG) { Log.v(TAG, "poked! size=" + getSize(mLastPokeTime)); + } if (mShouldFlash) mNavigationBarView.postInvalidate(); } diff --git a/core/java/android/inputmethodservice/navigationbar/KeyButtonDrawable.java b/core/java/android/inputmethodservice/navigationbar/KeyButtonDrawable.java index cd645843550df..45c8a186117d5 100644 --- a/core/java/android/inputmethodservice/navigationbar/KeyButtonDrawable.java +++ b/core/java/android/inputmethodservice/navigationbar/KeyButtonDrawable.java @@ -54,30 +54,30 @@ import android.view.View; final class KeyButtonDrawable extends Drawable { public static final FloatProperty KEY_DRAWABLE_ROTATE = - new FloatProperty("KeyButtonRotation") { - @Override - public void setValue(KeyButtonDrawable drawable, float degree) { - drawable.setRotation(degree); - } + new FloatProperty("KeyButtonRotation") { + @Override + public void setValue(KeyButtonDrawable drawable, float degree) { + drawable.setRotation(degree); + } - @Override - public Float get(KeyButtonDrawable drawable) { - return drawable.getRotation(); - } - }; + @Override + public Float get(KeyButtonDrawable drawable) { + return drawable.getRotation(); + } + }; public static final FloatProperty KEY_DRAWABLE_TRANSLATE_Y = - new FloatProperty("KeyButtonTranslateY") { - @Override - public void setValue(KeyButtonDrawable drawable, float y) { - drawable.setTranslationY(y); - } + new FloatProperty("KeyButtonTranslateY") { + @Override + public void setValue(KeyButtonDrawable drawable, float y) { + drawable.setTranslationY(y); + } - @Override - public Float get(KeyButtonDrawable drawable) { - return drawable.getTranslationY(); - } - }; + @Override + public Float get(KeyButtonDrawable drawable) { + return drawable.getTranslationY(); + } + }; private final Paint mIconPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG); private final Paint mShadowPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG); diff --git a/core/java/android/inputmethodservice/navigationbar/KeyButtonView.java b/core/java/android/inputmethodservice/navigationbar/KeyButtonView.java index db9a099ec95e6..cfdb6caab9d34 100644 --- a/core/java/android/inputmethodservice/navigationbar/KeyButtonView.java +++ b/core/java/android/inputmethodservice/navigationbar/KeyButtonView.java @@ -310,8 +310,8 @@ public class KeyButtonView extends ImageView implements ButtonInterface { switch (action) { case KeyEvent.ACTION_DOWN: handled = ims.onKeyDown(ev.getKeyCode(), ev); - mTracking = handled && ev.getRepeatCount() == 0 && - (ev.getFlags() & KeyEvent.FLAG_START_TRACKING) != 0; + mTracking = handled && ev.getRepeatCount() == 0 + && (ev.getFlags() & KeyEvent.FLAG_START_TRACKING) != 0; break; case KeyEvent.ACTION_UP: handled = ims.onKeyUp(ev.getKeyCode(), ev); diff --git a/core/java/android/inputmethodservice/navigationbar/NavigationBarFrame.java b/core/java/android/inputmethodservice/navigationbar/NavigationBarFrame.java index f01173e0fdaee..a270675239eec 100644 --- a/core/java/android/inputmethodservice/navigationbar/NavigationBarFrame.java +++ b/core/java/android/inputmethodservice/navigationbar/NavigationBarFrame.java @@ -59,4 +59,4 @@ public final class NavigationBarFrame extends FrameLayout { } return super.dispatchTouchEvent(event); } -} \ No newline at end of file +} diff --git a/core/java/android/inputmethodservice/navigationbar/NavigationBarView.java b/core/java/android/inputmethodservice/navigationbar/NavigationBarView.java index 7380b7852cbd1..510b14e7acd4b 100644 --- a/core/java/android/inputmethodservice/navigationbar/NavigationBarView.java +++ b/core/java/android/inputmethodservice/navigationbar/NavigationBarView.java @@ -139,7 +139,7 @@ public final class NavigationBarView extends FrameLayout { } /** - * Applies {@param consumer} to each of the nav bar views. + * Applies {@code consumer} to each of the nav bar views. */ public void forEachView(Consumer consumer) { if (mHorizontal != null) {