diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-03-18 14:35:58 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-03-18 15:11:11 +0000 |
| commit | 5cd1c86917ef15b2f3d26f508793bc294fad8c97 (patch) | |
| tree | 2e08826b1f123ee78b2095c727d96acf42c1e940 /chromium/overlay/frameworks | |
| parent | 30fc9fe24bb40e9300ae622bebffb077413c43ab (diff) | |
| parent | 735a433faa4c304f09f2b27bee1854cbe7e5c740 (diff) | |
| download | android_frameworks_webview-5cd1c86917ef15b2f3d26f508793bc294fad8c97.tar.gz android_frameworks_webview-5cd1c86917ef15b2f3d26f508793bc294fad8c97.tar.bz2 android_frameworks_webview-5cd1c86917ef15b2f3d26f508793bc294fad8c97.zip | |
Merge master-chromium into master at r257591
This commit was generated by merge_to_master.py.
Change-Id: Ic354a983bf6b8add24cca796556aa777c132b192
Diffstat (limited to 'chromium/overlay/frameworks')
3 files changed, 12 insertions, 0 deletions
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> |