summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2013-04-02 00:54:14 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2013-04-02 00:54:14 -0700
commit2f9b1f02e016e1070f3bbcc70aed758325cc1880 (patch)
treee229feaae05abb43e790e0d58288e4358a651693 /packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
parent675432c81c82a8d6509ba13f6d6e38c74e603330 (diff)
parent1c601ac8dde76d68e3824191e675256b47e0493f (diff)
downloadframeworks_base-2f9b1f02e016e1070f3bbcc70aed758325cc1880.zip
frameworks_base-2f9b1f02e016e1070f3bbcc70aed758325cc1880.tar.gz
frameworks_base-2f9b1f02e016e1070f3bbcc70aed758325cc1880.tar.bz2
Merge "Merge Navigation Bar and Pie Controls button config (1/2)" into cm-10.1
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
index 8eef365..8865842 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
@@ -1354,7 +1354,7 @@ public abstract class BaseStatusBar extends SystemUI implements
resolver.registerContentObserver(Settings.System.getUriFor(
Settings.System.PIE_CONTROLS), false, this);
resolver.registerContentObserver(Settings.System.getUriFor(
- Settings.System.PIE_GRAVITY), false, this);
+ Settings.System.PIE_POSITIONS), false, this);
resolver.registerContentObserver(Settings.System.getUriFor(
Settings.System.EXPANDED_DESKTOP_STATE), false, this);
resolver.registerContentObserver(Settings.System.getUriFor(
@@ -1366,7 +1366,7 @@ public abstract class BaseStatusBar extends SystemUI implements
ContentResolver resolver = mContext.getContentResolver();
mPieTriggerSlots = Settings.System.getInt(resolver,
- Settings.System.PIE_GRAVITY, Position.BOTTOM.FLAG);
+ Settings.System.PIE_POSITIONS, Position.BOTTOM.FLAG);
boolean expanded = Settings.System.getInt(resolver,
Settings.System.EXPANDED_DESKTOP_STATE, 0) == 1;