Android: Remove blanket suppressions
Previously, blanket suppressions were added due to lint not working. Now
that android lint is working well again, we no longer need these blanket
suppressions. They have been removed/fixed/or moved to the specific
files that require them.
Bug: 1044658,1116130
Change-Id: I249afb500c49c13f35880311d04c51391ed8cbfa
Fixed: 1044658
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2424543
Commit-Queue: Peter Wen <wnwen@chromium.org>
Reviewed-by: Matthew Jones <mdjones@chromium.org>
Reviewed-by: Finnur Thorarinsson <finnur@chromium.org>
Auto-Submit: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809858}
diff --git a/chrome/android/expectations/lint-suppressions.xml b/chrome/android/expectations/lint-suppressions.xml
index a914d69..83de1d5 100644
--- a/chrome/android/expectations/lint-suppressions.xml
+++ b/chrome/android/expectations/lint-suppressions.xml
@@ -18,14 +18,6 @@
<ignore regexp="chrome/android/java/res_base/xml/network_security_config.xml"/>
<ignore regexp="android_webview/tools/system_webview_shell/apk/res/xml/network_security_config.xml"/>
</issue>
- <issue id="ContentDescription">
- <!--TODO(crbug.com/1044658): This suppression was added blindly, and needs investigated.-->
- <ignore regexp="components/browser_ui/contacts_picker/android/java/res/layout/contacts_list_item_view.xml"/>
- <!--TODO(crbug.com/1044658): This suppression was added blindly, and needs investigated.-->
- <ignore regexp="components/browser_ui/photo_picker/android/java/res/layout/photo_picker_dialog.xml"/>
- <!--TODO(crbug.com/1044658): This suppression was added blindly, and needs investigated.-->
- <ignore regexp="components/browser_ui/photo_picker/android/java/res/layout/video_player.xml"/>
- </issue>
<issue id="CustomViewStyleable">
<!-- TODO(crbug.com/1077861): Old code, good to fix. -->
<ignore regexp="components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/BoundedLinearLayout.java"/>
@@ -38,11 +30,6 @@
<!-- TODO(crbug.com/1082222): Fix -->
<ignore regexp="chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/header/HeaderProcessor.java"/>
</issue>
- <issue id="DuplicateIds" severity="Fatal">
- <!--TODO(crbug.com/1044658): This suppression was added blindly, and needs investigated.-->
- <ignore regexp="chrome/android/java/res/menu/main_menu.xml"/>
- <ignore regexp="chrome/android/java/res/menu/main_menu_regroup.xml"/>
- </issue>
<issue id="DrawAllocation">
<ignore regexp="content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java"/>
<ignore regexp="content/public/android/java/src/org/chromium/content/browser/PopupZoomer.java"/>
@@ -109,10 +96,6 @@
<ignore regexp="components/browser_ui/strings/android/browser_ui_strings_grd"/>
<ignore regexp="clank/third_party/chime/chime_systemtray_strings_grd.resources.zip"/>
</issue>
- <issue id="IncludeLayoutParam">
- <!--TODO(crbug.com/1044658): This suppression was added blindly, and needs investigated.-->
- <ignore regexp="chrome/android/java/res/layout/start_top_toolbar.xml"/>
- </issue>
<issue id="InsecureBaseConfiguration">
<!-- See https://crbug.com/827265 and comment in the file for context. -->
<ignore regexp="chrome/android/java/res_base/xml/network_security_config.xml"/>
@@ -147,8 +130,6 @@
<ignore regexp="toolbar_background.9.png"/>
<!-- Only used by FirstRunFlowSequencer guarded by tablet form-factor. -->
<ignore regexp="window_background.xml"/>
- <!--TODO(crbug.com/1044658): This suppression was added blindly, and needs investigated.-->
- <ignore regexp="chrome/android/java/res/layout-sw360dp/preference_spinner_single_line.xml"/>
</issue>
<issue id="MissingPermission" severity="ignore"/>
<issue id="MissingQuantity" severity="ignore"/>
@@ -196,11 +177,6 @@
<issue id="ResourceAsColor" severity="ignore"/>
<issue id="RtlCompat" severity="ignore"/>
<issue id="RtlEnabled" severity="ignore"/>
- <issue id="RtlHardcoded">
- <!--TODO(crbug.com/1044658): This suppression was added blindly, and needs
- investigated.-->
- <ignore regexp="chrome/android/java/res/layout/sheet_tab_toolbar.xml"/>
- </issue>
<issue id="RtlSymmetry" severity="ignore"/>
<issue id="SetJavaScriptEnabled" severity="ignore"/>
<issue id="SignatureOrSystemPermissions" severity="ignore"/>
@@ -225,6 +201,7 @@
translated. This avoids blocking translation updates. -->
<issue id="Typos" severity="ignore"/>
<issue id="TypographyDashes">
+ <!-- The double dash in the following file is a command line flag. -->
<ignore regexp="chrome/app/policy/android/values-v21/restriction_values.xml"/>
</issue>
<issue id="UnusedIds" severity="ignore"/>
@@ -343,16 +320,6 @@
<ignore regexp="The resource `R.drawable.*_expand_.*` appears to be unused"/>
<!-- 1 string used by Android's policies system, pulled from app directly -->
<ignore regexp="restriction_values.xml"/>
- <!--TODO(crbug.com/1044658): This suppression was added blindly, and needs investigated.-->
- <ignore regexp="../obj/components/strings/components_strings_grd.resources.zip/values/components_strings.xml"/>
- <!--TODO(crbug.com/1044658): This suppression was added blindly, and needs investigated.-->
- <ignore regexp="chrome/android/java/res/values/dimens.xml"/>
- <!--TODO(crbug.com/1044658): This suppression was added blindly, and needs investigated.-->
- <ignore regexp="chrome/android/java/res/layout-sw360dp/preference_spinner_single_line.xml"/>
- <!--TODO(crbug.com/1044658): This suppression was added blindly, and needs investigated.-->
- <ignore regexp="chrome/android/java/res/values/styles.xml"/>
- <!--TODO(crbug.com/1044658): This suppression was added blindly, and needs investigated.-->
- <ignore regexp="chrome/android/java/res/layout/tab_switcher_action_menu_layout.xml"/>
<!--TODO(crbug.com/1052375): Remove this suppression once ConnectionInfoPopAndroid moves to components.-->
<ignore regexp="components/page_info/android/java/res/drawable-hdpi/pageinfo_*"/>
<!--TODO(crbug.com/1052375): Remove this suppression once PermissionParamsListBuilder moves to components.-->
diff --git a/chrome/android/java/res/layout/sheet_tab_toolbar.xml b/chrome/android/java/res/layout/sheet_tab_toolbar.xml
index 3393b34..c0549639 100644
--- a/chrome/android/java/res/layout/sheet_tab_toolbar.xml
+++ b/chrome/android/java/res/layout/sheet_tab_toolbar.xml
@@ -109,7 +109,7 @@
android:layout_toStartOf="@id/open_in_new_tab"
android:layout_toEndOf="@id/security_icon"
android:layout_below="@id/title"
- android:layout_marginLeft="4dp"
+ android:layout_marginStart="4dp"
android:textAlignment="viewStart"
android:ellipsize="start"
android:singleLine="true"
diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
index ae2c404..763b6e785 100644
--- a/chrome/android/java/res/menu/main_menu.xml
+++ b/chrome/android/java/res/menu/main_menu.xml
@@ -124,7 +124,7 @@
<item android:id="@id/new_tab_menu_id"
android:title="@string/menu_new_tab"
android:icon="@drawable/ic_add_box_rounded_corner" />
- <item android:id="@+id/new_incognito_tab_menu_id"
+ <item android:id="@id/new_incognito_tab_menu_id"
android:title="@string/menu_new_incognito_tab"
android:icon="@drawable/incognito_simple" />
<item android:id="@+id/close_all_tabs_menu_id"
@@ -147,28 +147,28 @@
<item android:id="@id/new_tab_menu_id"
android:title="@string/menu_new_tab"
android:icon="@drawable/ic_add_box_rounded_corner" />
- <item android:id="@+id/new_incognito_tab_menu_id"
+ <item android:id="@id/new_incognito_tab_menu_id"
android:title="@string/menu_new_incognito_tab"
android:icon="@drawable/incognito_simple" />
- <item android:id="@+id/all_bookmarks_menu_id"
+ <item android:id="@id/all_bookmarks_menu_id"
android:title="@string/menu_bookmarks"
android:icon="@drawable/btn_star_filled" />
- <item android:id="@+id/recent_tabs_menu_id"
+ <item android:id="@id/recent_tabs_menu_id"
android:title="@string/menu_recent_tabs"
android:icon="@drawable/devices_black_24dp" />
- <item android:id="@+id/open_history_menu_id"
+ <item android:id="@id/open_history_menu_id"
android:title="@string/menu_history"
android:icon="@drawable/ic_history_googblue_24dp" />
- <item android:id="@+id/downloads_menu_id"
+ <item android:id="@id/downloads_menu_id"
android:title="@string/menu_downloads"
android:icon="@drawable/infobar_download_complete" />
- <item android:id="@+id/close_all_tabs_menu_id"
+ <item android:id="@id/close_all_tabs_menu_id"
android:title="@string/menu_close_all_tabs"
android:icon="@drawable/btn_close_white" />
- <item android:id="@+id/close_all_incognito_tabs_menu_id"
+ <item android:id="@id/close_all_incognito_tabs_menu_id"
android:title="@string/menu_close_all_incognito_tabs"
android:icon="@drawable/btn_close_white" />
- <item android:id="@+id/menu_group_tabs"
+ <item android:id="@id/menu_group_tabs"
android:title="@string/menu_group_tabs"
android:icon="@drawable/ic_widgets" />
<item android:id="@id/preferences_id"
@@ -182,7 +182,7 @@
<item android:id="@id/new_tab_menu_id"
android:title="@string/menu_new_tab"
android:icon="@drawable/ic_add_box_rounded_corner" />
- <item android:id="@+id/new_incognito_tab_menu_id"
+ <item android:id="@id/new_incognito_tab_menu_id"
android:title="@string/menu_new_incognito_tab"
android:icon="@drawable/incognito_simple" />
<item android:id="@id/preferences_id"
diff --git a/chrome/android/java/res/menu/main_menu_regroup.xml b/chrome/android/java/res/menu/main_menu_regroup.xml
index faa3fd2d..73ce5605 100644
--- a/chrome/android/java/res/menu/main_menu_regroup.xml
+++ b/chrome/android/java/res/menu/main_menu_regroup.xml
@@ -76,7 +76,7 @@
<item android:id="@+id/recent_tabs_menu_id"
android:title="@string/menu_recent_tabs"
android:icon="@drawable/devices_black_24dp" />
- <item android:id="@+id/divider_line_id"
+ <item android:id="@id/divider_line_id"
android:title="@null" />
<item android:id="@+id/share_row_menu_id"
android:title="@null">
@@ -114,7 +114,7 @@
<item android:id="@+id/paint_preview_show_id"
android:title="@string/menu_paint_preview_show"
android:icon="@drawable/ic_photo_camera" />
- <item android:id="@+id/divider_line_id"
+ <item android:id="@id/divider_line_id"
android:title="@null" />
<item android:id="@+id/reader_mode_prefs_id"
android:title="@string/menu_reader_mode_prefs"
@@ -141,7 +141,7 @@
<item android:id="@id/new_tab_menu_id"
android:title="@string/menu_new_tab"
android:icon="@drawable/ic_add_box_rounded_corner" />
- <item android:id="@+id/new_incognito_tab_menu_id"
+ <item android:id="@id/new_incognito_tab_menu_id"
android:title="@string/menu_new_incognito_tab"
android:icon="@drawable/incognito_simple" />
<item android:id="@+id/close_all_tabs_menu_id"
@@ -164,32 +164,32 @@
<item android:id="@id/new_tab_menu_id"
android:title="@string/menu_new_tab"
android:icon="@drawable/ic_add_box_rounded_corner" />
- <item android:id="@+id/new_incognito_tab_menu_id"
+ <item android:id="@id/new_incognito_tab_menu_id"
android:title="@string/menu_new_incognito_tab"
android:icon="@drawable/incognito_simple" />
- <item android:id="@+id/divider_line_id"
+ <item android:id="@id/divider_line_id"
android:title="@null" />
- <item android:id="@+id/open_history_menu_id"
+ <item android:id="@id/open_history_menu_id"
android:title="@string/menu_history"
android:icon="@drawable/ic_history_googblue_24dp" />
- <item android:id="@+id/downloads_menu_id"
+ <item android:id="@id/downloads_menu_id"
android:title="@string/menu_downloads"
android:icon="@drawable/infobar_download_complete" />
- <item android:id="@+id/all_bookmarks_menu_id"
+ <item android:id="@id/all_bookmarks_menu_id"
android:title="@string/menu_bookmarks"
android:icon="@drawable/btn_star_filled" />
- <item android:id="@+id/recent_tabs_menu_id"
+ <item android:id="@id/recent_tabs_menu_id"
android:title="@string/menu_recent_tabs"
android:icon="@drawable/devices_black_24dp" />
- <item android:id="@+id/divider_line_id"
+ <item android:id="@id/divider_line_id"
android:title="@null" />
- <item android:id="@+id/close_all_tabs_menu_id"
+ <item android:id="@id/close_all_tabs_menu_id"
android:title="@string/menu_close_all_tabs"
android:icon="@drawable/btn_close_white" />
- <item android:id="@+id/close_all_incognito_tabs_menu_id"
+ <item android:id="@id/close_all_incognito_tabs_menu_id"
android:title="@string/menu_close_all_incognito_tabs"
android:icon="@drawable/btn_close_white" />
- <item android:id="@+id/menu_group_tabs"
+ <item android:id="@id/menu_group_tabs"
android:title="@string/menu_group_tabs"
android:icon="@drawable/ic_widgets" />
<item android:id="@id/preferences_id"
@@ -203,7 +203,7 @@
<item android:id="@id/new_tab_menu_id"
android:title="@string/menu_new_tab"
android:icon="@drawable/ic_add_box_rounded_corner" />
- <item android:id="@+id/new_incognito_tab_menu_id"
+ <item android:id="@id/new_incognito_tab_menu_id"
android:title="@string/menu_new_incognito_tab"
android:icon="@drawable/incognito_simple" />
<item android:id="@id/preferences_id"
diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml
index 382dff50..502191ec0 100644
--- a/chrome/android/java/res/values/dimens.xml
+++ b/chrome/android/java/res/values/dimens.xml
@@ -91,7 +91,6 @@
<!-- Preview tab dimensions -->
<dimen name="preview_tab_favicon_size">24dp</dimen>
- <dimen name="preview_tab_security_icon_size">22dp</dimen>
<!-- Sheet tab toolbar dimensions -->
<dimen name="sheet_tab_toolbar_height">70dp</dimen>
@@ -267,7 +266,6 @@
<dimen name="sei_location_bar_status_extra_padding_width">4dp</dimen>
<dimen name="tablet_toolbar_start_padding">4dp</dimen>
- <dimen name="tablet_toolbar_end_padding">6dp</dimen>
<dimen name="toolbar_optional_button_animation_translation">10dp</dimen>
<!-- Bottom controls dimensions -->
@@ -289,10 +287,7 @@
<dimen name="omnibox_suggestion_semicompact_padding">8dp</dimen>
<dimen name="omnibox_suggestion_compact_padding">6dp</dimen>
<dimen name="omnibox_suggestion_list_padding_bottom">8dp</dimen>
- <dimen name="omnibox_suggestion_first_line_text_size">16sp</dimen>
- <dimen name="omnibox_suggestion_second_line_text_size">14sp</dimen>
<dimen name="omnibox_suggestion_start_offset_without_icon">18dp</dimen>
- <dimen name="omnibox_suggestion_start_offset_with_icon">56dp</dimen>
<dimen name="omnibox_suggestion_36dp_icon_size">36dp</dimen>
<dimen name="omnibox_suggestion_24dp_icon_size">24dp</dimen>
@@ -305,7 +300,6 @@
<dimen name="omnibox_suggestion_icon_area_size">56dp</dimen>
<dimen name="omnibox_suggestion_action_icon_width">48dp</dimen>
- <dimen name="omnibox_suggestion_text_vertical_padding">5dp</dimen>
<dimen name="omnibox_suggestion_refine_view_modern_end_padding">4dp</dimen>
<!-- Adding search engine logo to the omnibox. -->
@@ -401,7 +395,6 @@
<dimen name="explore_sites_dense_title_right_icon_margin_start">4dp</dimen>
<dimen name="explore_sites_dense_title_right_tile_view_width">108dp</dimen>
<dimen name="explore_sites_dense_title_right_tile_view_height">40dp</dimen>
- <dimen name="explore_sites_dense_title_right_title_height">32dp</dimen>
<dimen name="explore_sites_dense_title_right_title_margin_start">40dp</dimen>
<dimen name="explore_sites_dense_title_right_title_margin_top">4dp</dimen>
@@ -472,7 +465,6 @@
<dimen name="pref_autofill_dropdown_bottom_margin">16dp</dimen>
<dimen name="pref_autofill_touch_target_padding">15dp</dimen>
- <dimen name="pref_list_padding_kitkat">16dp</dimen>
<dimen name="pref_spinner_padding_end">8dp</dimen>
<dimen name="pref_languages_add_button_padding">24dp</dimen>
@@ -535,8 +527,6 @@
<dimen name="download_manager_horizontal_margin">16dp</dimen>
<dimen name="download_manager_prefetch_vertical_margin">12dp</dimen>
<dimen name="download_manager_section_title_padding_top">16dp</dimen>
- <dimen name="download_manager_section_title_padding_bottom">0dp</dimen>
- <dimen name="download_manager_section_title_padding_image">8dp</dimen>
<!-- The corner radius is calculated by subtracting the hairline border width from the
background card corner radius. -->
<dimen name="download_manager_thumbnail_corner_radius">7dp</dimen>
@@ -553,7 +543,6 @@
<!-- History Navigation UI Item -->
<dimen name="navigation_bubble_size">44dp</dimen>
- <dimen name="navigation_bubble_radius">22dp</dimen>
<dimen name="navigation_bubble_arrow_size">32dp</dimen>
<dimen name="navigation_bubble_start_padding">2dp</dimen>
<dimen name="navigation_bubble_top_padding">4dp</dimen>
diff --git a/chrome/android/java/res/values/styles.xml b/chrome/android/java/res/values/styles.xml
index 59da8156..2d5ff1a 100644
--- a/chrome/android/java/res/values/styles.xml
+++ b/chrome/android/java/res/values/styles.xml
@@ -364,10 +364,6 @@
parent="TextAppearance.TextLarge.Primary">
<item name="android:textStyle">bold</item>
</style>
- <style name="TextAppearance.PaymentRequestErrorText">
- <item name="android:textColor">@color/default_text_color_error</item>
- <item name="android:textSize">@dimen/text_size_large</item>
- </style>
<!-- Autofill Card -->
<style name="TextAppearance.AutofillCardErrorMessage">
@@ -505,11 +501,6 @@
<item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
- <!-- New Tab Page -->
- <style name="NewTabPageRecyclerView">
- <item name="android:colorEdgeEffect" tools:targetApi="21">@color/modern_grey_300</item>
- </style>
-
<!-- Use style="..." for the following search box style as textColorHint
can not use android:textAppearance="...". textColorHint is defined
in a parent theme therefore can not be overridden by appearance.
@@ -603,12 +594,6 @@
</style>
<!-- Omnibox suggestions -->
- <!-- TODO(mdjones): Use unified styles for omnibox suggestions: crbug.com/915785 -->
- <style name="TextAppearance.OmniboxSuggestionSecondLine">
- <item name="android:textSize">@dimen/omnibox_suggestion_second_line_text_size</item>
- <item name="android:textColor">@color/suggestion_url_dark_modern</item>
- </style>
-
<style name="TextAppearance.OmniboxAnswerDescriptionNegativeSmall">
<item name="android:textSize">@dimen/text_size_small</item>
<item name="android:textColor">@color/answers_description_text_negative</item>
@@ -619,13 +604,6 @@
<item name="android:textColor">@color/answers_description_text_positive</item>
</style>
- <style name="OmniboxSuggestionIconButton">
- <item name="android:background">?attr/selectableItemBackground</item>
- <item name="android:layout_width">@dimen/min_touch_target_size</item>
- <item name="android:layout_height">@dimen/omnibox_suggestion_comfortable_height</item>
- <item name="tint">@color/default_icon_color</item>
- </style>
-
<style name="OmniboxIcon" parent="LocationBarButton">
<item name="android:layout_width">@dimen/location_bar_start_icon_width</item>
<item name="android:layout_height">match_parent</item>
diff --git a/components/browser_ui/contacts_picker/android/java/res/layout/contacts_list_item_view.xml b/components/browser_ui/contacts_picker/android/java/res/layout/contacts_list_item_view.xml
index af91fe7..f537236 100644
--- a/components/browser_ui/contacts_picker/android/java/res/layout/contacts_list_item_view.xml
+++ b/components/browser_ui/contacts_picker/android/java/res/layout/contacts_list_item_view.xml
@@ -4,7 +4,8 @@
found in the LICENSE file. -->
<merge
- xmlns:android="http://schemas.android.com/apk/res/android">
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools">
<org.chromium.ui.widget.ChromeImageView
android:id="@+id/icon_view"
@@ -105,5 +106,6 @@
android:layout_height="32dp"
android:layout_marginEnd="10dp"
android:src="@drawable/btn_star_filled"
- android:visibility="gone" />
+ android:visibility="gone"
+ tools:ignore="ContentDescription"/>
</merge>
diff --git a/components/browser_ui/photo_picker/android/java/res/layout/photo_picker_dialog.xml b/components/browser_ui/photo_picker/android/java/res/layout/photo_picker_dialog.xml
index 4552c9c..4005f019 100644
--- a/components/browser_ui/photo_picker/android/java/res/layout/photo_picker_dialog.xml
+++ b/components/browser_ui/photo_picker/android/java/res/layout/photo_picker_dialog.xml
@@ -6,6 +6,7 @@
<org.chromium.ui.widget.OptimizedFrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/default_bg_color_elev_0" >
@@ -26,7 +27,8 @@
android:layout_centerHorizontal="true"
android:background="@drawable/navigation_bubble_shadow"
app:srcCompat="@drawable/zoom_in"
- android:visibility="gone" />
+ android:visibility="gone"
+ tools:ignore="ContentDescription"/>
<org.chromium.components.browser_ui.photo_picker.PickerVideoPlayer
android:layout_width="match_parent"
@@ -35,4 +37,4 @@
android:background="@android:color/black"
android:clickable="true"
android:visibility="gone" />
-</org.chromium.ui.widget.OptimizedFrameLayout>
\ No newline at end of file
+</org.chromium.ui.widget.OptimizedFrameLayout>
