diff --git a/components/OWNERS b/components/OWNERS index de8e8fa6b70b8d..825c24bd45741b 100644 --- a/components/OWNERS +++ b/components/OWNERS @@ -25,6 +25,7 @@ per-file supervised_user_error_page_strings.grdp=file://components/supervised_us per-file sync_ui_strings.grdp=file://components/sync/OWNERS per-file translate_strings.grdp=file://components/translate/OWNERS per-file undo_strings.grdp=file://components/undo/OWNERS +per-file web_contents_delegate_android_strings.grdp=file://components/web_contents_delegate_android/OWNERS per-file *.isolate=maruel@chromium.org per-file *.isolate=tandrii@chromium.org per-file *.isolate=vadimsh@chromium.org diff --git a/components/components_strings.grd b/components/components_strings.grd index 95920283b2c618..8c9103eaaa9daa 100644 --- a/components/components_strings.grd +++ b/components/components_strings.grd @@ -212,6 +212,7 @@ + diff --git a/components/web_contents_delegate_android/BUILD.gn b/components/web_contents_delegate_android/BUILD.gn index 6b2dc26ebd4a63..d215023c7a89e6 100644 --- a/components/web_contents_delegate_android/BUILD.gn +++ b/components/web_contents_delegate_android/BUILD.gn @@ -33,6 +33,9 @@ static_library("web_contents_delegate_android") { android_resources("web_contents_delegate_android_java_resources") { custom_package = "org.chromium.components.web_contents_delegate_android" resource_dirs = [ "android/java/res" ] + deps = [ + "//components/strings:components_strings_grd", + ] } android_library("web_contents_delegate_android_java") { @@ -44,8 +47,16 @@ android_library("web_contents_delegate_android_java") { ] java_files = [ "android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java", + "android/java/src/org/chromium/components/web_contents_delegate_android/ColorPickerAdvanced.java", + "android/java/src/org/chromium/components/web_contents_delegate_android/ColorPickerAdvancedComponent.java", + "android/java/src/org/chromium/components/web_contents_delegate_android/ColorPickerDialog.java", + "android/java/src/org/chromium/components/web_contents_delegate_android/ColorPickerMoreButton.java", + "android/java/src/org/chromium/components/web_contents_delegate_android/ColorPickerSimple.java", + "android/java/src/org/chromium/components/web_contents_delegate_android/ColorSuggestion.java", + "android/java/src/org/chromium/components/web_contents_delegate_android/ColorSuggestionListAdapter.java", "android/java/src/org/chromium/components/web_contents_delegate_android/ValidationMessageBubble.java", "android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java", + "android/java/src/org/chromium/components/web_contents_delegate_android/OnColorChangedListener.java", ] } diff --git a/ui/android/java/res/drawable-hdpi/color_picker_advanced_select_handle.png b/components/web_contents_delegate_android/android/java/res/drawable-hdpi/color_picker_advanced_select_handle.png similarity index 100% rename from ui/android/java/res/drawable-hdpi/color_picker_advanced_select_handle.png rename to components/web_contents_delegate_android/android/java/res/drawable-hdpi/color_picker_advanced_select_handle.png diff --git a/ui/android/java/res/drawable-mdpi/color_picker_advanced_select_handle.png b/components/web_contents_delegate_android/android/java/res/drawable-mdpi/color_picker_advanced_select_handle.png similarity index 100% rename from ui/android/java/res/drawable-mdpi/color_picker_advanced_select_handle.png rename to components/web_contents_delegate_android/android/java/res/drawable-mdpi/color_picker_advanced_select_handle.png diff --git a/ui/android/java/res/drawable-xhdpi/color_picker_advanced_select_handle.png b/components/web_contents_delegate_android/android/java/res/drawable-xhdpi/color_picker_advanced_select_handle.png similarity index 100% rename from ui/android/java/res/drawable-xhdpi/color_picker_advanced_select_handle.png rename to components/web_contents_delegate_android/android/java/res/drawable-xhdpi/color_picker_advanced_select_handle.png diff --git a/ui/android/java/res/drawable/color_button_background.xml b/components/web_contents_delegate_android/android/java/res/drawable/color_button_background.xml similarity index 100% rename from ui/android/java/res/drawable/color_button_background.xml rename to components/web_contents_delegate_android/android/java/res/drawable/color_button_background.xml diff --git a/ui/android/java/res/drawable/color_picker_border.xml b/components/web_contents_delegate_android/android/java/res/drawable/color_picker_border.xml similarity index 100% rename from ui/android/java/res/drawable/color_picker_border.xml rename to components/web_contents_delegate_android/android/java/res/drawable/color_picker_border.xml diff --git a/ui/android/java/res/layout/color_picker_advanced_component.xml b/components/web_contents_delegate_android/android/java/res/layout/color_picker_advanced_component.xml similarity index 100% rename from ui/android/java/res/layout/color_picker_advanced_component.xml rename to components/web_contents_delegate_android/android/java/res/layout/color_picker_advanced_component.xml diff --git a/ui/android/java/res/layout/color_picker_dialog_content.xml b/components/web_contents_delegate_android/android/java/res/layout/color_picker_dialog_content.xml similarity index 87% rename from ui/android/java/res/layout/color_picker_dialog_content.xml rename to components/web_contents_delegate_android/android/java/res/layout/color_picker_dialog_content.xml index 38a492d0b283e6..552b27c66f315b 100644 --- a/ui/android/java/res/layout/color_picker_dialog_content.xml +++ b/components/web_contents_delegate_android/android/java/res/layout/color_picker_dialog_content.xml @@ -15,13 +15,13 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - - + + + #B0B0B0 + #FFFFFF + diff --git a/components/web_contents_delegate_android/android/java/res/values/dimens.xml b/components/web_contents_delegate_android/android/java/res/values/dimens.xml new file mode 100644 index 00000000000000..92c60b102452f4 --- /dev/null +++ b/components/web_contents_delegate_android/android/java/res/values/dimens.xml @@ -0,0 +1,15 @@ + + + + + + 14.5dp + 60dp + diff --git a/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java index 25f5f62fd18960..e6bef2ae327fdf 100644 --- a/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java +++ b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java @@ -9,9 +9,6 @@ import org.chromium.base.annotations.CalledByNative; import org.chromium.base.annotations.JNINamespace; import org.chromium.content.browser.ContentViewCore; -import org.chromium.ui.ColorPickerDialog; -import org.chromium.ui.ColorSuggestion; -import org.chromium.ui.OnColorChangedListener; import org.chromium.ui.base.WindowAndroid; /** diff --git a/ui/android/java/src/org/chromium/ui/ColorPickerAdvanced.java b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorPickerAdvanced.java similarity index 99% rename from ui/android/java/src/org/chromium/ui/ColorPickerAdvanced.java rename to components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorPickerAdvanced.java index 29b4e1fd466606..72eea0c171e85b 100644 --- a/ui/android/java/src/org/chromium/ui/ColorPickerAdvanced.java +++ b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorPickerAdvanced.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package org.chromium.ui; +package org.chromium.components.web_contents_delegate_android; import android.content.Context; import android.graphics.Color; diff --git a/ui/android/java/src/org/chromium/ui/ColorPickerAdvancedComponent.java b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorPickerAdvancedComponent.java similarity index 98% rename from ui/android/java/src/org/chromium/ui/ColorPickerAdvancedComponent.java rename to components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorPickerAdvancedComponent.java index 75fd709305c7df..7cbf0e20d2ec23 100644 --- a/ui/android/java/src/org/chromium/ui/ColorPickerAdvancedComponent.java +++ b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorPickerAdvancedComponent.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package org.chromium.ui; +package org.chromium.components.web_contents_delegate_android; import android.content.Context; import android.graphics.drawable.GradientDrawable; diff --git a/ui/android/java/src/org/chromium/ui/ColorPickerDialog.java b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorPickerDialog.java similarity index 98% rename from ui/android/java/src/org/chromium/ui/ColorPickerDialog.java rename to components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorPickerDialog.java index f6d3ace5cb4649..40600a12a60ef1 100644 --- a/ui/android/java/src/org/chromium/ui/ColorPickerDialog.java +++ b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorPickerDialog.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package org.chromium.ui; +package org.chromium.components.web_contents_delegate_android; import android.app.AlertDialog; import android.app.Dialog; diff --git a/ui/android/java/src/org/chromium/ui/ColorPickerMoreButton.java b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorPickerMoreButton.java similarity index 96% rename from ui/android/java/src/org/chromium/ui/ColorPickerMoreButton.java rename to components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorPickerMoreButton.java index 849c4d8182b334..9014392c568ca8 100644 --- a/ui/android/java/src/org/chromium/ui/ColorPickerMoreButton.java +++ b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorPickerMoreButton.java @@ -2,7 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package org.chromium.ui; +package org.chromium.components.web_contents_delegate_android; + import android.content.Context; import android.graphics.Canvas; import android.graphics.Color; diff --git a/ui/android/java/src/org/chromium/ui/ColorPickerSimple.java b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorPickerSimple.java similarity index 93% rename from ui/android/java/src/org/chromium/ui/ColorPickerSimple.java rename to components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorPickerSimple.java index 69b880ea33b199..d14f1c666ddd50 100644 --- a/ui/android/java/src/org/chromium/ui/ColorPickerSimple.java +++ b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorPickerSimple.java @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package org.chromium.ui; +package org.chromium.components.web_contents_delegate_android; import android.content.Context; import android.graphics.Color; import android.util.AttributeSet; import android.widget.ListView; -import org.chromium.ui.ColorSuggestionListAdapter.OnColorSuggestionClickListener; +import org.chromium.components.web_contents_delegate_android.ColorSuggestionListAdapter.OnColorSuggestionClickListener; /** * Draws a grid of (predefined) colors and allows the user to choose one of diff --git a/ui/android/java/src/org/chromium/ui/ColorSuggestion.java b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorSuggestion.java similarity index 91% rename from ui/android/java/src/org/chromium/ui/ColorSuggestion.java rename to components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorSuggestion.java index 4e964a767d247c..c1ac7145165576 100644 --- a/ui/android/java/src/org/chromium/ui/ColorSuggestion.java +++ b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorSuggestion.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package org.chromium.ui; +package org.chromium.components.web_contents_delegate_android; /** * Color suggestion container used to store information for each color button that will be shown in diff --git a/ui/android/java/src/org/chromium/ui/ColorSuggestionListAdapter.java b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorSuggestionListAdapter.java similarity index 98% rename from ui/android/java/src/org/chromium/ui/ColorSuggestionListAdapter.java rename to components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorSuggestionListAdapter.java index 973898ffa3dedc..d7e4541da033cb 100644 --- a/ui/android/java/src/org/chromium/ui/ColorSuggestionListAdapter.java +++ b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorSuggestionListAdapter.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package org.chromium.ui; +package org.chromium.components.web_contents_delegate_android; import android.content.Context; import android.graphics.Color; diff --git a/ui/android/java/src/org/chromium/ui/OnColorChangedListener.java b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/OnColorChangedListener.java similarity index 86% rename from ui/android/java/src/org/chromium/ui/OnColorChangedListener.java rename to components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/OnColorChangedListener.java index c4847fa7f866ba..3e96f9d44e6450 100644 --- a/ui/android/java/src/org/chromium/ui/OnColorChangedListener.java +++ b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/OnColorChangedListener.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package org.chromium.ui; +package org.chromium.components.web_contents_delegate_android; /** * The callback used to indicate the user changed the color. diff --git a/components/web_contents_delegate_android_strings.grdp b/components/web_contents_delegate_android_strings.grdp new file mode 100644 index 00000000000000..fcac7d1afc21a4 --- /dev/null +++ b/components/web_contents_delegate_android_strings.grdp @@ -0,0 +1,51 @@ + + + + + + More + + + Hue + + + Saturation + + + Value + + + Set + + + Cancel + + + Select color + + + Red + + + Cyan + + + Blue + + + Green + + + Magenta + + + Yellow + + + Black + + + White + + + \ No newline at end of file diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn index ab705ebdd8a14e..4a5187f12e6d5d 100644 --- a/ui/android/BUILD.gn +++ b/ui/android/BUILD.gn @@ -138,18 +138,10 @@ android_resources("ui_java_resources") { android_library("ui_java") { java_files = [ - "java/src/org/chromium/ui/ColorPickerAdvanced.java", - "java/src/org/chromium/ui/ColorPickerAdvancedComponent.java", - "java/src/org/chromium/ui/ColorPickerDialog.java", - "java/src/org/chromium/ui/ColorPickerMoreButton.java", - "java/src/org/chromium/ui/ColorPickerSimple.java", - "java/src/org/chromium/ui/ColorSuggestion.java", - "java/src/org/chromium/ui/ColorSuggestionListAdapter.java", "java/src/org/chromium/ui/DropdownAdapter.java", "java/src/org/chromium/ui/DropdownDividerDrawable.java", "java/src/org/chromium/ui/DropdownItem.java", "java/src/org/chromium/ui/DropdownPopupWindow.java", - "java/src/org/chromium/ui/OnColorChangedListener.java", "java/src/org/chromium/ui/UiUtils.java", "java/src/org/chromium/ui/VSyncMonitor.java", "java/src/org/chromium/ui/base/ActivityWindowAndroid.java", diff --git a/ui/android/java/res/values/colors.xml b/ui/android/java/res/values/colors.xml index 8eaed12f7569ae..5dbe201164da0d 100644 --- a/ui/android/java/res/values/colors.xml +++ b/ui/android/java/res/values/colors.xml @@ -5,8 +5,6 @@ found in the LICENSE file. --> - #B0B0B0 - #FFFFFF #E5E5E5 #C0C0C0 diff --git a/ui/android/java/res/values/dimens.xml b/ui/android/java/res/values/dimens.xml index 81fc0fcb103434..ae3969e6458a15 100644 --- a/ui/android/java/res/values/dimens.xml +++ b/ui/android/java/res/values/dimens.xml @@ -5,13 +5,6 @@ found in the LICENSE file. --> - - - 14.5dp - 60dp 50dp 1px diff --git a/ui/android/java/strings/android_ui_strings.grd b/ui/android/java/strings/android_ui_strings.grd index f05810f807c9c2..cbe649e16114c9 100644 --- a/ui/android/java/strings/android_ui_strings.grd +++ b/ui/android/java/strings/android_ui_strings.grd @@ -101,53 +101,6 @@ Failed to open selected file - - - More - - - Hue - - - Saturation - - - Value - - - Set - - - Cancel - - - Select color - - - Red - - - Cyan - - - Blue - - - Green - - - Magenta - - - Yellow - - - Black - - - White - - Failed to copy to the clipboard