Fix QuickControls

    Bug: 5115647
    Removed back from QC options
    Added menu to QC options
    Removed background on phone
    Changed colors to match ICS scheme

Change-Id: I32c8cc0c4714e50e9eca28e6aa069be8d0fe9da8

1 files changed, 18 insertions, 10 deletions

diff --git a/src/com/android/browser/view/PieMenu.java b/src/com/android/browser/view/PieMenu.java
index 99750f9c..536ac92f 100644
--- a/src/com/android/browser/view/PieMenu.java
+++ b/src/com/android/browser/view/PieMenu.java
@@ -89,6 +89,8 @@ public class PieMenu extends FrameLayout {
     // touch handling
     PieItem mCurrentItem;
 
+    private boolean mUseBackground;
+
     /**
      * @param context
      * @param attrs
@@ -142,6 +144,10 @@ public class PieMenu extends FrameLayout {
         mController = ctl;
     }
 
+    public void setUseBackground(boolean useBackground) {
+        mUseBackground = useBackground;
+    }
+
     public void addItem(PieItem item) {
         // add the item to the pie itself
         mItems.add(item);
@@ -245,18 +251,20 @@ public class PieMenu extends FrameLayout {
     @Override
     protected void onDraw(Canvas canvas) {
         if (mOpen) {
-            int w = mBackground.getIntrinsicWidth();
-            int h = mBackground.getIntrinsicHeight();
-            int left = mCenter.x - w;
-            int top = mCenter.y - h / 2;
-            mBackground.setBounds(left, top, left + w, top + h);
             int state;
-            state = canvas.save();
-            if (onTheLeft()) {
-                canvas.scale(-1, 1);
+            if (mUseBackground) {
+                int w = mBackground.getIntrinsicWidth();
+                int h = mBackground.getIntrinsicHeight();
+                int left = mCenter.x - w;
+                int top = mCenter.y - h / 2;
+                mBackground.setBounds(left, top, left + w, top + h);
+                state = canvas.save();
+                if (onTheLeft()) {
+                    canvas.scale(-1, 1);
+                }
+                mBackground.draw(canvas);
+                canvas.restoreToCount(state);
             }
-            mBackground.draw(canvas);
-            canvas.restoreToCount(state);
             for (PieItem item : mItems) {
                 Paint p = item.isSelected() ? mSelectedPaint : mNormalPaint;
                 state = canvas.save();