Merge "Fix for 2284833 : Remove big brightness icon and make it a small one on the title bar."
diff --git a/res/drawable-mdpi/appwidget_inner_focus_r.9.png b/res/drawable-mdpi/appwidget_inner_focus_r.9.png
index bc8757b..604256e 100644
--- a/res/drawable-mdpi/appwidget_inner_focus_r.9.png
+++ b/res/drawable-mdpi/appwidget_inner_focus_r.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_press_r.9.png b/res/drawable-mdpi/appwidget_inner_press_r.9.png
index 79eaea3..6d7bf29 100644
--- a/res/drawable-mdpi/appwidget_inner_press_r.9.png
+++ b/res/drawable-mdpi/appwidget_inner_press_r.9.png
Binary files differ
diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index c9f3523..d0ca01d 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -129,7 +129,7 @@
mBackup.setChecked(backupEnabled);
mAutoRestore.setChecked(Settings.Secure.getInt(res,
- Settings.Secure.BACKUP_AUTO_RESTORE, 0) == 1);
+ Settings.Secure.BACKUP_AUTO_RESTORE, 1) == 1);
mAutoRestore.setEnabled(backupEnabled);
}
diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java
index 7d8c30a..3ecd819 100644
--- a/src/com/android/settings/RingerVolumePreference.java
+++ b/src/com/android/settings/RingerVolumePreference.java
@@ -123,13 +123,15 @@
protected void onSampleStarting(SeekBarVolumizer volumizer) {
super.onSampleStarting(volumizer);
for (SeekBarVolumizer vol : mSeekBarVolumizer) {
- if (vol != volumizer) vol.stopSample();
+ if (vol != null && vol != volumizer) vol.stopSample();
}
}
private void setNotificationVolumeVisibility(boolean visible) {
- mSeekBarVolumizer[0].getSeekBar().setVisibility(
- visible ? View.VISIBLE : View.GONE);
+ if (mSeekBarVolumizer[0] != null) {
+ mSeekBarVolumizer[0].getSeekBar().setVisibility(
+ visible ? View.VISIBLE : View.GONE);
+ }
mNotificationVolumeTitle.setVisibility(visible ? View.VISIBLE : View.GONE);
}
