summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2012-05-16 12:58:05 -0700
committerMichael Kolb <kolby@google.com>2012-05-16 12:58:05 -0700
commitaf63dbadb04a963f3513bff2f6ec5f34d31c24d6 (patch)
tree4ccb2831892262546060c27df468286126127c0a
parent234eadcf7d0dbf2d24f92c24f40343d518f6fe3a (diff)
downloadandroid_packages_apps_Gello-af63dbadb04a963f3513bff2f6ec5f34d31c24d6.tar.gz
android_packages_apps_Gello-af63dbadb04a963f3513bff2f6ec5f34d31c24d6.tar.bz2
android_packages_apps_Gello-af63dbadb04a963f3513bff2f6ec5f34d31c24d6.zip
Toggle QC request desktop icon
Bug: 6493939 Change-Id: I7787ab37b57fce8ea2332fefd1ace420357000ec
-rw-r--r--res/drawable-hdpi/ic_mobile.pngbin0 -> 631 bytes
-rw-r--r--res/drawable-mdpi/ic_mobile.pngbin0 -> 460 bytes
-rw-r--r--res/drawable-xhdpi/ic_mobile.pngbin0 -> 863 bytes
-rw-r--r--src/com/android/browser/Controller.java3
-rw-r--r--src/com/android/browser/PieControl.java9
-rw-r--r--src/com/android/browser/UiController.java2
6 files changed, 13 insertions, 1 deletions
diff --git a/res/drawable-hdpi/ic_mobile.png b/res/drawable-hdpi/ic_mobile.png
new file mode 100644
index 00000000..cd688c8a
--- /dev/null
+++ b/res/drawable-hdpi/ic_mobile.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_mobile.png b/res/drawable-mdpi/ic_mobile.png
new file mode 100644
index 00000000..6cf42832
--- /dev/null
+++ b/res/drawable-mdpi/ic_mobile.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_mobile.png b/res/drawable-xhdpi/ic_mobile.png
new file mode 100644
index 00000000..a055b074
--- /dev/null
+++ b/res/drawable-xhdpi/ic_mobile.png
Binary files differ
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 2fb465c0..493583d4 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -429,7 +429,8 @@ public class Controller
mUi = ui;
}
- BrowserSettings getSettings() {
+ @Override
+ public BrowserSettings getSettings() {
return mSettings;
}
diff --git a/src/com/android/browser/PieControl.java b/src/com/android/browser/PieControl.java
index 7c4291c8..a33f8c66 100644
--- a/src/com/android/browser/PieControl.java
+++ b/src/com/android/browser/PieControl.java
@@ -118,6 +118,15 @@ public class PieControl implements PieMenu.PieController, OnClickListener {
if (tab != null) {
mForward.setEnabled(tab.canGoForward());
}
+ WebView view = mUiController.getCurrentWebView();
+ if (view != null) {
+ ImageView icon = (ImageView) mRDS.getView();
+ if (mUiController.getSettings().hasDesktopUseragent(view)) {
+ icon.setImageResource(R.drawable.ic_mobile);
+ } else {
+ icon.setImageResource(R.drawable.ic_desktop_holo_dark);
+ }
+ }
return true;
}
diff --git a/src/com/android/browser/UiController.java b/src/com/android/browser/UiController.java
index 5be2343d..b3d4631b 100644
--- a/src/com/android/browser/UiController.java
+++ b/src/com/android/browser/UiController.java
@@ -105,4 +105,6 @@ public interface UiController {
void toggleUserAgent();
+ BrowserSettings getSettings();
+
}