Commit cbb0256b authored by Peter Wen's avatar Peter Wen Committed by Commit Bot

Android: Fix lint errors including ResourceType

As part of enabling more lint checks, reducing the number of existing
baseline warnings/errors helps to offset future increases when we turn
on more checks.

Bug: 1116130
Change-Id: Ib06c4a27fb7c37f58e8682bc1bd367cae0a096bc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2364218
Commit-Queue: Peter Wen <wnwen@chromium.org>
Auto-Submit: Peter Wen <wnwen@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarFinnur Thorarinsson <finnur@chromium.org>
Reviewed-by: default avatarMugdha Lakhani <nator@chromium.org>
Cr-Commit-Position: refs/heads/master@{#800231}
parent d2ef4028
...@@ -425,9 +425,10 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent> ...@@ -425,9 +425,10 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
VrModuleProvider.getDelegate().maybeHandleVrIntentPreNative(this, intent); VrModuleProvider.getDelegate().maybeHandleVrIntentPreNative(this, intent);
} }
BottomContainer bottomContainer = (BottomContainer) findViewById(R.id.bottom_container);
// TODO(1099750): Move this to the RootUiCoordinator. // TODO(1099750): Move this to the RootUiCoordinator.
mSnackbarManager = new SnackbarManager( mSnackbarManager = new SnackbarManager(this, bottomContainer, getWindowAndroid());
this, findViewById(R.id.bottom_container), getWindowAndroid());
SnackbarManagerProvider.attach(getWindowAndroid(), mSnackbarManager); SnackbarManagerProvider.attach(getWindowAndroid(), mSnackbarManager);
mAssistStatusHandler = createAssistStatusHandler(); mAssistStatusHandler = createAssistStatusHandler();
...@@ -459,7 +460,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent> ...@@ -459,7 +460,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
getControlContainerHeightResource()); getControlContainerHeightResource());
} }
BottomContainer bottomContainer = (BottomContainer) findViewById(R.id.bottom_container);
bottomContainer.initialize(getBrowserControlsManager(), bottomContainer.initialize(getBrowserControlsManager(),
getWindowAndroid().getApplicationBottomInsetProvider()); getWindowAndroid().getApplicationBottomInsetProvider());
getLifecycleDispatcher().register(bottomContainer); getLifecycleDispatcher().register(bottomContainer);
......
...@@ -7,8 +7,8 @@ package org.chromium.chrome.browser.compositor.layouts.components; ...@@ -7,8 +7,8 @@ package org.chromium.chrome.browser.compositor.layouts.components;
import android.content.Context; import android.content.Context;
import androidx.annotation.ColorInt; import androidx.annotation.ColorInt;
import androidx.annotation.ColorRes;
import androidx.annotation.DrawableRes; import androidx.annotation.DrawableRes;
import androidx.annotation.IdRes;
/** /**
* Class for a CompositorButton that uses tint instead of multiple drawable resources. * Class for a CompositorButton that uses tint instead of multiple drawable resources.
...@@ -16,10 +16,10 @@ import androidx.annotation.IdRes; ...@@ -16,10 +16,10 @@ import androidx.annotation.IdRes;
public class TintedCompositorButton extends CompositorButton { public class TintedCompositorButton extends CompositorButton {
private Context mContext; private Context mContext;
private @IdRes int mDefaultTintResource; private @ColorRes int mDefaultTintResource;
private @IdRes int mPressedTintResource; private @ColorRes int mPressedTintResource;
private @IdRes int mIncognitoTintResource; private @ColorRes int mIncognitoTintResource;
private @IdRes int mIncognitoPressedTintResource; private @ColorRes int mIncognitoPressedTintResource;
public TintedCompositorButton( public TintedCompositorButton(
Context context, float width, float height, CompositorOnClickHandler clickHandler) { Context context, float width, float height, CompositorOnClickHandler clickHandler) {
...@@ -67,8 +67,8 @@ public class TintedCompositorButton extends CompositorButton { ...@@ -67,8 +67,8 @@ public class TintedCompositorButton extends CompositorButton {
* @param incognitoTint The incognito tint resource. * @param incognitoTint The incognito tint resource.
* @param incognitoPressedTint The incognito pressed tint resource. * @param incognitoPressedTint The incognito pressed tint resource.
*/ */
public void setTintResources(@IdRes int defaultTint, @IdRes int pressedTint, public void setTintResources(@ColorRes int defaultTint, @ColorRes int pressedTint,
@IdRes int incognitoTint, @IdRes int incognitoPressedTint) { @ColorRes int incognitoTint, @ColorRes int incognitoPressedTint) {
mDefaultTintResource = defaultTint; mDefaultTintResource = defaultTint;
mPressedTintResource = pressedTint; mPressedTintResource = pressedTint;
mIncognitoTintResource = incognitoTint; mIncognitoTintResource = incognitoTint;
...@@ -87,4 +87,4 @@ public class TintedCompositorButton extends CompositorButton { ...@@ -87,4 +87,4 @@ public class TintedCompositorButton extends CompositorButton {
return mContext.getResources().getColor(tint); return mContext.getResources().getColor(tint);
} }
} }
\ No newline at end of file
...@@ -12,7 +12,7 @@ import android.widget.ImageView; ...@@ -12,7 +12,7 @@ import android.widget.ImageView;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.IdRes; import androidx.annotation.DimenRes;
import org.chromium.base.metrics.RecordHistogram; import org.chromium.base.metrics.RecordHistogram;
import org.chromium.base.supplier.Supplier; import org.chromium.base.supplier.Supplier;
...@@ -152,7 +152,7 @@ class NavigationSheetCoordinator implements BottomSheetContent, NavigationSheet ...@@ -152,7 +152,7 @@ class NavigationSheetCoordinator implements BottomSheetContent, NavigationSheet
+ getSizePx(context, R.dimen.navigation_sheet_content_wrap_padding); + getSizePx(context, R.dimen.navigation_sheet_content_wrap_padding);
} }
private static int getSizePx(Context context, @IdRes int id) { private static int getSizePx(Context context, @DimenRes int id) {
return context.getResources().getDimensionPixelSize(id); return context.getResources().getDimensionPixelSize(id);
} }
......
...@@ -509,6 +509,7 @@ public abstract class AsyncInitializationActivity extends ChromeBaseAppCompatAct ...@@ -509,6 +509,7 @@ public abstract class AsyncInitializationActivity extends ChromeBaseAppCompatAct
@CallSuper @CallSuper
@Override @Override
@SuppressLint("MissingSuperCall") // Empty method in parent Activity class.
public void onNewIntent(Intent intent) { public void onNewIntent(Intent intent) {
if (intent == null) return; if (intent == null) return;
mNativeInitializationController.onNewIntent(intent); mNativeInitializationController.onNewIntent(intent);
...@@ -517,6 +518,7 @@ public abstract class AsyncInitializationActivity extends ChromeBaseAppCompatAct ...@@ -517,6 +518,7 @@ public abstract class AsyncInitializationActivity extends ChromeBaseAppCompatAct
@CallSuper @CallSuper
@Override @Override
@SuppressLint("MissingSuperCall") // Empty method in parent Activity class.
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
mNativeInitializationController.onActivityResult(requestCode, resultCode, data); mNativeInitializationController.onActivityResult(requestCode, resultCode, data);
} }
......
...@@ -13,7 +13,7 @@ import android.util.Pair; ...@@ -13,7 +13,7 @@ import android.util.Pair;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.view.ViewGroup; import android.view.ViewGroup;
import androidx.annotation.ColorRes; import androidx.annotation.ColorInt;
import androidx.core.graphics.drawable.RoundedBitmapDrawable; import androidx.core.graphics.drawable.RoundedBitmapDrawable;
import org.chromium.chrome.browser.externalauth.ExternalAuthUtils; import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
...@@ -93,7 +93,7 @@ class SearchBoxMediator ...@@ -93,7 +93,7 @@ class SearchBoxMediator
Drawable drawable = mAssistantVoiceSearchService.getCurrentMicDrawable(); Drawable drawable = mAssistantVoiceSearchService.getCurrentMicDrawable();
mModel.set(SearchBoxProperties.VOICE_SEARCH_DRAWABLE, drawable); mModel.set(SearchBoxProperties.VOICE_SEARCH_DRAWABLE, drawable);
final @ColorRes int primaryColor = ChromeColors.getDefaultThemeColor( final @ColorInt int primaryColor = ChromeColors.getDefaultThemeColor(
mContext.getResources(), false /* forceDarkBgColor= */); mContext.getResources(), false /* forceDarkBgColor= */);
ColorStateList colorStateList = ColorStateList colorStateList =
mAssistantVoiceSearchService.getMicButtonColorStateList(primaryColor, mContext); mAssistantVoiceSearchService.getMicButtonColorStateList(primaryColor, mContext);
......
...@@ -11,7 +11,7 @@ import android.graphics.drawable.Drawable; ...@@ -11,7 +11,7 @@ import android.graphics.drawable.Drawable;
import android.os.Build; import android.os.Build;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.annotation.ColorRes; import androidx.annotation.ColorInt;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
...@@ -175,7 +175,7 @@ public class AssistantVoiceSearchService implements TemplateUrlService.TemplateU ...@@ -175,7 +175,7 @@ public class AssistantVoiceSearchService implements TemplateUrlService.TemplateU
/** @return The correct ColorStateList for the current theme. */ /** @return The correct ColorStateList for the current theme. */
public @Nullable ColorStateList getMicButtonColorStateList( public @Nullable ColorStateList getMicButtonColorStateList(
@ColorRes int primaryColor, Context context) { @ColorInt int primaryColor, Context context) {
if (mShouldShowColorfulMic) return null; if (mShouldShowColorfulMic) return null;
final boolean useLightColors = final boolean useLightColors =
......
...@@ -49,6 +49,7 @@ public class ClearWebsiteStorageDialog extends PreferenceDialogFragmentCompat { ...@@ -49,6 +49,7 @@ public class ClearWebsiteStorageDialog extends PreferenceDialogFragmentCompat {
@Override @Override
public void onConfigurationChanged(Configuration newConfig) { public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
if (mDialogView != null) { if (mDialogView != null) {
// When the device switches to multi-window in landscape mode, the height of the // When the device switches to multi-window in landscape mode, the height of the
// offlineTextView is not calculated correctly (its height gets truncated) and a layout // offlineTextView is not calculated correctly (its height gets truncated) and a layout
......
...@@ -165,7 +165,7 @@ public class UrlBarControllerImpl extends IUrlBarController.Stub { ...@@ -165,7 +165,7 @@ public class UrlBarControllerImpl extends IUrlBarController.Stub {
mUrlTextView.setTextSize( mUrlTextView.setTextSize(
TypedValue.COMPLEX_UNIT_SP, Math.max(MINIMUM_TEXT_SIZE, mTextSize)); TypedValue.COMPLEX_UNIT_SP, Math.max(MINIMUM_TEXT_SIZE, mTextSize));
Context embedderContext = mBrowserImpl.getEmbedderActivityContext(); Context embedderContext = mBrowserImpl.getEmbedderActivityContext();
if (mUrlTextColor > 0 && embedderContext != null) { if (mUrlTextColor != 0 && embedderContext != null) {
mUrlTextView.setTextColor(ContextCompat.getColor(embedderContext, mUrlTextColor)); mUrlTextView.setTextColor(ContextCompat.getColor(embedderContext, mUrlTextColor));
} }
...@@ -175,7 +175,7 @@ public class UrlBarControllerImpl extends IUrlBarController.Stub { ...@@ -175,7 +175,7 @@ public class UrlBarControllerImpl extends IUrlBarController.Stub {
UrlBarControllerImplJni.get().getConnectionSecurityLevel( UrlBarControllerImplJni.get().getConnectionSecurityLevel(
mNativeUrlBarController)))); mNativeUrlBarController))));
if (mUrlIconColor > 0 && embedderContext != null) { if (mUrlIconColor != 0 && embedderContext != null) {
ImageViewCompat.setImageTintList(mSecurityButton, ImageViewCompat.setImageTintList(mSecurityButton,
ColorStateList.valueOf( ColorStateList.valueOf(
ContextCompat.getColor(embedderContext, mUrlIconColor))); ContextCompat.getColor(embedderContext, mUrlIconColor)));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment