Battery light: add back the Reset Defaults part
Change-Id: Ia76fe16b920c8379a5cc6622a9f53a583c96915e
ps: set Battery light enabled by default but Pulse off
diff --git a/res/drawable-xhdpi/ic_settings_backup_restore.png b/res/drawable-xhdpi/ic_settings_backup_restore.png
new file mode 100644
index 0000000..9f975d3
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_backup_restore.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_backup_restore.png b/res/drawable-xxhdpi/ic_settings_backup_restore.png
new file mode 100644
index 0000000..d8effc6
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_backup_restore.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_backup_restore.png b/res/drawable-xxxhdpi/ic_settings_backup_restore.png
new file mode 100644
index 0000000..f5773c9
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_backup_restore.png
Binary files differ
diff --git a/src/org/omnirom/omnigears/batterylight/BatteryLightSettings.java b/src/org/omnirom/omnigears/batterylight/BatteryLightSettings.java
index e519b8a..dd28f07 100644
--- a/src/org/omnirom/omnigears/batterylight/BatteryLightSettings.java
+++ b/src/org/omnirom/omnigears/batterylight/BatteryLightSettings.java
@@ -109,6 +109,7 @@
mReallyFullColorPref.setOnPreferenceChangeListener(this);
} else {
prefSet.removePreference(prefSet.findPreference("colors_list"));
+ resetColors();
}
}
@@ -167,10 +168,10 @@
}
}
- /*@Override
+ @Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
menu.add(0, MENU_RESET, 0, R.string.reset)
- .setIcon(R.drawable.ic_settings_backup) // use the backup icon
+ .setIcon(R.drawable.ic_settings_backup_restore)
.setAlphabeticShortcut('r')
.setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
}
@@ -179,14 +180,14 @@
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case MENU_RESET:
- resetColors();
+ resetToDefaults();
return true;
}
return false;
}
protected void resetColors() {
- ContentResolver resolver = getContentResolver();
+ ContentResolver resolver = getActivity().getContentResolver();
Resources res = getResources();
// Reset to the framework default colors
@@ -199,7 +200,14 @@
Settings.System.putInt(resolver, Settings.System.BATTERY_LIGHT_REALLY_FULL_COLOR,
res.getInteger(com.android.internal.R.integer.config_notificationsBatteryFullARGB));
refreshDefault();
- }*/
+ }
+
+ protected void resetToDefaults() {
+ if (mEnabledPref != null) mEnabledPref.setChecked(true);
+ if (mPulsePref != null) mPulsePref.setChecked(false);
+
+ resetColors();
+ }
@Override
public boolean onPreferenceChange(Preference preference, Object objValue) {
