Initial implementation of the useragent switcher
Change-Id: Iaa8262a678902645dbfaa8a53fe7212af7d9d53c
diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java
index 567b35a..8c03e4c 100644
--- a/src/com/android/browser/TitleBarXLarge.java
+++ b/src/com/android/browser/TitleBarXLarge.java
@@ -20,9 +20,12 @@
import android.app.Activity;
import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
+import android.preference.PreferenceManager;
import android.text.TextUtils;
import android.view.View;
import android.view.View.OnClickListener;
@@ -59,6 +62,8 @@
private ImageView mVoiceSearch;
private Drawable mFocusDrawable;
private Drawable mUnfocusDrawable;
+ private boolean mHasFocus = false;
+ private BrowserSettings mSettings;
public TitleBarXLarge(Activity activity, UiController controller,
XLargeUi ui, FrameLayout parent) {
@@ -72,7 +77,10 @@
mUnfocusDrawable = resources.getDrawable(
R.drawable.textfield_default_holo_dark);
mInVoiceMode = false;
+ mSettings = BrowserSettings.getInstance();
initLayout(activity, R.layout.url_bar);
+ PreferenceManager.getDefaultSharedPreferences(activity)
+ .registerOnSharedPreferenceChangeListener(mSharedPrefsListener);
}
@Override
@@ -101,6 +109,7 @@
mGoButton.setOnClickListener(this);
mClearButton.setOnClickListener(this);
mVoiceSearch.setOnClickListener(this);
+ mUrlIcon.setOnClickListener(this);
mUrlInput.setContainer(mUrlContainer);
setFocusState(false);
}
@@ -115,6 +124,7 @@
? R.drawable.ic_forward_holo_dark
: R.drawable.ic_forward_disabled_holo_dark);
}
+ updateUrlIcon();
}
@Override
@@ -177,6 +187,13 @@
clearOrClose();
} else if (mVoiceSearch == v) {
mUiController.startVoiceSearch();
+ } else if (mUrlIcon == v) {
+ WebView web = mUiController.getCurrentWebView();
+ if (mSettings.enableUseragentSwitcher() && web != null) {
+ mSettings.toggleDesktopUseragent(web);
+ web.loadUrl(web.getOriginalUrl());
+ updateUrlIcon();
+ }
} else {
super.onClick(v);
}
@@ -195,9 +212,39 @@
}
}
+ void updateUrlIcon() {
+ if (mHasFocus) {
+ return;
+ }
+ if (!mInVoiceMode && mSettings.enableUseragentSwitcher()) {
+ WebView web = mUiController.getCurrentWebView();
+ if (mSettings.hasDesktopUseragent(web)) {
+ mUrlIcon.setImageResource(R.drawable.ic_ua_desktop);
+ } else {
+ mUrlIcon.setImageResource(R.drawable.ic_ua_android);
+ }
+ } else {
+ mUrlIcon.setImageResource(mInVoiceMode ?
+ R.drawable.ic_search_holo_dark
+ : R.drawable.ic_web_holo_dark);
+ }
+ }
+
+ private OnSharedPreferenceChangeListener mSharedPrefsListener =
+ new OnSharedPreferenceChangeListener() {
+
+ @Override
+ public void onSharedPreferenceChanged(
+ SharedPreferences sharedPreferences, String key) {
+ updateUrlIcon();
+ }
+
+ };
+
@Override
protected void setFocusState(boolean focus) {
super.setFocusState(focus);
+ mHasFocus = focus;
if (focus) {
mSearchButton.setVisibility(View.GONE);
mStar.setVisibility(View.GONE);
@@ -214,9 +261,7 @@
} else {
mSearchButton.setVisibility(View.VISIBLE);
}
- mUrlIcon.setImageResource(mInVoiceMode ?
- R.drawable.ic_search_holo_dark
- : R.drawable.ic_web_holo_dark);
+ updateUrlIcon();
}
}