forked from M66B/cm10-fxp-extended
-
Notifications
You must be signed in to change notification settings - Fork 0
/
eba_settings.patch
94 lines (85 loc) · 4.66 KB
/
eba_settings.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
From 988d5e42698f5426edf0c7a75da0a07908c6ecb0 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@gmail.com>
Date: Sat, 2 Feb 2013 06:05:10 +0200
Subject: [PATCH] Add option to enable/disable Electron Beam Animation (2/2
Settings)
Trigger CRT off animation by user preference.
Signed-off-by: Michael Bestas <mikeioannina@gmail.com>
Change-Id: I1151009d9347f5c6d49410078b04df6a287a579a
---
res/xml/display_settings.xml | 6 +++---
src/com/android/settings/DisplaySettings.java | 17 +++++++++++------
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index cd119fa..b089ff3 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -61,21 +61,21 @@
android:title="@string/battery_light_title"
android:fragment="com.android.settings.notificationlight.BatteryLightSettings" />
-<!-- Remove until merged from CM9
<PreferenceCategory
android:key="category_animation_options"
android:title="@string/display_category_animation_options_title"/>
+<!-- Remove until merged from CM9
<CheckBoxPreference
android:key="electron_beam_animation_on"
android:title="@string/display_electron_beam_animation_on_title"
android:defaultValue="false" />
-
+-->
<CheckBoxPreference
android:key="electron_beam_animation_off"
android:title="@string/display_electron_beam_animation_off_title"
android:defaultValue="true" />
--->
+
<PreferenceCategory
android:key="category_wakeup_options"
android:title="@string/display_category_wakeup_options_title"/>
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 8d7ab38..a554f03 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -165,11 +165,8 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
/**
mElectronBeamAnimationOn = (CheckBoxPreference) findPreference(KEY_ELECTRON_BEAM_ANIMATION_ON);
- mElectronBeamAnimationOff = (CheckBoxPreference) findPreference(KEY_ELECTRON_BEAM_ANIMATION_OFF);
mElectronBeamAnimationOn.setChecked(Settings.System.getInt(resolver,
Settings.System.ELECTRON_BEAM_ANIMATION_ON, 0) == 1);
- mElectronBeamAnimationOff.setChecked(Settings.System.getInt(resolver,
- Settings.System.ELECTRON_BEAM_ANIMATION_OFF, 1) == 1);
mElectronBeamAnimationOn = (CheckBoxPreference) findPreference(KEY_ELECTRON_BEAM_ANIMATION_ON);
if(getResources().getInteger(com.android.internal.R.integer.config_screenOnAnimation) >= 0) {
@@ -178,6 +175,15 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
} else {
getPreferenceScreen().removePreference(mElectronBeamAnimationOn);
}
+ if(getResources().getInteger(com.android.internal.R.integer.config_screenOnAnimation) < 0 &&
+ !getResources().getBoolean(com.android.internal.R.bool.config_screenOffAnimation)) {
+ getPreferenceScreen().removePreference((PreferenceCategory) findPreference(KEY_ELECTRON_BEAM_CATEGORY_ANIMATION));
+ }
+*/
+ mElectronBeamAnimationOff = (CheckBoxPreference) findPreference(KEY_ELECTRON_BEAM_ANIMATION_OFF);
+ mElectronBeamAnimationOff.setChecked(Settings.System.getInt(resolver,
+ Settings.System.ELECTRON_BEAM_ANIMATION_OFF, 1) == 1);
+
mElectronBeamAnimationOff = (CheckBoxPreference) findPreference(KEY_ELECTRON_BEAM_ANIMATION_OFF);
if(getResources().getBoolean(com.android.internal.R.bool.config_screenOffAnimation)) {
mElectronBeamAnimationOff.setChecked(Settings.System.getInt(resolver,
@@ -185,11 +191,10 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
} else {
getPreferenceScreen().removePreference(mElectronBeamAnimationOff);
}
- if(getResources().getInteger(com.android.internal.R.integer.config_screenOnAnimation) < 0 &&
- !getResources().getBoolean(com.android.internal.R.bool.config_screenOffAnimation)) {
+ if(!getResources().getBoolean(com.android.internal.R.bool.config_screenOffAnimation)) {
getPreferenceScreen().removePreference((PreferenceCategory) findPreference(KEY_ELECTRON_BEAM_CATEGORY_ANIMATION));
}
-*/
+
mVolumeWake = (CheckBoxPreference) findPreference(KEY_VOLUME_WAKE);
if (mVolumeWake != null) {
if (!getResources().getBoolean(R.bool.config_show_volumeRockerWake)) {
--
1.7.9.5