diff options
author | Bo Liu <boliu@google.com> | 2014-02-25 17:17:12 -0800 |
---|---|---|
committer | Bo Liu <boliu@google.com> | 2014-02-25 17:18:04 -0800 |
commit | 9c04f4257b47fed1c4bb475308c3e3b305722ba4 (patch) | |
tree | 276771b64d85467aa72513021a1f886a2019bf55 | |
parent | a4f272f5c58b4c0488d735849223d346921f3948 (diff) | |
download | webview-9c04f4257b47fed1c4bb475308c3e3b305722ba4.tar.gz |
Update resources added in Chromium r253153
Added in
https://src.chromium.org/viewvc/chrome?revision=253153&view=revision
Change-Id: Icb2b5461d5c9a711fb256691824f89927c96dd13
4 files changed, 16 insertions, 0 deletions
diff --git a/chromium/java/com/android/webview/chromium/ResourceProvider.java b/chromium/java/com/android/webview/chromium/ResourceProvider.java index 5993978..4174593 100644 --- a/chromium/java/com/android/webview/chromium/ResourceProvider.java +++ b/chromium/java/com/android/webview/chromium/ResourceProvider.java @@ -58,6 +58,10 @@ public class ResourceProvider { com.android.internal.R.dimen.webviewchromium_autofill_text_divider_height; org.chromium.ui.R.dimen.color_button_height = com.android.internal.R.dimen.webviewchromium_color_button_height; + org.chromium.ui.R.dimen.config_min_scaling_span = + com.android.internal.R.dimen.webviewchromium_config_min_scaling_span; + org.chromium.ui.R.dimen.config_min_scaling_touch_major = + com.android.internal.R.dimen.webviewchromium_config_min_scaling_touch_major; // drawable org.chromium.content.R.drawable.ondemand_overlay = diff --git a/chromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml b/chromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml index be88108..202dfb3 100644 --- a/chromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml +++ b/chromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml @@ -30,6 +30,8 @@ <add-resource type="dimen" name="webviewchromium_color_picker_gradient_margin" /> <add-resource type="dimen" name="webviewchromium_autofill_text_height" /> <add-resource type="dimen" name="webviewchromium_autofill_text_divider_height" /> + <add-resource type="dimen" name="webviewchromium_config_min_scaling_span" /> + <add-resource type="dimen" name="webviewchromium_config_min_scaling_touch_major" /> <add-resource type="dimen" name="webviewchromium_link_preview_overlay_radius" /> <add-resource type="drawable" name="webviewchromium_color_advanced_select_handle" /> diff --git a/chromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml b/chromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml index fd6ddb3..6d2ef45 100644 --- a/chromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml +++ b/chromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml @@ -33,6 +33,8 @@ <java-symbol type="dimen" name="webviewchromium_color_picker_gradient_margin" /> <java-symbol type="dimen" name="webviewchromium_autofill_text_height" /> <java-symbol type="dimen" name="webviewchromium_autofill_text_divider_height" /> + <java-symbol type="dimen" name="webviewchromium_config_min_scaling_span" /> + <java-symbol type="dimen" name="webviewchromium_config_min_scaling_touch_major" /> <java-symbol type="dimen" name="webviewchromium_link_preview_overlay_radius" /> <java-symbol type="drawable" name="webviewchromium_color_button_background" /> diff --git a/chromium/overlay/frameworks/base/core/res/res/values/dimens.xml b/chromium/overlay/frameworks/base/core/res/res/values/dimens.xml index faeaba2..d55e2d1 100644 --- a/chromium/overlay/frameworks/base/core/res/res/values/dimens.xml +++ b/chromium/overlay/frameworks/base/core/res/res/values/dimens.xml @@ -17,4 +17,12 @@ <dimen name="webviewchromium_color_picker_gradient_margin">14.5dp</dimen> <dimen name="webviewchromium_autofill_text_height">44dp</dimen> <dimen name="webviewchromium_autofill_text_divider_height">1px</dimen> + + <!-- + Fallback values if the corresponding com.android.internal.R dimensions + cannot be retrieved by name. + Note: Constants taken directly from Android's core/res/values/config.xml. + --> + <dimen name="webviewchromium_config_min_scaling_span">27.0mm</dimen> + <dimen name="webviewchromium_config_min_scaling_touch_major">48.0dp</dimen> </resources> |