commit a8b54b4182362e5f373bab7592adcec7d263f0f0
author Bijan Amirzada <bijana@codeaurora.org> Mon Apr 07 09:55:44 2014 -0700
committer WebTech Code Review <code-review@localhost> Mon Apr 07 18:06:56 2014 -0700
tree 5d20c5cb260f5535664d39586499febf5bad8a4e
parent 22bd57baa9c3aa9437032438512eb996e156beb3

Accessibility Settings Preview Fix

Modified the preview view in the Accessibility settings
to use the system webview since SWE did not support the preview
in its current state.

Change-Id: Id5027ad6865f32d725cbcc1973c9d9a634d3faf1

res/layout/webview_preview.xml

diff --git a/res/layout/webview_preview.xml b/res/layout/webview_preview.xml
index f0acf45..2137e9b 100644
--- a/res/layout/webview_preview.xml
+++ b/res/layout/webview_preview.xml
@@ -72,7 +72,7 @@
             android:gravity="center"
             android:orientation="vertical" />
 
-        <org.codeaurora.swe.WebView
+        <android.webkit.WebView
             android:id="@+id/webview"
             android:layout_width="match_parent"
             android:layout_height="180dp"

src/com/android/browser/preferences/AccessibilityPreferencesFragment.java

diff --git a/src/com/android/browser/preferences/AccessibilityPreferencesFragment.java b/src/com/android/browser/preferences/AccessibilityPreferencesFragment.java
index 529e388..7dd20ae 100644
--- a/src/com/android/browser/preferences/AccessibilityPreferencesFragment.java
+++ b/src/com/android/browser/preferences/AccessibilityPreferencesFragment.java
@@ -25,7 +25,7 @@
 import com.android.browser.PreferenceKeys;
 import com.android.browser.R;
 
-import org.codeaurora.swe.WebView;
+import android.webkit.WebView;
 import java.text.NumberFormat;
 
 public class AccessibilityPreferencesFragment extends PreferenceFragment

src/com/android/browser/preferences/FontSizePreview.java

diff --git a/src/com/android/browser/preferences/FontSizePreview.java b/src/com/android/browser/preferences/FontSizePreview.java
index e9d69d5..8825f3d 100644
--- a/src/com/android/browser/preferences/FontSizePreview.java
+++ b/src/com/android/browser/preferences/FontSizePreview.java
@@ -20,8 +20,8 @@
 import android.content.res.Resources;
 import android.util.AttributeSet;
 import android.view.View;
-import org.codeaurora.swe.WebSettings;
-import org.codeaurora.swe.WebView;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
 
 import com.android.browser.BrowserSettings;
 import com.android.browser.R;

src/com/android/browser/preferences/InvertedContrastPreview.java

diff --git a/src/com/android/browser/preferences/InvertedContrastPreview.java b/src/com/android/browser/preferences/InvertedContrastPreview.java
index 8064c30..690a529 100644
--- a/src/com/android/browser/preferences/InvertedContrastPreview.java
+++ b/src/com/android/browser/preferences/InvertedContrastPreview.java
@@ -78,6 +78,11 @@
     protected void updatePreview(boolean forceReload) {
         if (mWebView == null) return;
 
+    /* SWE: This class extends WebViewPreview, however, WebViewPreview has
+    * been modified to use the system webview.  Commenting out code for now
+    * which implements the preview as this class  requires refactoring
+    * regardless & is currently not in use.
+
         WebSettings ws = mWebView.getSettings();
         BrowserSettings bs = BrowserSettings.getInstance();
         ws.setProperty(WebViewProperties.gfxInvertedScreen,
@@ -87,6 +92,8 @@
         if (forceReload) {
             mWebView.loadData(mHtml, "text/html", null);
         }
+
+    */
     }
 
 }

src/com/android/browser/preferences/WebViewPreview.java

diff --git a/src/com/android/browser/preferences/WebViewPreview.java b/src/com/android/browser/preferences/WebViewPreview.java
index ce24ac3..1f938f0 100644
--- a/src/com/android/browser/preferences/WebViewPreview.java
+++ b/src/com/android/browser/preferences/WebViewPreview.java
@@ -24,7 +24,7 @@
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
-import org.codeaurora.swe.WebView;
+import android.webkit.WebView;
 
 import com.android.browser.R;