Add setting to hide notification pulldown after clicking a power widget button (582446d6) · Commits · e / os / android_packages_apps_CMParts

res/values/strings.xml

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -346,6 +346,8 @@
	<string name="title_widget_buttons">Expanded View Widget</string>		<string name="title_widget_buttons">Expanded View Widget</string>
	<string name="title_expanded_widget">Notification power widget</string>		<string name="title_expanded_widget">Notification power widget</string>
	<string name="summary_expanded_widget">Use the expanded views power widget</string>		<string name="summary_expanded_widget">Use the expanded views power widget</string>
			<string name="title_expanded_hide_onchange">Hide on change</string>
			<string name="summary_expanded_hide_onchange">Hide the notification pulldown after toggling a widget button</string>
	<string name="expanded_color_mask">Indicator color</string>		<string name="expanded_color_mask">Indicator color</string>
	<string name="title_widget_picker">Widget buttons</string>		<string name="title_widget_picker">Widget buttons</string>
	<string name="summary_widget_picker">Pick your widget buttons</string>		<string name="summary_widget_picker">Pick your widget buttons</string>

res/xml/ui_settings.xml

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -77,6 +77,11 @@
	android:title="@string/title_expanded_widget"		android:title="@string/title_expanded_widget"
	android:summary="@string/summary_expanded_widget"		android:summary="@string/summary_expanded_widget"
	android:defaultValue="true" />		android:defaultValue="true" />
			<CheckBoxPreference android:key="expanded_hide_onchange"
			android:title="@string/title_expanded_hide_onchange"
			android:summary="@string/summary_expanded_hide_onchange"
			android:defaultValue="false"
			android:dependency="expanded_widget" />
	<Preference		<Preference
	android:key="expanded_color_mask"		android:key="expanded_color_mask"
	android:title="@string/expanded_color_mask"		android:title="@string/expanded_color_mask"

src/com/cyanogenmod/cmparts/activities/UIActivity.java

+14 −1

Original line number	Original line	Diff line number	Diff line
	@@ -31,6 +31,7 @@ public class UIActivity extends PreferenceActivity implements OnPreferenceChange
	private static final String GENERAL_CATEGORY = "general_category";		private static final String GENERAL_CATEGORY = "general_category";

	private static final String UI_EXP_WIDGET = "expanded_widget";		private static final String UI_EXP_WIDGET = "expanded_widget";
			private static final String UI_EXP_WIDGET_HIDE_ONCHANGE = "expanded_hide_onchange";
	private static final String UI_EXP_WIDGET_COLOR = "expanded_color_mask";		private static final String UI_EXP_WIDGET_COLOR = "expanded_color_mask";
	private static final String UI_EXP_WIDGET_PICKER = "widget_picker";		private static final String UI_EXP_WIDGET_PICKER = "widget_picker";

	@@ -67,6 +68,7 @@ public class UIActivity extends PreferenceActivity implements OnPreferenceChange
	private ListPreference mScreenLockScreenOffDelayPref;		private ListPreference mScreenLockScreenOffDelayPref;

	private CheckBoxPreference mPowerWidget;		private CheckBoxPreference mPowerWidget;
			private CheckBoxPreference mPowerWidgetHideOnChange;
	private Preference mPowerWidgetColor;		private Preference mPowerWidgetColor;
	private PreferenceScreen mPowerPicker;		private PreferenceScreen mPowerPicker;

	@@ -133,11 +135,16 @@ public class UIActivity extends PreferenceActivity implements OnPreferenceChange

	/* Expanded View Power Widget */		/* Expanded View Power Widget */
	mPowerWidget = (CheckBoxPreference) prefSet.findPreference(UI_EXP_WIDGET);		mPowerWidget = (CheckBoxPreference) prefSet.findPreference(UI_EXP_WIDGET);
			mPowerWidgetHideOnChange = (CheckBoxPreference)
			prefSet.findPreference(UI_EXP_WIDGET_HIDE_ONCHANGE);

	mPowerWidgetColor = prefSet.findPreference(UI_EXP_WIDGET_COLOR);		mPowerWidgetColor = prefSet.findPreference(UI_EXP_WIDGET_COLOR);
	mPowerPicker = (PreferenceScreen)prefSet.findPreference(UI_EXP_WIDGET_PICKER);		mPowerPicker = (PreferenceScreen)prefSet.findPreference(UI_EXP_WIDGET_PICKER);

	mPowerWidget.setChecked((Settings.System.getInt(getContentResolver(),		mPowerWidget.setChecked((Settings.System.getInt(getContentResolver(),
	Settings.System.EXPANDED_VIEW_WIDGET, 1) == 1));		Settings.System.EXPANDED_VIEW_WIDGET, 1) == 1));
			mPowerWidgetHideOnChange.setChecked((Settings.System.getInt(getContentResolver(),
			Settings.System.EXPANDED_HIDE_ONCHANGE, 0) == 1));

	/* Overscroll */		/* Overscroll */
	mOverscrollPref = (CheckBoxPreference) prefSet.findPreference(OVERSCROLL_PREF);		mOverscrollPref = (CheckBoxPreference) prefSet.findPreference(OVERSCROLL_PREF);
	@@ -205,6 +212,12 @@ public class UIActivity extends PreferenceActivity implements OnPreferenceChange
	Settings.System.EXPANDED_VIEW_WIDGET, value ? 1 : 0);		Settings.System.EXPANDED_VIEW_WIDGET, value ? 1 : 0);
	}		}

			if(preference == mPowerWidgetHideOnChange) {
			value = mPowerWidgetHideOnChange.isChecked();
			Settings.System.putInt(getContentResolver(),
			Settings.System.EXPANDED_HIDE_ONCHANGE, value ? 1 : 0);
			}

	if (preference == mPowerWidgetColor) {		if (preference == mPowerWidgetColor) {
	ColorPickerDialog cp = new ColorPickerDialog(this,		ColorPickerDialog cp = new ColorPickerDialog(this,
	mWidgetColorListener,		mWidgetColorListener,