New useragent switcher design
Uses a popup menu off of the globe on tablets or favicon on phones
Change-Id: Ia3634b5a218456127abb8b266a6cfc664836b037
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 46d47b0..101effa 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -16,11 +16,6 @@
package com.android.browser;
-import com.android.browser.homepages.HomeProvider;
-import com.android.browser.provider.BrowserProvider;
-import com.android.browser.search.SearchEngine;
-import com.android.browser.search.SearchEngines;
-
import android.app.ActivityManager;
import android.content.ContentResolver;
import android.content.Context;
@@ -43,6 +38,11 @@
import android.webkit.WebView;
import android.webkit.WebViewDatabase;
+import com.android.browser.homepages.HomeProvider;
+import com.android.browser.provider.BrowserProvider;
+import com.android.browser.search.SearchEngine;
+import com.android.browser.search.SearchEngines;
+
import java.lang.ref.WeakReference;
import java.util.Iterator;
import java.util.LinkedList;
@@ -165,7 +165,7 @@
settings.setAutoFillProfile(getAutoFillProfile());
String ua = mCustomUserAgents.get(settings);
- if (enableUseragentSwitcher() && ua != null) {
+ if (ua != null) {
settings.setUserAgentString(ua);
} else {
settings.setUserAgentString(USER_AGENTS[getUserAgent()]);
@@ -606,10 +606,6 @@
return mPrefs.getBoolean(PREF_FULLSCREEN, false);
}
- public boolean enableUseragentSwitcher() {
- return mPrefs.getBoolean(PREF_ENABLE_USERAGENT_SWITCHER, false);
- }
-
// -----------------------------
// getter/setters for privacy_security_preferences.xml
// -----------------------------