This repository has been archived by the owner on Nov 9, 2017. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 7
/
xsettings.patch
1797 lines (1714 loc) · 90.6 KB
/
xsettings.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
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5931dae..12b194b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2387,6 +2389,10 @@
from unknown sources. You agree that you are solely responsible for any
damage to your phone or loss of data that may result from using
these apps.</string>
+
+ <string name="boot_pincode_title">Pincode at boot</string>
+ <string name="boot_pincode_summary">Enter exactly four digits</string>
+
<!-- Applications settings screen, setting check box title. If checked, applications show more settings options. -->
<string name="advanced_settings">Advanced settings</string>
<!-- Applications settings screen, setting check box summary. This is the summary for "Advanced settings" checkbox -->
@@ -4674,6 +4680,12 @@
<string name="performance_settings_warning">These settings are included for experimentation and any changes made to them have the potential to cause instability, crashes, data loss or hardware failures.\n\nWe request you do not file bug reports if any of these settings have been changed from the defaults.</string>
<!-- Performance Settings : Processor Settings -->
+ <!-- Performance Settings : Categories -->
+ <string name="cpu_cat_current_title">Current</string>
+ <string name="cpu_cat_general_title">General</string>
+ <string name="cpu_cat_smartass_title">Smartass</string>
+ <string name="cpu_cat_voltage_title">Voltage</string>
+
<!-- Performance Settings : Processor settings title -->
<string name="processor_title">Processor</string>
<!-- Performance Settings : Processor settings summary. -->
@@ -4688,7 +4700,35 @@
<string name="cpu_max_freq_title">Maximum CPU frequency</string>
<string name="cpu_max_freq_summary">%s</string>
<string name="cpu_set_on_boot">Set on boot</string>
- <string name="cpu_set_on_boot_summary">Restore the processor settings on boot</string>
+ <string name="cpu_set_on_boot_summary">Restore the general, smartass, and voltage processor settings on boot</string>
+ <string name="cpu_set_on_boot_disabled">Set on boot disabled</string>
+
+ <!-- Performance Settings : Smartass -->
+ <string name="smartass_awake_ideal_freq_title">Awake ideal frequency (awake_ideal_freq)</string>
+ <string name="smartass_awake_ideal_freq_summary">%s\nThe frequency until which CPU is scaled up rapidly on screen-awake (from sleep). Thereafter, scaling up is less aggressive.</string>
+ <string name="smartass_sleep_ideal_freq_title">Sleep ideal frequency (sleep_ideal_freq)</string>
+ <string name="smartass_sleep_ideal_freq_summary">%s\nThe frequency until which CPU is scaled down rapidly when screen is turned off. Thereafter, scaling down is less aggressive.</string>
+ <string name="smartass_sleep_wakeup_freq_title">Sleep wakeup frequency (sleep_wakeup_freq)</string>
+ <string name="smartass_sleep_wakeup_freq_summary">%s\nThe frequency to set when waking up from sleep. When sleep_ideal_freq=0 this will have no effect.</string>
+ <string name="smartass_max_cpu_load_title">Maximum CPU load (max_cpu_load)</string>
+ <string name="smartass_max_cpu_load_summary">%s\nMeasured in percentage 1-100, When CPU load reaches this point, governor will scale CPU up. Higher value means less responsiveness and lower values corresponds to more responsiveness at the cost of battery.</string>
+ <string name="smartass_min_cpu_load_title">Minimum CPU load (min_cpu_load)</string>
+ <string name="smartass_min_cpu_load_summary">%s\nMeasured in percentage 1-100, When CPU load reaches this point, governor will scale CPU down.</string>
+ <string name="smartass_ramp_up_step_title">Ramp up step (ramp_up_step)</string>
+ <string name="smartass_ramp_up_step_summary">%s\nFrequency when ramping up above the ideal frequency. Zero disables and causes to always jump straight to max frequency. When below the ideal frequency we always ramp up to the ideal freq.</string>
+ <string name="smartass_ramp_down_step_title">Ramp down step (ramp_down_step)</string>
+ <string name="smartass_ramp_down_step_summary">%s\nFrequency delta when ramping down below the ideal frequency. Zero disables and will calculate ramp down according to load heuristic. When above the ideal frequency we always ramp down to the ideal freq.</string>
+ <string name="smartass_up_rate_us_title">Up rate (up_rate_us)</string>
+ <string name="smartass_up_rate_us_summary">%s\nThe minimum amount of time to spend at a frequency before we can ramp up. (Ignored below awake-ideal frequency since governor needs to rapidly scale up to awake_ideal_freq when below it)</string>
+ <string name="smartass_down_rate_us_title">Down rate (down_rate_us)</string>
+ <string name="smartass_down_rate_us_summary">%s\nThe minimum amount of time to spend at a frequency before we can ramp down. (Ignored above sleep-ideal frequency since governor needs to rapidly scale down to sleep_ideal_freq when above it)</string>
+ <string name="smartass_boost_enabled_title">Boost enabled (boost_enabled)</string>
+ <string name="smartass_boost_enabled_summary">Android power manager boost pulse support</string>
+ <string name="smartass_boost_pulse_title">Boost pulse (boost_pulse)</string>
+ <string name="smartass_boost_pulse_summary">%s\nCurrent boost pulse duration</string>
+
+ <!-- Performance Settings : Voltage -->
+ <string name="voltage_warning">(use with care)</string>
<!-- Performance Settings : I/O scheduler settings title -->
<string name="io_scheds_title">I/O scheduler</string>
@@ -4698,6 +4738,8 @@
<!-- Performance Settings : I/O scheduler settings sub items -->
<string name="io_sched_title">I/O scheduler</string>
<string name="io_sched_summary">%S</string>
+ <string name="fsync_title">fsync</string>
+ <string name="fsync_summary">Synchronize a file\'s in-core state with storage device.\nDo not disable unless you know what you are doing!</string>
<string name="io_sched_set_on_boot">Set on boot</string>
<string name="io_sched_set_on_boot_summary">Restore the I/O scheduler settings on boot</string>
@@ -4713,6 +4755,26 @@
<!-- Purgeable Assets -->
<string name="pref_purgeable_assets_title">Allow purging of assets</string>
<string name="pref_purgeable_assets_summary">Purging of bitmap memory assets allows the freeing of more RAM when needed (requires reboot)</string>
+ <!-- Autogroup -->
+ <string name="pref_autogroup_title">Autogroup</string>
+ <string name="pref_autogroup_summary">Automated per tty (app) task groups. Always restored on boot.</string>
+
+ <!-- Lowmemkiller -->
+ <string name="lowmem_foreground_app_title">Foreground app</string>
+ <string name="lowmem_foreground_app_summary">%s\nThis is the process running the current foreground app. We\'d really rather not kill it!</string>
+ <string name="lowmem_visible_app_title">Visible app</string>
+ <string name="lowmem_visible_app_summary">%s\nThis is a process only hosting activities that are visible to the user, so we\'d prefer they don\'t disappear.</string>
+ <string name="lowmem_secondary_server_title">Secondary server</string>
+ <string name="lowmem_secondary_server_summary">%s\nThis is a process holding a secondary server -- killing it will not have much of an impact as far as the user is concerned.</string>
+ <string name="lowmem_hidden_app_title">Hidden app</string>
+ <string name="lowmem_hidden_app_summary">%s\nThis is a process only hosting activities that are not visible, so it can be killed without any disruption.</string>
+ <string name="lowmem_content_provider_title">Content provider</string>
+ <string name="lowmem_content_provider_summary">%s\nThis is a process with a content provider that does not have any clients attached to it. If it did have any clients, its adjustment would be the one for the highest-priority of those processes.</string>
+ <string name="lowmem_empty_app_title">Empty app</string>
+ <string name="lowmem_empty_app_summary">%s\nThis is a process without anything currently running in it. Definitely the first to go!</string>
+ <string name="lowmem_set_on_boot">Set on boot</string>
+ <string name="lowmem_set_on_boot_summary">Restore the low memory settings on boot</string>
+ <string name="lowmem_set_on_boot_disabled">Set on boot disabled</string>
<!-- Performance Settings : Dithering -->
<string name="pref_use_dithering_title">Surface improvement</string>
@@ -4874,6 +4936,14 @@
<string name="pref_volume_wake_title">Volume rocker wake</string>
<string name="pref_volume_wake_summary">Pressing the volume rocker up/down will wake the device</string>
+ <!-- Light options -->
+ <string name="pref_light_lcd_title">LCD backlight</string>
+ <string name="pref_light_lcd_summary">LCD backlight current in µA</string>
+ <string name="pref_light_button_title">Button backlight</string>
+ <string name="pref_light_button_summary">Button backlight current in µA</string>
+ <string name="pref_light_keyboard_title">Keyboard backlight</string>
+ <string name="pref_light_keyboard_summary">Keyboard backlight current in µA</string>
+
<string name="ok">OK</string>
<!-- Development settings: title for the field that shows the "App ID" development identifier
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index cd119fa..d8eca1b 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -86,4 +86,22 @@
android:summary="@string/pref_volume_wake_summary"
android:defaultValue="false" />
+ <EditTextPreference
+ android:key="pref_light_lcd"
+ android:dialogTitle="@string/pref_light_lcd_title"
+ android:title="@string/pref_light_lcd_title"
+ android:summary="@string/pref_light_lcd_summary" />
+
+ <EditTextPreference
+ android:key="pref_light_button"
+ android:dialogTitle="@string/pref_light_button_title"
+ android:title="@string/pref_light_button_title"
+ android:summary="@string/pref_light_button_summary" />
+
+ <EditTextPreference
+ android:key="pref_light_keyboard"
+ android:dialogTitle="@string/pref_light_keyboard_title"
+ android:title="@string/pref_light_keyboard_title"
+ android:summary="@string/pref_light_keyboard_summary" />
+
</PreferenceScreen>
diff --git a/res/xml/ioscheduler_settings.xml b/res/xml/ioscheduler_settings.xml
index e8eb267..b9e4dd3 100644
--- a/res/xml/ioscheduler_settings.xml
+++ b/res/xml/ioscheduler_settings.xml
@@ -25,6 +25,11 @@
android:title="@string/io_sched_title" />
<CheckBoxPreference
+ android:key="pref_fsync"
+ android:title="@string/fsync_title"
+ android:summary="@string/fsync_summary"/>
+
+ <CheckBoxPreference
android:key="pref_io_sched_set_on_boot"
android:title="@string/io_sched_set_on_boot"
android:summary="@string/io_sched_set_on_boot_summary"/>
diff --git a/res/xml/memory_management.xml b/res/xml/memory_management.xml
index 187c815..1e14775 100644
--- a/res/xml/memory_management.xml
+++ b/res/xml/memory_management.xml
@@ -37,4 +37,46 @@
android:title="@string/pref_ksm_title"
android:summary="@string/pref_ksm_summary" />
+ <CheckBoxPreference
+ android:key="pref_autogroup"
+ android:title="@string/pref_autogroup_title"
+ android:summary="@string/pref_autogroup_summary" />
+
+ <PreferenceCategory android:title="Low memory killer">
+ <EditTextPreference
+ android:key="pref_lowmem_foreground_app"
+ android:dialogTitle="@string/lowmem_foreground_app_title"
+ android:title="@string/lowmem_foreground_app_title" />
+
+ <EditTextPreference
+ android:key="pref_lowmem_visible_app"
+ android:dialogTitle="@string/lowmem_visible_app_title"
+ android:title="@string/lowmem_visible_app_title" />
+
+ <EditTextPreference
+ android:key="pref_lowmem_secondary_server_app"
+ android:dialogTitle="@string/lowmem_secondary_server_title"
+ android:title="@string/lowmem_secondary_server_title" />
+
+ <EditTextPreference
+ android:key="pref_lowmem_hidden_app"
+ android:dialogTitle="@string/lowmem_hidden_app_title"
+ android:title="@string/lowmem_hidden_app_title" />
+
+ <EditTextPreference
+ android:key="pref_lowmem_content_provider"
+ android:dialogTitle="@string/lowmem_content_provider_title"
+ android:title="@string/lowmem_content_provider_title" />
+
+ <EditTextPreference
+ android:key="pref_lowmem_empty_app"
+ android:dialogTitle="@string/lowmem_empty_app_title"
+ android:title="@string/lowmem_empty_app_title" />
+
+ <CheckBoxPreference
+ android:key="pref_lowmem_set_on_boot"
+ android:title="@string/lowmem_set_on_boot"
+ android:summary="@string/lowmem_set_on_boot_summary"/>
+ </PreferenceCategory>
+
</PreferenceScreen>
diff --git a/res/xml/processor_settings.xml b/res/xml/processor_settings.xml
index 7d0b0ee..ad267c7 100644
--- a/res/xml/processor_settings.xml
+++ b/res/xml/processor_settings.xml
@@ -19,30 +19,97 @@
android:title="@string/processor_title"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
- <Preference
- android:key="pref_cpu_freq_cur"
- style="?android:preferenceInformationStyle"
- android:title="@string/cpu_cur_freq_title"
- android:selectable="false" />
-
- <ListPreference
- android:key="pref_cpu_gov"
- android:dialogTitle="@string/cpu_governors_title"
- android:title="@string/cpu_governors_title" />
-
- <ListPreference
- android:key="pref_cpu_freq_min"
- android:dialogTitle="@string/cpu_min_freq_title"
- android:title="@string/cpu_min_freq_title" />
-
- <ListPreference
- android:key="pref_cpu_freq_max"
- android:dialogTitle="@string/cpu_max_freq_title"
- android:title="@string/cpu_max_freq_title" />
-
- <CheckBoxPreference
- android:key="pref_cpu_set_on_boot"
- android:title="@string/cpu_set_on_boot"
- android:summary="@string/cpu_set_on_boot_summary"/>
+ <PreferenceCategory android:title="@string/cpu_cat_current_title">
+ <Preference
+ android:key="pref_cpu_freq_cur"
+ style="?android:preferenceInformationStyle"
+ android:title="@string/cpu_cur_freq_title"
+ android:selectable="false" />
+
+ <Preference
+ android:key="pref_smartass_boost_pulse"
+ style="?android:preferenceInformationStyle"
+ android:title="@string/smartass_boost_pulse_title"
+ android:summary="@string/smartass_boost_pulse_summary"
+ android:selectable="false" />
+ </PreferenceCategory>
+
+ <PreferenceCategory android:title="@string/cpu_cat_general_title">
+ <ListPreference
+ android:key="pref_cpu_gov"
+ android:dialogTitle="@string/cpu_governors_title"
+ android:title="@string/cpu_governors_title" />
+
+ <ListPreference
+ android:key="pref_cpu_freq_min"
+ android:dialogTitle="@string/cpu_min_freq_title"
+ android:title="@string/cpu_min_freq_title" />
+
+ <ListPreference
+ android:key="pref_cpu_freq_max"
+ android:dialogTitle="@string/cpu_max_freq_title"
+ android:title="@string/cpu_max_freq_title" />
+
+ <CheckBoxPreference
+ android:key="pref_cpu_set_on_boot"
+ android:title="@string/cpu_set_on_boot"
+ android:summary="@string/cpu_set_on_boot_summary"/>
+ </PreferenceCategory>
+
+ <PreferenceCategory android:title="@string/cpu_cat_smartass_title">
+ <ListPreference
+ android:key="pref_smartass_awake_ideal_freq"
+ android:dialogTitle="@string/smartass_awake_ideal_freq_title"
+ android:title="@string/smartass_awake_ideal_freq_title" />
+
+ <ListPreference
+ android:key="pref_smartass_sleep_ideal_freq"
+ android:dialogTitle="@string/smartass_sleep_ideal_freq_title"
+ android:title="@string/smartass_sleep_ideal_freq_title" />
+
+ <ListPreference
+ android:key="pref_smartass_sleep_wakeup_freq"
+ android:dialogTitle="@string/smartass_sleep_wakeup_freq_title"
+ android:title="@string/smartass_sleep_wakeup_freq_title" />
+
+ <EditTextPreference
+ android:key="pref_smartass_max_cpu_load"
+ android:dialogTitle="@string/smartass_max_cpu_load_title"
+ android:title="@string/smartass_max_cpu_load_title" />
+
+ <EditTextPreference
+ android:key="pref_smartass_min_cpu_load"
+ android:dialogTitle="@string/smartass_min_cpu_load_title"
+ android:title="@string/smartass_min_cpu_load_title" />
+
+ <EditTextPreference
+ android:key="pref_smartass_ramp_up_step"
+ android:dialogTitle="@string/smartass_ramp_up_step_title"
+ android:title="@string/smartass_ramp_up_step_title" />
+
+ <EditTextPreference
+ android:key="pref_smartass_ramp_down_step"
+ android:dialogTitle="@string/smartass_ramp_down_step_title"
+ android:title="@string/smartass_ramp_down_step_title" />
+
+ <EditTextPreference
+ android:key="pref_smartass_up_rate_us"
+ android:dialogTitle="@string/smartass_up_rate_us_title"
+ android:title="@string/smartass_up_rate_us_title" />
+
+ <EditTextPreference
+ android:key="pref_smartass_down_rate_us"
+ android:dialogTitle="@string/smartass_down_rate_us_title"
+ android:title="@string/smartass_down_rate_us_title" />
+
+ <CheckBoxPreference
+ android:key="pref_smartass_boost_enabled"
+ android:title="@string/smartass_boost_enabled_title"
+ android:summary="@string/smartass_boost_enabled_summary" />
+ </PreferenceCategory>
+
+ <PreferenceCategory
+ android:title="@string/cpu_cat_voltage_title"
+ android:key="pref_vdd_levels" />
</PreferenceScreen>
diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml
index 9f78820..2df0a7e 100644
--- a/res/xml/security_settings_misc.xml
+++ b/res/xml/security_settings_misc.xml
@@ -52,6 +52,14 @@
android:summaryOn="@string/install_unknown_applications"
android:persistent="false" />
+ <EditTextPreference
+ android:key="boot_pincode"
+ android:dialogTitle="@string/boot_pincode_title"
+ android:title="@string/boot_pincode_title"
+ android:summary="@string/boot_pincode_summary"
+ android:inputType="number"
+ android:password="true" />
+
</PreferenceCategory>
<PreferenceCategory android:title="@string/credentials_title"
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 8d7ab38..919207c 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -33,6 +33,7 @@ import android.preference.ListPreference;
import android.preference.Preference;
import android.preference.PreferenceCategory;
import android.preference.PreferenceScreen;
+import android.preference.EditTextPreference;
import android.provider.Settings;
import android.provider.Settings.SettingNotFoundException;
import android.util.Log;
@@ -42,6 +43,8 @@ import com.android.settings.DreamSettings;
import com.android.settings.cyanogenmod.DisplayRotation;
import java.util.ArrayList;
+import com.android.settings.Utils;
+
public class DisplaySettings extends SettingsPreferenceFragment implements
Preference.OnPreferenceChangeListener {
private static final String TAG = "DisplaySettings";
@@ -63,6 +66,13 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
private static final String KEY_ELECTRON_BEAM_CATEGORY_ANIMATION = "category_animation_options";
private static final String KEY_WAKEUP_CATEGORY = "category_wakeup_options";
private static final String KEY_VOLUME_WAKE = "pref_volume_wake";
+ public static final String KEY_LIGHT_LCD = "pref_light_lcd";
+ public static final String KEY_LIGHT_BUTTON = "pref_light_button";
+ public static final String KEY_LIGHT_KEYBOARD = "pref_light_keyboard";
+
+ public static final String LIGHT_LCD_FILE = "/sys/devices/i2c-0/0-0040/leds/lcd-backlight/max_current";
+ public static final String LIGHT_BUTTON_FILE = "/sys/devices/i2c-0/0-0040/leds/button-backlight/max_current";
+ public static final String LIGHT_KEYBOARD_FILE = "/sys/devices/i2c-0/0-0040/leds/keyboard-backlight/max_current";
private static final String ROTATION_ANGLE_0 = "0";
private static final String ROTATION_ANGLE_90 = "90";
@@ -73,6 +83,9 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
private CheckBoxPreference mLockScreenRotation;
private CheckBoxPreference mVolumeWake;
+ private EditTextPreference mLightLCDPref;
+ private EditTextPreference mLightButtonPref;
+ private EditTextPreference mLightKeyboardPref;
private CheckBoxPreference mElectronBeamAnimationOn;
private CheckBoxPreference mElectronBeamAnimationOff;
private PreferenceScreen mNotificationPulse;
@@ -201,6 +219,26 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
}
}
+ // Lights
+ String temp;
+
+ mLightLCDPref = (EditTextPreference) findPreference(KEY_LIGHT_LCD);
+ if (Utils.fileExists(LIGHT_LCD_FILE) && (temp = Utils.fileReadOneLine(LIGHT_LCD_FILE)) != null) {
+ mLightLCDPref.setText(temp);
+ }
+ mLightLCDPref.setOnPreferenceChangeListener(this);
+
+ mLightButtonPref = (EditTextPreference) findPreference(KEY_LIGHT_BUTTON);
+ if (Utils.fileExists(LIGHT_BUTTON_FILE) && (temp = Utils.fileReadOneLine(LIGHT_BUTTON_FILE)) != null) {
+ mLightButtonPref.setText(temp);
+ }
+ mLightButtonPref.setOnPreferenceChangeListener(this);
+
+ mLightKeyboardPref = (EditTextPreference) findPreference(KEY_LIGHT_KEYBOARD);
+ if (Utils.fileExists(LIGHT_KEYBOARD_FILE) && (temp = Utils.fileReadOneLine(LIGHT_KEYBOARD_FILE)) != null) {
+ mLightKeyboardPref.setText(temp);
+ }
+ mLightKeyboardPref.setOnPreferenceChangeListener(this);
}
private void updateDisplayRotationPreferenceDescription() {
@@ -429,6 +467,18 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
writeFontSizePreference(objValue);
}
+ if (KEY_LIGHT_LCD.equals(key)) {
+ Utils.fileWriteOneLine(LIGHT_LCD_FILE, (String) objValue);
+ }
+
+ if (KEY_LIGHT_BUTTON.equals(key)) {
+ Utils.fileWriteOneLine(LIGHT_BUTTON_FILE, (String) objValue);
+ }
+
+ if (KEY_LIGHT_KEYBOARD.equals(key)) {
+ Utils.fileWriteOneLine(LIGHT_KEYBOARD_FILE, (String) objValue);
+ }
+
return true;
}
}
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 47cbfe0..6df1237 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -32,6 +32,7 @@ import android.os.UserId;
import android.os.Vibrator;
import android.preference.CheckBoxPreference;
import android.preference.ListPreference;
+import android.preference.EditTextPreference;
import android.preference.Preference;
import android.preference.Preference.OnPreferenceChangeListener;
import android.preference.PreferenceGroup;
@@ -44,6 +45,7 @@ import android.util.Log;
import com.android.internal.widget.LockPatternUtils;
import java.util.ArrayList;
+import java.io.File;
/**
* Gesture lock pattern settings.
@@ -72,6 +74,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
private static final String KEY_SHOW_PASSWORD = "show_password";
private static final String KEY_RESET_CREDENTIALS = "reset_credentials";
private static final String KEY_TOGGLE_INSTALL_APPLICATIONS = "toggle_install_applications";
+ public static final String KEY_BOOT_PINCODE = "boot_pincode";
private static final String KEY_POWER_INSTANTLY_LOCKS = "power_button_instantly_locks";
private static final String SLIDE_LOCK_DELAY_TOGGLE = "slide_lock_delay_toggle";
private static final String SLIDE_LOCK_TIMEOUT_DELAY = "slide_lock_timeout_delay";
@@ -83,6 +86,8 @@ public class SecuritySettings extends SettingsPreferenceFragment
private static final String KEY_SMS_SECURITY_CHECK_PREF = "sms_security_check_limit";
public static final String KEY_VIBRATE_PREF = "lockscreen_vibrate";
+ public static final String BOOT_PINCODE_FILE = "/cache/pin/code";
+
DevicePolicyManager mDPM;
private ChooseLockSettingsHelper mChooseLockSettingsHelper;
@@ -108,6 +113,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
private Preference mResetCredentials;
private CheckBoxPreference mToggleAppInstallation;
+ private EditTextPreference mBootPincode;
private DialogInterface mWarnInstallApps;
private CheckBoxPreference mPowerButtonInstantlyLocks;
@@ -359,6 +365,9 @@ public class SecuritySettings extends SettingsPreferenceFragment
mToggleAppInstallation = (CheckBoxPreference) findPreference(
KEY_TOGGLE_INSTALL_APPLICATIONS);
mToggleAppInstallation.setChecked(isNonMarketAppsAllowed());
+ mBootPincode = (EditTextPreference) findPreference(
+ KEY_BOOT_PINCODE);
+ mBootPincode.setOnPreferenceChangeListener(this);
}
boolean isTelephony = pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY);
@@ -702,6 +711,14 @@ public class SecuritySettings extends SettingsPreferenceFragment
Settings.Secure.putInt(getContentResolver(), Settings.Secure.SMS_OUTGOING_CHECK_MAX_COUNT,
smsSecurityCheck);
updateSmsSecuritySummary(smsSecurityCheck);
+ } else if (preference == mBootPincode) {
+ String pincode = (String)value;
+ if (pincode != null && pincode.length() == 4)
+ Utils.fileWriteOneLine(BOOT_PINCODE_FILE, pincode);
+ else {
+ File pfile = new File(SecuritySettings.BOOT_PINCODE_FILE);
+ pfile.delete();
+ }
}
return true;
}
diff --git a/src/com/android/settings/cyanogenmod/BootReceiver.java b/src/com/android/settings/cyanogenmod/BootReceiver.java
index 0704a66..8dc13db 100644
--- a/src/com/android/settings/cyanogenmod/BootReceiver.java
+++ b/src/com/android/settings/cyanogenmod/BootReceiver.java
@@ -17,17 +17,27 @@
package com.android.settings.cyanogenmod;
import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.SystemProperties;
import android.preference.PreferenceManager;
+import android.provider.Settings;
+import android.provider.Settings.SettingNotFoundException;
import android.util.Log;
import com.android.settings.Utils;
+import com.android.settings.SecuritySettings;
+import com.android.settings.DisplaySettings;
+
+import com.google.common.base.Joiner;
import java.util.Arrays;
import java.util.List;
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.File;
public class BootReceiver extends BroadcastReceiver {
@@ -36,6 +46,7 @@ public class BootReceiver extends BroadcastReceiver {
private static final String CPU_SETTINGS_PROP = "sys.cpufreq.restored";
private static final String IOSCHED_SETTINGS_PROP = "sys.iosched.restored";
private static final String KSM_SETTINGS_PROP = "sys.ksm.restored";
+ private static final String MEMORY_SETTINGS_PROP = "sys.memory.restored";
@Override
public void onReceive(Context ctx, Intent intent) {
@@ -64,45 +75,198 @@ public class BootReceiver extends BroadcastReceiver {
SystemProperties.set(KSM_SETTINGS_PROP, "false");
}
}
+
+ if (SystemProperties.getBoolean(MEMORY_SETTINGS_PROP, false) == false
+ && intent.getAction().equals(Intent.ACTION_BOOT_COMPLETED)) {
+ SystemProperties.set(MEMORY_SETTINGS_PROP, "true");
+ configureMemory(ctx);
+ } else {
+ SystemProperties.set(MEMORY_SETTINGS_PROP, "false");
+ }
+
+ SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx);
+
+ // Restore pin code
+ try {
+ String pincode = prefs.getString(SecuritySettings.KEY_BOOT_PINCODE, null);
+ if (pincode != null && pincode.length() == 4)
+ Utils.fileWriteOneLine(SecuritySettings.BOOT_PINCODE_FILE, pincode);
+ else {
+ File pfile = new File(SecuritySettings.BOOT_PINCODE_FILE);
+ pfile.delete();
+ }
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ // Copy owner info
+ try {
+ final ContentResolver res = ctx.getContentResolver();
+ final boolean ownerInfoEnabled = Settings.Secure.getInt(res,
+ Settings.Secure.LOCK_SCREEN_OWNER_INFO_ENABLED, 1) != 0;
+ String owner = ownerInfoEnabled ?
+ Settings.Secure.getString(res, Settings.Secure.LOCK_SCREEN_OWNER_INFO) : null;
+ if (owner == null) {
+ File pfile = new File("/cache/pin/owner");
+ pfile.delete();
+ }
+ else
+ Utils.fileWriteOneLine("/cache/pin/owner", owner.replace("\n", " ").replace("\r", " "));
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ // Restore light settings
+ try {
+ String lcd_light = prefs.getString(DisplaySettings.KEY_LIGHT_LCD, null);
+ if (lcd_light != null && lcd_light.length() > 0) {
+ Utils.fileWriteOneLine(DisplaySettings.LIGHT_LCD_FILE, lcd_light);
+ }
+ String button_light = prefs.getString(DisplaySettings.KEY_LIGHT_BUTTON, null);
+ if (button_light != null && button_light.length() > 0) {
+ Utils.fileWriteOneLine(DisplaySettings.LIGHT_BUTTON_FILE, button_light);
+ }
+ String keyboard_light = prefs.getString(DisplaySettings.KEY_LIGHT_KEYBOARD, null);
+ if (keyboard_light != null && keyboard_light.length() > 0) {
+ Utils.fileWriteOneLine(DisplaySettings.LIGHT_KEYBOARD_FILE, keyboard_light);
+ }
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ }
}
private void configureCPU(Context ctx) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx);
if (prefs.getBoolean(Processor.SOB_PREF, false) == false) {
- Log.i(TAG, "Restore disabled by user preference.");
+ Log.i(TAG, "CPU: restore disabled by user preference.");
return;
}
- String governor = prefs.getString(Processor.GOV_PREF, null);
- String minFrequency = prefs.getString(Processor.FREQ_MIN_PREF, null);
- String maxFrequency = prefs.getString(Processor.FREQ_MAX_PREF, null);
- String availableFrequenciesLine = Utils.fileReadOneLine(Processor.FREQ_LIST_FILE);
- String availableGovernorsLine = Utils.fileReadOneLine(Processor.GOV_LIST_FILE);
- boolean noSettings = ((availableGovernorsLine == null) || (governor == null)) &&
- ((availableFrequenciesLine == null) || ((minFrequency == null) && (maxFrequency == null)));
- List<String> frequencies = null;
- List<String> governors = null;
+ try {
+ String governor = prefs.getString(Processor.GOV_PREF, null);
+ String minFrequency = prefs.getString(Processor.FREQ_MIN_PREF, null);
+ String maxFrequency = prefs.getString(Processor.FREQ_MAX_PREF, null);
+ String availableFrequenciesLine = Utils.fileReadOneLine(Processor.FREQ_LIST_FILE);
+ String availableGovernorsLine = Utils.fileReadOneLine(Processor.GOV_LIST_FILE);
+ boolean noSettings = ((availableGovernorsLine == null) || (governor == null)) &&
+ ((availableFrequenciesLine == null) || ((minFrequency == null) && (maxFrequency == null)));
+ List<String> frequencies = null;
+ List<String> governors = null;
- if (noSettings) {
- Log.d(TAG, "No CPU settings saved. Nothing to restore.");
- } else {
- if (availableGovernorsLine != null){
- governors = Arrays.asList(availableGovernorsLine.split(" "));
- }
- if (availableFrequenciesLine != null){
- frequencies = Arrays.asList(availableFrequenciesLine.split(" "));
- }
- if (governor != null && governors != null && governors.contains(governor)) {
- Utils.fileWriteOneLine(Processor.GOV_FILE, governor);
- }
- if (maxFrequency != null && frequencies != null && frequencies.contains(maxFrequency)) {
- Utils.fileWriteOneLine(Processor.FREQ_MAX_FILE, maxFrequency);
+ if (noSettings) {
+ Log.d(TAG, "No CPU settings saved. Nothing to restore.");
+ } else {
+ if (availableGovernorsLine != null){
+ governors = Arrays.asList(availableGovernorsLine.split(" "));
+ }
+ if (availableFrequenciesLine != null){
+ frequencies = Arrays.asList(availableFrequenciesLine.split(" "));
+ }
+ if (governor != null && governors != null && governors.contains(governor)) {
+ Utils.fileWriteOneLine(Processor.GOV_FILE, governor);
+ }
+ if (maxFrequency != null && frequencies != null && frequencies.contains(maxFrequency)) {
+ Utils.fileWriteOneLine(Processor.FREQ_MAX_FILE, maxFrequency);
+ }
+ if (minFrequency != null && frequencies != null && frequencies.contains(minFrequency)) {
+ Utils.fileWriteOneLine(Processor.FREQ_MIN_FILE, minFrequency);
+ }
+ Log.d(TAG, "CPU settings restored.");
}
- if (minFrequency != null && frequencies != null && frequencies.contains(minFrequency)) {
- Utils.fileWriteOneLine(Processor.FREQ_MIN_FILE, minFrequency);
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ // Smartass
+ try {
+ String file;
+
+ String awake_ideal_freq = prefs.getString(Processor.SMARTASS_AWAKE_IDEAL_FREQ_PREF, null);
+ String sleep_ideal_freq = prefs.getString(Processor.SMARTASS_SLEEP_IDEAL_FREQ_PREF, null);
+ String sleep_wakeup_freq = prefs.getString(Processor.SMARTASS_SLEEP_WAKEUP_FREQ_PREF, null);
+ String max_cpu_load = prefs.getString(Processor.SMARTASS_MAX_CPU_LOAD_PREF, null);
+ String min_cpu_load = prefs.getString(Processor.SMARTASS_MIN_CPU_LOAD_PREF, null);
+ String ramp_up_step = prefs.getString(Processor.SMARTASS_RAMP_UP_STEP_PREF, null);
+ String ramp_down_step = prefs.getString(Processor.SMARTASS_RAMP_DOWN_STEP_PREF, null);
+ String up_rate_us = prefs.getString(Processor.SMARTASS_UP_RATE_US_PREF, null);
+ String down_rate_us = prefs.getString(Processor.SMARTASS_DOWN_RATE_PREF, null);
+ String boost_enabled = (prefs.getBoolean(Processor.SMARTASS_BOOST_ENABLED_PREF, false) ? "1" : "0");
+
+ file = String.format(Processor.SMARTASS_AWAKE_IDEAL_FREQ_FILE, Processor.getSmartass());
+ if (awake_ideal_freq != null && Utils.fileExists(file))
+ Utils.fileWriteOneLine(file, awake_ideal_freq);
+
+ file = String.format(Processor.SMARTASS_SLEEP_IDEAL_FREQ_FILE, Processor.getSmartass());
+ if (sleep_ideal_freq != null && Utils.fileExists(file))
+ Utils.fileWriteOneLine(file, sleep_ideal_freq);
+
+ file = String.format(Processor.SMARTASS_SLEEP_WAKEUP_FREQ_FILE, Processor.getSmartass());
+ if (sleep_wakeup_freq != null && Utils.fileExists(file))
+ Utils.fileWriteOneLine(file, sleep_wakeup_freq);
+
+ file = String.format(Processor.SMARTASS_MAX_CPU_LOAD_FILE, Processor.getSmartass());
+ if (max_cpu_load != null && Utils.fileExists(file))
+ Utils.fileWriteOneLine(file, max_cpu_load);
+
+ file = String.format(Processor.SMARTASS_MIN_CPU_LOAD_FILE, Processor.getSmartass());
+ if (min_cpu_load != null && Utils.fileExists(file))
+ Utils.fileWriteOneLine(file, min_cpu_load);
+
+ file = String.format(Processor.SMARTASS_RAMP_UP_STEP_FILE, Processor.getSmartass());
+ if (ramp_up_step != null && Utils.fileExists(file))
+ Utils.fileWriteOneLine(file, Processor.by1000(ramp_up_step));
+
+ file = String.format(Processor.SMARTASS_RAMP_DOWN_STEP_FILE, Processor.getSmartass());
+ if (ramp_down_step != null && Utils.fileExists(file))
+ Utils.fileWriteOneLine(file, Processor.by1000(ramp_down_step));
+
+ file = String.format(Processor.SMARTASS_UP_RATE_US_FILE, Processor.getSmartass());
+ if (up_rate_us != null && Utils.fileExists(file))
+ Utils.fileWriteOneLine(file, Processor.by1000(up_rate_us));
+
+ file = String.format(Processor.SMARTASS_DOWN_RATE_US_FILE, Processor.getSmartass());
+ if (down_rate_us != null && Utils.fileExists(file))
+ Utils.fileWriteOneLine(file, Processor.by1000(down_rate_us));
+
+ file = String.format(Processor.SMARTASS_BOOST_ENABLED_FILE, Processor.getSmartass());
+ if (boost_enabled != null && Utils.fileExists(file))
+ Utils.fileWriteOneLine(file, boost_enabled);
+
+ Log.d(TAG, "Smartass settings restored.");
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ // Voltage
+ if (Utils.fileExists(Processor.VDD_LEVELS_FILE)) {
+ BufferedReader vddReader;
+ try {
+ vddReader = new BufferedReader(new FileReader(Processor.VDD_LEVELS_FILE), 512);
+ try {
+ String line = null;
+ while ((line = vddReader.readLine()) != null) {
+ String freq = line.split(":")[0].trim();
+ String oldMv = line.split(":")[1].trim();
+ String pref = Processor.VDD_LEVELS_PREF + freq;
+ String newMv = prefs.getString(pref, null);
+ if (newMv != null && newMv != oldMv) {
+ Log.d(TAG, pref + " freq=" + freq + " value=" + newMv + " old=" + oldMv);
+ Utils.fileWriteOneLine(Processor.VDD_LEVELS_FILE, String.format("%s %s", freq, newMv));
+ }
+ }
+ Log.d(TAG, "Voltage settings restored.");
+ } finally {
+ vddReader.close();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
}
- Log.d(TAG, "CPU settings restored.");
}
}
@@ -114,21 +278,40 @@ public class BootReceiver extends BroadcastReceiver {
return;
}
- String ioscheduler = prefs.getString(IOScheduler.IOSCHED_PREF, null);
- String availableIOSchedulersLine = Utils.fileReadOneLine(IOScheduler.IOSCHED_LIST_FILE);
- boolean noSettings = ((availableIOSchedulersLine == null) || (ioscheduler == null));
- List<String> ioschedulers = null;
+ // I/O scheduler
+ try {
+ String ioscheduler = prefs.getString(IOScheduler.IOSCHED_PREF, null);
+ String availableIOSchedulersLine = Utils.fileReadOneLine(IOScheduler.IOSCHED_LIST_FILE);
+ boolean noSettings = ((availableIOSchedulersLine == null) || (ioscheduler == null));
+ List<String> ioschedulers = null;
- if (noSettings) {
- Log.d(TAG, "No I/O scheduler settings saved. Nothing to restore.");
- } else {
- if (availableIOSchedulersLine != null){
- ioschedulers = Arrays.asList(availableIOSchedulersLine.replace("[", "").replace("]", "").split(" "));
+ if (noSettings) {
+ Log.d(TAG, "No I/O scheduler settings saved. Nothing to restore.");
+ } else {
+ if (availableIOSchedulersLine != null){
+ ioschedulers = Arrays.asList(availableIOSchedulersLine.replace("[", "").replace("]", "").split(" "));
+ }
+ if (ioscheduler != null && ioschedulers != null && ioschedulers.contains(ioscheduler)) {
+ Utils.fileWriteOneLine(IOScheduler.IOSCHED_LIST_FILE, ioscheduler);
+ }
+ Log.d(TAG, "I/O scheduler settings restored.");
}
- if (ioscheduler != null && ioschedulers != null && ioschedulers.contains(ioscheduler)) {
- Utils.fileWriteOneLine(IOScheduler.IOSCHED_LIST_FILE, ioscheduler);
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ // fsync
+ try {
+ if (Utils.fileExists(IOScheduler.FSYNC_FILE)) {
+ String fsync = (prefs.getBoolean(IOScheduler.FSYNC_PREF, true) ? "Y" : "N");
+ Log.d(TAG, "fsync=" + fsync);
+ Utils.fileWriteOneLine(IOScheduler.FSYNC_FILE, fsync);
+ Log.d(TAG, "fsync restored.");
}
- Log.d(TAG, "I/O scheduler settings restored.");
+ }
+ catch (Exception e) {
+ e.printStackTrace();
}
}
@@ -140,4 +323,51 @@ public class BootReceiver extends BroadcastReceiver {
Utils.fileWriteOneLine(MemoryManagement.KSM_RUN_FILE, ksm ? "1" : "0");
Log.d(TAG, "KSM settings restored.");
}
+
+ private void configureMemory(Context ctx) {
+ SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx);
+
+ // Autogroup
+ try {
+ if (Utils.fileExists(MemoryManagement.AUTOGROUP_FILE)) {
+ String autogroup = (prefs.getBoolean(MemoryManagement.AUTOGROUP_PREF, true) ? "1" : "0");
+ Log.d(TAG, "Autogroup=" + autogroup);
+ Utils.fileWriteOneLine(MemoryManagement.AUTOGROUP_FILE, autogroup);
+ Log.d(TAG, "Autogroup restored.");
+ }
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ if (prefs.getBoolean(MemoryManagement.LOWMEM_SOB_PREF, false) == false) {
+ Log.i(TAG, "Lowmem: restore disabled by user preference.");
+ return;
+ }
+
+ // Lowmem
+ try {
+ String temp;
+ if (Utils.fileExists(MemoryManagement.LOWMEM_FILE) &&
+ (temp = Utils.fileReadOneLine(MemoryManagement.LOWMEM_FILE)) != null) {
+ String[] lowmem = Utils.fileReadOneLine(MemoryManagement.LOWMEM_FILE).split(",");
+ Log.d(TAG, "lowmem before=" + Joiner.on(",").join(lowmem));
+ if (lowmem.length == 6) {
+ lowmem[0] = MemoryManagement.toPages(prefs.getString(MemoryManagement.LOWMEM_FOREGROUND_APP_PREF, MemoryManagement.fromPages(lowmem[0])));
+ lowmem[1] = MemoryManagement.toPages(prefs.getString(MemoryManagement.LOWMEM_VISIBLE_APP_PREF, MemoryManagement.fromPages(lowmem[1])));
+ lowmem[2] = MemoryManagement.toPages(prefs.getString(MemoryManagement.LOWMEM_SECONDARY_SERVER_APP_PREF, MemoryManagement.fromPages(lowmem[2])));
+ lowmem[3] = MemoryManagement.toPages(prefs.getString(MemoryManagement.LOWMEM_HIDDEN_APP_PREF, MemoryManagement.fromPages(lowmem[3])));
+ lowmem[4] = MemoryManagement.toPages(prefs.getString(MemoryManagement.LOWMEM_CONTENT_PROVIDER_PREF, MemoryManagement.fromPages(lowmem[4])));
+ lowmem[5] = MemoryManagement.toPages(prefs.getString(MemoryManagement.LOWMEM_EMPTY_APP_PREF, MemoryManagement.fromPages(lowmem[5])));
+ temp = Joiner.on(",").join(lowmem);
+ Log.d(TAG, "lowmem after=" + temp);
+ Utils.fileWriteOneLine(MemoryManagement.LOWMEM_FILE, temp);
+ Log.d(TAG, "Low memory killer values restored.");
+ }
+ }
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
}
diff --git a/src/com/android/settings/cyanogenmod/IOScheduler.java b/src/com/android/settings/cyanogenmod/IOScheduler.java
index 68142c5..a8d6524 100644
--- a/src/com/android/settings/cyanogenmod/IOScheduler.java
+++ b/src/com/android/settings/cyanogenmod/IOScheduler.java
@@ -19,6 +19,7 @@ package com.android.settings.cyanogenmod;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
+import android.preference.CheckBoxPreference;
import android.preference.ListPreference;
import android.preference.Preference;
import android.preference.PreferenceScreen;
@@ -35,6 +36,8 @@ public class IOScheduler extends SettingsPreferenceFragment implements
public static final String IOSCHED_PREF = "pref_io_sched";
public static final String IOSCHED_LIST_FILE = "/sys/block/mmcblk0/queue/scheduler";
+ public static final String FSYNC_PREF = "pref_fsync";
+ public static final String FSYNC_FILE = "/sys/module/sync/parameters/fsync_enabled";
public static final String SOB_PREF = "pref_io_sched_set_on_boot";
@@ -43,6 +46,7 @@ public class IOScheduler extends SettingsPreferenceFragment implements
private String mIOSchedulerFormat;
private ListPreference mIOSchedulerPref;
+ private CheckBoxPreference mFsyncPref;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -60,6 +64,7 @@ public class IOScheduler extends SettingsPreferenceFragment implements
PreferenceScreen prefScreen = getPreferenceScreen();
mIOSchedulerPref = (ListPreference) prefScreen.findPreference(IOSCHED_PREF);
+ mFsyncPref = (CheckBoxPreference) prefScreen.findPreference(FSYNC_PREF);
/* I/O scheduler
Some systems might not use I/O schedulers */
@@ -81,6 +86,14 @@ public class IOScheduler extends SettingsPreferenceFragment implements
mIOSchedulerPref.setSummary(String.format(mIOSchedulerFormat, currentIOScheduler));
mIOSchedulerPref.setOnPreferenceChangeListener(this);
}
+
+ String temp;
+ if (!Utils.fileExists(FSYNC_FILE) || (temp = Utils.fileReadOneLine(FSYNC_FILE)) == null) {
+ mFsyncPref.setEnabled(false);
+ } else {
+ mFsyncPref.setChecked(!temp.startsWith("N"));
+ mFsyncPref.setOnPreferenceChangeListener(this);
+ }
}
@Override
@@ -109,6 +122,10 @@ public class IOScheduler extends SettingsPreferenceFragment implements
if (preference == mIOSchedulerPref) {
fname = IOSCHED_LIST_FILE;
}
+ else if (preference == mFsyncPref) {
+ fname = FSYNC_FILE;
+ newValue = (newValue.toString().equals("true") ? "Y" : "N");
+ }
if (Utils.fileWriteOneLine(fname, (String) newValue)) {
if (preference == mIOSchedulerPref) {
diff --git a/src/com/android/settings/cyanogenmod/MemoryManagement.java b/src/com/android/settings/cyanogenmod/MemoryManagement.java
index 8626b06..8f41b7c 100644
--- a/src/com/android/settings/cyanogenmod/MemoryManagement.java
+++ b/src/com/android/settings/cyanogenmod/MemoryManagement.java
@@ -22,14 +22,20 @@ import android.os.Bundle;
import android.os.SystemProperties;
import android.preference.CheckBoxPreference;
import android.preference.ListPreference;
+import android.preference.EditTextPreference;
import android.preference.Preference;
import android.preference.Preference.OnPreferenceChangeListener;
import android.preference.PreferenceScreen;
+import android.widget.Toast;
+import android.view.Gravity;
+import android.util.Log;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
+import com.google.common.base.Joiner;
+
public class MemoryManagement extends SettingsPreferenceFragment implements
OnPreferenceChangeListener {
@@ -53,11 +59,39 @@ public class MemoryManagement extends SettingsPreferenceFragment implements
private static final String PURGEABLE_ASSETS_DEFAULT = "0";
+ public static final String AUTOGROUP_FILE = "/proc/sys/kernel/sched_autogroup_enabled";
+ public static final String AUTOGROUP_PREF = "pref_autogroup";
+
+ public static final String LOWMEM_FILE = "/sys/module/lowmemorykiller/parameters/minfree";
+ public static final String LOWMEM_FOREGROUND_APP_PREF = "pref_lowmem_foreground_app";
+ public static final String LOWMEM_VISIBLE_APP_PREF = "pref_lowmem_visible_app";
+ public static final String LOWMEM_SECONDARY_SERVER_APP_PREF = "pref_lowmem_secondary_server_app";
+ public static final String LOWMEM_HIDDEN_APP_PREF = "pref_lowmem_hidden_app";
+ public static final String LOWMEM_CONTENT_PROVIDER_PREF = "pref_lowmem_content_provider";
+ public static final String LOWMEM_EMPTY_APP_PREF = "pref_lowmem_empty_app";
+ public static final String LOWMEM_SOB_PREF = "pref_lowmem_set_on_boot";
+
+ private static final String TAG = "MemoryManagement";
+
private ListPreference mzRAM;
private CheckBoxPreference mPurgeableAssetsPref;
-
private CheckBoxPreference mKSMPref;
+ private CheckBoxPreference mAutogroupPref;