diff options
| author | David van Tonder <david.vantonder@gmail.com> | 2013-05-28 05:16:17 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-05-28 05:16:17 -0700 |
| commit | 4c90669f2946c16900b723ce1f16485516267f2b (patch) | |
| tree | 05fe72ffbe9ef86865ba413970e2f09c19f63e50 /packages/SystemUI/src | |
| parent | e620008954598598e052476832c778e1fc5297e1 (diff) | |
| parent | fa46b51feb28b522148573e7ed0400c2578aca06 (diff) | |
| download | frameworks_base-4c90669f2946c16900b723ce1f16485516267f2b.zip frameworks_base-4c90669f2946c16900b723ce1f16485516267f2b.tar.gz frameworks_base-4c90669f2946c16900b723ce1f16485516267f2b.tar.bz2 | |
Merge "Pie controls: Tweaking UX for pie service (1/2)" into cm-10.1
Diffstat (limited to 'packages/SystemUI/src')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/PieController.java | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/PieController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/PieController.java index b013d15..9e48128 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/PieController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/PieController.java @@ -63,6 +63,7 @@ import android.widget.Toast; import com.android.internal.util.cm.DevUtils; import com.android.internal.util.pie.PiePosition; +import com.android.internal.util.pie.PieServiceConstants; import com.android.systemui.R; import com.android.systemui.statusbar.BaseStatusBar; import com.android.systemui.statusbar.NavigationButtons; @@ -215,6 +216,8 @@ public class PieController implements BaseStatusBar.NavigationBarCallback, PieVi // trigger setupListener() resolver.registerContentObserver(Settings.System.getUriFor( Settings.System.PIE_POSITIONS), false, this); + resolver.registerContentObserver(Settings.System.getUriFor( + Settings.System.PIE_SENSITIVITY), false, this); } @Override @@ -351,8 +354,17 @@ public class PieController implements BaseStatusBar.NavigationBarCallback, PieVi mPieTriggerSlots = Settings.System.getInt(resolver, Settings.System.PIE_POSITIONS, PiePosition.BOTTOM.FLAG); + + int sensitivity = Settings.System.getInt(resolver, + Settings.System.PIE_SENSITIVITY, 3); + if (sensitivity < PieServiceConstants.SENSITIVITY_LOWEST + || sensitivity > PieServiceConstants.SENSITIVITY_HIGHEST) { + sensitivity = PieServiceConstants.SENSITIVITY_DEFAULT; + } + mPieManager.updatePieActivationListener(mPieActivationListener, - mPieTriggerSlots & mPieTriggerMask); + sensitivity<<PieServiceConstants.SENSITIVITY_SHIFT + | mPieTriggerSlots & mPieTriggerMask); } private void setupNavigationItems() { |