Fix a few derps

Change-Id: Iaa04459581d40b39b4776993fd7e78ace9f6f47f

Author: darkeyes84

core/java/android/provider/Settings.java

@@ -3833,12 +3833,13 @@ public boolean validate(String value) {
          * Network traffic switch
          * @hide
          */
-        public static final String NETWORK_TRAFFIC_OLD = "network_traffic_old";
+        public static final String NETWORK_TRAFFIC_OLD_STATE = "network_traffic_old_state";
 
         /**
          * Network traffic indicator, goes from least to greatest significant bitwise
-         * 0 = Display down-stream traffic if set
-         * 1 = Show as Byte/s if set
+         * 0 = Display up-stream traffic if set
+         * 1 = Display down-stream traffic if set
+         * 2 = Show as Byte/s if set
          * 16-31 = Refresh interval(ms) min: 250 max: 32750 default: 1000
          * @hide
          */

packages/SystemUI/res/values/pa_dimens.xml

@@ -49,7 +49,7 @@
     <dimen name="pie_battery_width">3.5sp</dimen>
     <dimen name="pie_shader_width">1dp</dimen>
     <dimen name="pie_settings_offset">55dp</dimen>
-    <dimen name="pie_settings_offset_land">210dp</dimen>
+    <dimen name="pie_settings_offset_land">240dp</dimen>
     <dimen name="pie_status_item_size">16dp</dimen>
     <dimen name="pie_status_offset">20dp</dimen>
     <dimen name="pie_status_text_top_margin">13dp</dimen>

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

@@ -764,6 +764,9 @@ public void start() {
         mContext.getContentResolver().registerContentObserver(
                 Settings.Secure.getUriFor(Settings.Secure.PIE_GRAVITY), false,
                 mSettingsObserver, UserHandle.USER_ALL);
+        mContext.getContentResolver().registerContentObserver(
+                Settings.Secure.getUriFor(Settings.Secure.PIE_LEFT_HANDED), false,
+                mSettingsObserver, UserHandle.USER_ALL);
         if (ENABLE_LOCK_SCREEN_ALLOW_REMOTE_INPUT) {
             mContext.getContentResolver().registerContentObserver(
                     Settings.Secure.getUriFor(Settings.Secure.LOCK_SCREEN_ALLOW_REMOTE_INPUT),
@@ -882,6 +885,10 @@ public void start() {
     }
 
     public void updatePieControls(boolean enabled) {
+		updatePieControls(enabled, false);
+	}
+
+    public void updatePieControls(boolean enabled, boolean override) {
         ContentResolver resolver = mContext.getContentResolver();
 
         if (enabled) {
@@ -898,7 +905,7 @@ public void updatePieControls(boolean enabled) {
 
         int gravity = Settings.Secure.getIntForUser(resolver,
                 Settings.Secure.PIE_GRAVITY, 0, UserHandle.USER_CURRENT);
-        mPieController.resetPie(enabled, gravity);
+        mPieController.resetPie(enabled, gravity, override);
     }
 
     public void toggleOrientationListener(boolean enable) {
@@ -936,7 +943,7 @@ private void getOrientationListener() {
                 public void onOrientationChanged(int orientation) {
                     int rotation = mDisplay.getRotation();
                     if (rotation != mOrientation) {
-                        if (mPieController != null) mPieController.detachPie();
+                        if (mPieController != null) mPieController.updatePie();
                         mOrientation = rotation;
                     }
                 }
@@ -1077,7 +1084,7 @@ protected void onConfigurationChanged(Configuration newConfig) {
         }
         int rotation = mDisplay.getRotation();
         if (rotation != mOrientation) {
-            if (mPieController != null) mPieController.detachPie();
+            if (mPieController != null) mPieController.updatePie();
             mOrientation = rotation;
         }
     }

packages/SystemUI/src/com/android/systemui/statusbar/pie/PieController.java

@@ -130,10 +130,14 @@ public void detachPie() {
     }
 
     public void attachPie() {
-        mBar.updatePieControls(true);
+        mBar.updatePieControls(true, true);
     }
 
-    public void resetPie(boolean enabled, int gravity) {
+    public void updatePie() {
+		mBar.updatePieControls(mPieAttached);
+	}
+
+    public void resetPie(boolean enabled, int gravity, boolean override) {
         mRotation = mWindowManager.getDefaultDisplay().getRotation();
 
         if (mPieAttached) {
@@ -143,17 +147,17 @@ public void resetPie(boolean enabled, int gravity) {
             }
             mPieAttached = false;
         }
-        if (enabled) attachPie(gravity);
+        if (enabled) attachPie(gravity, override);
     }
 
     private boolean showPie() {
-        final boolean pieEnabled = Settings.Secure.getIntForUser(mContext.getContentResolver(),
+        boolean pieEnabled = Settings.Secure.getIntForUser(mContext.getContentResolver(),
                 Settings.Secure.PIE_STATE, 0, UserHandle.USER_CURRENT) == 1;
         return pieEnabled;
     }
 
-    public void attachPie(int gravity) {
-        if(showPie()) {
+    public void attachPie(int gravity, boolean override) {
+        if(showPie() && (!mKeyguardManager.inKeyguardRestrictedInputMode() || override)) {
             // want some slice?
             switch (gravity) {
                 // this is just main gravity, the trigger is centered later
@@ -387,7 +391,7 @@ && activateFromListener(touchX, touchY)) {
                 @Override
                 public void run() {
                     if (!gainTouchFocus(mPie.getWindowToken())) {
-                        detachPie();
+                        updatePie();
                     }
                     restoreListenerState();
                 }

packages/SystemUI/src/com/android/systemui/statusbar/pie/PieMenu.java

@@ -453,7 +453,7 @@ private void getDimensions() {
             }
             setColor(mNOTLogo, mDarkThemeEnabled ? mForegroundColor : mBackgroundColor);
             mTogglePoint[mNumberOfSnapPoints++] = new NowOnTapPoint(mWidth / 2 +
-                    (mPanelOrientation == Gravity.BOTTOM ? 0 : (isLandScape() ? (pieRight ? mWidth / 7 : -mWidth / 7)
+                    (mPanelOrientation == Gravity.BOTTOM ? 0 : (isLandScape() ? (pieRight ? mWidth / 6 : -mWidth / 6)
                     : (pieRight ? -mNOTOffsetX : mNOTOffsetX))), mHeight / 2 +
                     (mPanelOrientation == Gravity.BOTTOM ? mNOTOffsetY : 0),
                     mNOTRadius, mNOTLogo, mNOTSize);