Commit 8b0eaa0c authored by Natalie Chouinard's avatar Natalie Chouinard Committed by Commit Bot

Extract ExpandablePreferenceGroup to Settings module

Extract ExpandablePreferenceGroup to Settings build target, along with
owned resources.

Move shared resources (expand more/less icon and transitions) to
ui/android.

Bug: 1035928
Change-Id: I54173013d78f731aceb5ae90a7b85d07c176d94f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1992517
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Reviewed-by: default avatarDavid Trainor <dtrainor@chromium.org>
Reviewed-by: default avatarPeter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#731692}
parent 98239d31
...@@ -390,10 +390,11 @@ Still reading? ...@@ -390,10 +390,11 @@ Still reading?
<ignore regexp="android_webview/test/shell/res/raw/resource_file.html"/> <ignore regexp="android_webview/test/shell/res/raw/resource_file.html"/>
<ignore regexp="android_webview/test/shell/res/raw/resource_icon.png"/> <ignore regexp="android_webview/test/shell/res/raw/resource_icon.png"/>
<ignore regexp="android_webview/tools/automated_ui_tests/java/res/layout/"/> <ignore regexp="android_webview/tools/automated_ui_tests/java/res/layout/"/>
<!-- TODO(https://crbug.com/1017190): Remove suppressions once we lint entire app rather than <!-- TODO(crbug.com/1017190): Remove the following 3 suppressions once we lint entire app rather
each individual target --> than each individual target -->
<ignore regexp="components/browser_ui/strings/android/browser_ui_strings_grd"/> <ignore regexp="components/browser_ui/strings/android/browser_ui_strings_grd"/>
<ignore regexp="chrome/browser/ui/android/strings/ui_strings_grd"/> <ignore regexp="chrome/browser/ui/android/strings/ui_strings_grd"/>
<ignore regexp="The resource `R.drawable.*_expand_.*` appears to be unused"/>
<!-- 1 resource used by android tv to generate resources.zip file --> <!-- 1 resource used by android tv to generate resources.zip file -->
<ignore regexp="chromecast/internal/shell/browser/android/java/res/drawable-hdpi/ic_settings_cast.png"/> <ignore regexp="chromecast/internal/shell/browser/android/java/res/drawable-hdpi/ic_settings_cast.png"/>
<!-- 1 string used by Android's policies system, pulled from app directly --> <!-- 1 string used by Android's policies system, pulled from app directly -->
......
...@@ -1369,7 +1369,6 @@ chrome_java_sources = [ ...@@ -1369,7 +1369,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java", "java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java",
"java/src/org/chromium/chrome/browser/services/gcm/GcmUma.java", "java/src/org/chromium/chrome/browser/services/gcm/GcmUma.java",
"java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java", "java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java",
"java/src/org/chromium/chrome/browser/settings/ExpandablePreferenceGroup.java",
"java/src/org/chromium/chrome/browser/settings/HyperlinkPreference.java", "java/src/org/chromium/chrome/browser/settings/HyperlinkPreference.java",
"java/src/org/chromium/chrome/browser/settings/LearnMorePreference.java", "java/src/org/chromium/chrome/browser/settings/LearnMorePreference.java",
"java/src/org/chromium/chrome/browser/settings/LocationSettings.java", "java/src/org/chromium/chrome/browser/settings/LocationSettings.java",
......
...@@ -15,6 +15,7 @@ android_library("java") { ...@@ -15,6 +15,7 @@ android_library("java") {
"android/widget/java/src/org/chromium/chrome/browser/settings/ChromeBasePreference.java", "android/widget/java/src/org/chromium/chrome/browser/settings/ChromeBasePreference.java",
"android/widget/java/src/org/chromium/chrome/browser/settings/ChromeImageViewPreference.java", "android/widget/java/src/org/chromium/chrome/browser/settings/ChromeImageViewPreference.java",
"android/widget/java/src/org/chromium/chrome/browser/settings/ChromeSwitchPreference.java", "android/widget/java/src/org/chromium/chrome/browser/settings/ChromeSwitchPreference.java",
"android/widget/java/src/org/chromium/chrome/browser/settings/ExpandablePreferenceGroup.java",
"android/widget/java/src/org/chromium/chrome/browser/settings/SpinnerPreference.java", "android/widget/java/src/org/chromium/chrome/browser/settings/SpinnerPreference.java",
"android/widget/java/src/org/chromium/chrome/browser/settings/TextMessagePreference.java", "android/widget/java/src/org/chromium/chrome/browser/settings/TextMessagePreference.java",
] ]
...@@ -27,7 +28,8 @@ android_library("java") { ...@@ -27,7 +28,8 @@ android_library("java") {
"//third_party/android_deps:androidx_annotation_annotation_java", "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:com_android_support_preference_v7_java", "//third_party/android_deps:com_android_support_preference_v7_java",
# TODO(crbug.com/1017190): Remove these 2 deps once we stop linting individual targets. # TODO(crbug.com/1017190): Remove the following deps once we stop linting individual targets.
"//components/browser_ui/styles/android:java_resources",
"//third_party/android_deps:com_android_support_design_java", "//third_party/android_deps:com_android_support_design_java",
"//ui/android:ui_java", "//ui/android:ui_java",
] ]
...@@ -36,7 +38,9 @@ android_library("java") { ...@@ -36,7 +38,9 @@ android_library("java") {
android_resources("java_resources") { android_resources("java_resources") {
deps = [ deps = [
"//chrome/browser/ui/android/strings:ui_strings_grd", "//chrome/browser/ui/android/strings:ui_strings_grd",
"//components/browser_ui/styles/android:java_resources",
"//third_party/android_deps:com_android_support_design_java", "//third_party/android_deps:com_android_support_design_java",
"//third_party/android_deps:com_android_support_preference_v7_java",
"//ui/android:ui_java_resources", "//ui/android:ui_java_resources",
] ]
resource_dirs = [ "android/java/res" ] resource_dirs = [ "android/java/res" ]
......
...@@ -13,7 +13,6 @@ import android.support.v7.preference.PreferenceViewHolder; ...@@ -13,7 +13,6 @@ import android.support.v7.preference.PreferenceViewHolder;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.View; import android.view.View;
import org.chromium.chrome.R;
import org.chromium.ui.drawable.StateListDrawableBuilder; import org.chromium.ui.drawable.StateListDrawableBuilder;
import org.chromium.ui.widget.CheckableImageView; import org.chromium.ui.widget.CheckableImageView;
...@@ -66,9 +65,10 @@ public class ExpandablePreferenceGroup extends PreferenceGroup { ...@@ -66,9 +65,10 @@ public class ExpandablePreferenceGroup extends PreferenceGroup {
// For accessibility, read out the whole title and whether the group is collapsed/expanded. // For accessibility, read out the whole title and whether the group is collapsed/expanded.
View view = holder.itemView; View view = holder.itemView;
String description = getTitle() + getContext().getResources().getString(mExpanded String description = getTitle()
? R.string.accessibility_expanded_group + getContext().getResources().getString(mExpanded
: R.string.accessibility_collapsed_group); ? R.string.accessibility_expanded_group
: R.string.accessibility_collapsed_group);
view.setContentDescription(description); view.setContentDescription(description);
} }
......
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