From 57362d24c62ed20d35e590b9a3c05e0ff3c2c9f3 Mon Sep 17 00:00:00 2001
From: Marcin Kosiba <mkosiba@google.com>
Date: Fri, 25 Jul 2014 15:55:04 +0100
Subject: Update framework resource references.

This moves us over to use the newly-exposed public framework resource
IDs.
(cherry picked from commit e0ef2965a44761b31eeae5868811262d566a8641)

Change-Id: Ice316b497e6a2c0156aa803e3bdab0c59c11e1df
---
 .../android/webview/chromium/WebViewChromiumFactoryProvider.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
index 8804deb..067ce0b 100644
--- a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
+++ b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
@@ -333,12 +333,12 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
         ResourceRewriter.rewriteRValues(ctx);
 
         AwResource.setResources(ctx.getResources());
-        AwResource.setErrorPageResources(com.android.internal.R.raw.loaderror,
-                com.android.internal.R.raw.nodomain);
+        AwResource.setErrorPageResources(android.R.raw.loaderror,
+                android.R.raw.nodomain);
         AwResource.setDefaultTextEncoding(
-                com.android.internal.R.string.default_text_encoding);
+                android.R.string.config_webSettingsDefaultTextEncoding);
         AwResource.setConfigKeySystemUuidMapping(
-                com.android.internal.R.array.config_keySystemUuidMapping);
+                android.R.array.config_keySystemUuidMapping);
     }
 
     @Override
-- 
cgit v1.2.3