Commit 781e5a86 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review

Merge "Pie controls: Fix multi-user handling (2/2)" into cm-10.1-staging

parents d27944b3 341750e7
......@@ -115,6 +115,11 @@ public class SystemSettings extends SettingsPreferenceFragment implements
prefScreen.removePreference(findPreference(KEY_HARDWARE_KEYS));
prefScreen.removePreference(findPreference(KEY_NAVIGATION_BAR));
prefScreen.removePreference(findPreference(KEY_NAVIGATION_RING));
// move pie controls from the navigation bar category to the root preference
mPieControl = (PreferenceScreen) findPreference(KEY_PIE_CONTROL);
if (mPieControl != null) {
prefScreen.addPreference(mPieControl);
}
prefScreen.removePreference(findPreference(KEY_NAVIGATION_BAR_CATEGORY));
prefScreen.removePreference(findPreference(KEY_STATUS_BAR));
prefScreen.removePreference(findPreference(KEY_QUICK_SETTINGS));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment