Pie controls: A new way of activation

Based on "Pie controls: Introducing a pie delivery service" this
commit binds the pie controls to the newly created pie service.

Patch Set #2:
* Fixed glitch when displaying the search panel at the lock
  screen.

Patch Set #5:
* Switch Position to com.android.internal.util.pie.Position
* Removed legacy and unused code

Patch Set #6:
* Fixed lock screen glitch, finally!

Patch Set #7:
* Rebase

Patch Set #9:
* Moved almost all of the pie logic to PieController

Patch Set #10:
* Remove window completely from WindowManager when not shown

Patch Set #13:
* Fixed Taichi's bug
* Removed observers in PieView

Patch Set #14 & #15:
* Rebase

Change-Id: I352f198068807694d95699618597d0927da3f324

2 files changed, 18 insertions, 17 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index b3c1f07..befa422 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -88,6 +88,7 @@ import android.widget.TextView;
 
 import com.android.internal.statusbar.StatusBarIcon;
 import com.android.internal.statusbar.StatusBarNotification;
+import com.android.internal.util.pie.PiePosition;
 import com.android.systemui.R;
 import com.android.systemui.statusbar.BaseStatusBar;
 import com.android.systemui.statusbar.CommandQueue;
@@ -106,7 +107,6 @@ import com.android.systemui.statusbar.policy.NetworkController;
 import com.android.systemui.statusbar.policy.NotificationRowLayout;
 import com.android.systemui.statusbar.policy.OnSizeChangedListener;
 import com.android.systemui.statusbar.policy.Prefs;
-import com.android.systemui.statusbar.policy.PieController.Position;
 import com.android.systemui.statusbar.powerwidget.PowerWidget;
 
 public class PhoneStatusBar extends BaseStatusBar {
@@ -1598,7 +1598,7 @@ public class PhoneStatusBar extends BaseStatusBar {
         }
         // don't allow expanding via e.g. service call while status bar is hidden
         // due to expanded desktop
-        if (mExpandedDesktopState == 2) {
+        if (getExpandedDesktopMode() == 2) {
             return;
         }
 
@@ -1670,7 +1670,7 @@ public class PhoneStatusBar extends BaseStatusBar {
         }
         // don't allow expanding via e.g. service call while status bar is hidden
         // due to expanded desktop
-        if (mExpandedDesktopState == 2) {
+        if (getExpandedDesktopMode() == 2) {
             return;
         }
 
@@ -2238,13 +2238,13 @@ public class PhoneStatusBar extends BaseStatusBar {
         // hide pie triggers when keyguard is visible
         try {
             if (mWindowManagerService.isKeyguardLocked()) {
-                updatePieTriggerMask(Position.BOTTOM.FLAG
-                        | Position.TOP.FLAG);
+                updatePieTriggerMask(PiePosition.BOTTOM.FLAG
+                        | PiePosition.TOP.FLAG);
             } else {
-                updatePieTriggerMask(Position.LEFT.FLAG
-                        | Position.BOTTOM.FLAG
-                        | Position.RIGHT.FLAG
-                        | Position.TOP.FLAG);
+                updatePieTriggerMask(PiePosition.LEFT.FLAG
+                        | PiePosition.BOTTOM.FLAG
+                        | PiePosition.RIGHT.FLAG
+                        | PiePosition.TOP.FLAG);
             }
         } catch (RemoteException e) {
             // nothing else to do ...
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
index 1e94e97..f5fff53 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
@@ -26,8 +26,9 @@ import android.util.Slog;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
+
+import com.android.internal.util.pie.PiePosition;
 import com.android.systemui.R;
-import com.android.systemui.statusbar.policy.PieController.Position;
 
 public class PhoneStatusBarView extends PanelBar {
     private static final String TAG = "PhoneStatusBarView";
@@ -167,10 +168,10 @@ public class PhoneStatusBarView extends PanelBar {
         mLastFullyOpenedPanel = null;
 
         // show up you pie controls
-        mBar.updatePieTriggerMask(Position.LEFT.FLAG
-                | Position.TOP.FLAG
-                | Position.RIGHT.FLAG
-                | Position.TOP.FLAG);
+        mBar.updatePieTriggerMask(PiePosition.LEFT.FLAG
+                | PiePosition.TOP.FLAG
+                | PiePosition.RIGHT.FLAG
+                | PiePosition.TOP.FLAG);
     }
 
     @Override
@@ -182,9 +183,9 @@ public class PhoneStatusBarView extends PanelBar {
 
         // back off you pie controls!
         if (mShouldFade) {
-            mBar.updatePieTriggerMask(Position.LEFT.FLAG
-                    | Position.RIGHT.FLAG
-                    | Position.TOP.FLAG);
+            mBar.updatePieTriggerMask(PiePosition.LEFT.FLAG
+                    | PiePosition.RIGHT.FLAG
+                    | PiePosition.TOP.FLAG);
         }
 
         mFadingPanel = openPanel;