diff options
| author | Ben Murdoch <benm@google.com> | 2013-08-30 22:07:46 +0100 |
|---|---|---|
| committer | Martin Kosiba <mkosiba@google.com> | 2013-09-04 10:14:56 +0100 |
| commit | 3122b9566b6d55c9d162da50c72bc4b94bdfc44c (patch) | |
| tree | 1df6de27f3d191d59b6db207d78fabfd4a2fff7c /chromium/overlay/frameworks | |
| parent | a66d54c9f62ace5182635c4bf74449fb62f9d464 (diff) | |
| download | android_frameworks_webview-3122b9566b6d55c9d162da50c72bc4b94bdfc44c.tar.gz android_frameworks_webview-3122b9566b6d55c9d162da50c72bc4b94bdfc44c.tar.bz2 android_frameworks_webview-3122b9566b6d55c9d162da50c72bc4b94bdfc44c.zip | |
Wire up stylable attributes.
This is needed so that we resolve the correct styles for drawables based
on the theme currently in use.
Bug: 10110507
Change-Id: I6c24b42e1912ebac91eb8dfd07c22ff1308d3269
Diffstat (limited to 'chromium/overlay/frameworks')
3 files changed, 8 insertions, 1 deletions
diff --git a/chromium/overlay/frameworks/base/core/res/res/values-v17/webviewchromium_styles.xml b/chromium/overlay/frameworks/base/core/res/res/values-v17/webviewchromium_styles.xml index 82e8920..861ce02 100644 --- a/chromium/overlay/frameworks/base/core/res/res/values-v17/webviewchromium_styles.xml +++ b/chromium/overlay/frameworks/base/core/res/res/values-v17/webviewchromium_styles.xml @@ -10,4 +10,9 @@ <style name="webviewchromium_AutofillPopupWindow" parent="@android:style/Widget.ListPopupWindow"> <item name="android:popupBackground">@drawable/webviewchromium_autofill_popup_background</item> </style> -</resources>
\ No newline at end of file + <style name="webviewchromium_ContentActionBar"> + <!-- Intentionally does not define any style items. The items that the + content/ layer defines upstream are resolved via internal private + framework attributes. --> + </style> +</resources> 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 195c9b6..1ef00c6 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 @@ -79,4 +79,5 @@ <add-resource type="string" name="webviewchromium_week_picker_dialog_title" /> <add-resource type="style" name="webviewchromium_AutofillPopupWindow" /> + <add-resource type="style" name="webviewchromium_ContentActionBar" /> </resources> 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 0d56ad9..4a2275b 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 @@ -107,4 +107,5 @@ <java-symbol type="id" name="webviewchromium_year" /> <java-symbol type="style" name="webviewchromium_AutofillPopupWindow" /> + <java-symbol type="style" name="webviewchromium_ContentActionBar" /> </resources> |