PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,873 Commits 1 Branch 0 Tags
56cf400bab81a9b0675a635c9ea75fb85543c07c
Commit Graph

59873 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
88416ffaf6 Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473 
Change-Id: Ie864fbbc9631721b9f9fe4259cb13651dd135926
 2020-03-01 03:34:25 +00:00
Automerger Merge Worker
c3ab634078 Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473 
Change-Id: Ic92989a2d2a096c06d59039b6359e869855edf84
 2020-03-01 03:34:09 +00:00
tim peng
3248376473 Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev 2020-03-01 03:22:29 +00:00
Bonian Chen
1b8174689d [Settings] Remove unused string for erease eSIM 
Remove strings added by ag/6804404 which are no longer required by b/132114333.

Bug: 133790033
Test: build pass
Change-Id: I3ce375efd04164cf93cff2c89436e222df14bfeb
 2020-03-01 01:19:44 +00:00
Automerger Merge Worker
ff869ca0be Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2 am: 90551d0a85 am: cb914954a7 am: 38ae332818 
Change-Id: I439e9b293b7187f20cd1623394ad9585897dabe9
 2020-02-29 06:17:22 +00:00
Automerger Merge Worker
75158ec079 Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2 am: 91f7309d5d am: 9a3a819ec5 am: aff183a602 
Change-Id: I788ce13ef056a2be544d58c5586e6f87ff595794
 2020-02-29 06:17:17 +00:00
Automerger Merge Worker
3a9220c1f7 Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2 am: 90551d0a85 am: 93ae61af3e am: b699a66c0a 
Change-Id: Ia7e731ecf2e9629556db26b54e54eac6eb191d8b
 2020-02-29 06:17:04 +00:00
Automerger Merge Worker
38ae332818 Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2 am: 90551d0a85 am: cb914954a7 
Change-Id: I99353e23fd66af73c91c36e69201d6049e2bb746
 2020-02-29 06:05:59 +00:00
Automerger Merge Worker
aff183a602 Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2 am: 91f7309d5d am: 9a3a819ec5 
Change-Id: I62d738fda960c6c3fb810b565e81305455224b31
 2020-02-29 06:05:45 +00:00
Automerger Merge Worker
b699a66c0a Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2 am: 90551d0a85 am: 93ae61af3e 
Change-Id: Idb8ee8b1c3ae8f0e95382cae5f9f70bfb68001ba
 2020-02-29 06:05:40 +00:00
Automerger Merge Worker
9a3a819ec5 Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2 am: 91f7309d5d 
Change-Id: I07df3083ac3d41892219c3aedfdc361ecff4be0b
 2020-02-29 05:52:31 +00:00
Automerger Merge Worker
cb914954a7 Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2 am: 90551d0a85 
Change-Id: I19ab18c1e05dc1f559351de60057e2281aa3f790
 2020-02-29 05:52:30 +00:00
Automerger Merge Worker
93ae61af3e Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2 am: 90551d0a85 
Change-Id: I22933fd2237bd866d8960c75b2a874401b71ffd2
 2020-02-29 05:52:23 +00:00
Automerger Merge Worker
91f7309d5d Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2 
Change-Id: I7da82152579dd6934937881fecb28ea056fd5937
 2020-02-29 05:39:01 +00:00
Automerger Merge Worker
90551d0a85 Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2 
Change-Id: Iea24224c2f7137619e7faf123914cb360283da05
 2020-02-29 05:38:56 +00:00
TreeHugger Robot
9229504fe2 Merge "Fix notification history crash & layout" into rvc-dev 2020-02-29 05:23:07 +00:00
Automerger Merge Worker
8ee7371ccc [automerger skipped] DO NOT MERGE - Skip QQ2A.200305.003 in stage-aosp-master am: 9fe7d6c59b -s ours am: bf69895603 am: 72fb16ae89 am: 17740a5bd7 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ib5592d7846bc8dbdae19f3f956ebdf8cd5bc1307
 2020-02-29 05:04:19 +00:00
Automerger Merge Worker
17740a5bd7 [automerger skipped] DO NOT MERGE - Skip QQ2A.200305.003 in stage-aosp-master am: 9fe7d6c59b -s ours am: bf69895603 am: 72fb16ae89 
Change-Id: Ib043ba0cf494a8ea4877dc031f89a214dc0830a3
 2020-02-29 04:51:40 +00:00
Automerger Merge Worker
72fb16ae89 [automerger skipped] DO NOT MERGE - Skip QQ2A.200305.003 in stage-aosp-master am: 9fe7d6c59b -s ours am: bf69895603 
Change-Id: I3eb7c7c5d4dd76991fdc8a098ae441b69b30f3b3
 2020-02-29 04:35:48 +00:00
Automerger Merge Worker
bf69895603 [automerger skipped] DO NOT MERGE - Skip QQ2A.200305.003 in stage-aosp-master am: 9fe7d6c59b -s ours 
am skip reason: subject contains skip directive

Change-Id: I5c3fb50f656ded58064ae0e18424ea9f9b0ba429
 2020-02-29 04:20:58 +00:00
Julia Reynolds
291ee404c2 Fix notification history crash & layout 
- Fix occasional crash on device boot
- No more overlapping text

Test: manual
Fixes: 150326599
Fixes: 149767075
Change-Id: I3032a2913f2ca4ce57af596c180faa819e4c9363
 2020-02-28 16:16:44 -05:00
Quang Luong
834b0ade20 [WifiSettings2] Remove redundant save() call for new configs 
Removing call to WifiManager#save() when configuring a new network
through tapping it in the wifi picker. Since WifiManager#connect()
already saves the passed in WifiConfiguration, the call to
WifiManager#save() is redundant.

Bug: 149579116
Test: build, manual verification by connecting to a new secure network
Change-Id: I9242e7fd7e9a459e8221b6bb491ab67833970e87
 2020-02-28 12:58:36 -08:00
Automerger Merge Worker
7b915a8ae6 [automerger skipped] Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec am: 47efc875da -s ours am: b60e1c38fe -s ours am: f22c895c79 -s ours 
am skip reason: Change-Id Ic855100723b8604c1e872457a70fd8f25d225278 with SHA-1 b10babebd0 is in history

Change-Id: I19c4b5c3be3305511c69b60eb89c706a82b7f345
 2020-02-28 17:46:10 +00:00
Automerger Merge Worker
4072eededd [automerger skipped] Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec am: d858122105 am: 857753c2bc -s ours am: ad16af86f1 -s ours 
am skip reason: Change-Id Ic855100723b8604c1e872457a70fd8f25d225278 with SHA-1 b10babebd0 is in history

Change-Id: Ie8555ad5fb7ea11aa14dd8b0898ad12420d515ff
 2020-02-28 17:45:47 +00:00
Automerger Merge Worker
67174cc61e [automerger skipped] Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec am: d858122105 am: bad7d5578b am: da7bd9223d -s ours 
am skip reason: Change-Id Ic855100723b8604c1e872457a70fd8f25d225278 with SHA-1 bda277b3b6 is in history

Change-Id: Ib3c96c44cc7b92e72dbfe866cc6514bcdce617b2
 2020-02-28 17:43:11 +00:00
Automerger Merge Worker
f22c895c79 [automerger skipped] Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec am: 47efc875da -s ours am: b60e1c38fe -s ours 
am skip reason: Change-Id Ic855100723b8604c1e872457a70fd8f25d225278 with SHA-1 b10babebd0 is in history

Change-Id: Icd214fb2d7c25831d0de6ca6adda43fb15ace454
 2020-02-28 17:25:29 +00:00
Automerger Merge Worker
ad16af86f1 [automerger skipped] Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec am: d858122105 am: 857753c2bc -s ours 
am skip reason: Change-Id Ic855100723b8604c1e872457a70fd8f25d225278 with SHA-1 b10babebd0 is in history

Change-Id: I8049d17b31fa4c6ad301852190ba08662879e2d8
 2020-02-28 17:25:05 +00:00
Automerger Merge Worker
da7bd9223d Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec am: d858122105 am: bad7d5578b 
Change-Id: I19ae57751e6881d43c6ea6371f7e1b14d6c4a22b
 2020-02-28 17:23:57 +00:00
Automerger Merge Worker
b60e1c38fe [automerger skipped] Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec am: 47efc875da -s ours 
am skip reason: Change-Id Ic855100723b8604c1e872457a70fd8f25d225278 with SHA-1 b10babebd0 is in history

Change-Id: I60cc7ebaa0aeb133bc5d6d0c2f5d492f2b4efed7
 2020-02-28 17:11:52 +00:00
Automerger Merge Worker
bad7d5578b Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec am: d858122105 
Change-Id: I020c2888494297e7ff381d745a80ff8a452ea801
 2020-02-28 17:11:31 +00:00
Automerger Merge Worker
857753c2bc Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec am: d858122105 
Change-Id: Ida95e5c4508b65ad2dee5478c5be4902024c9e0a
 2020-02-28 17:11:24 +00:00
Automerger Merge Worker
5af195ff27 Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1 am: 31899646f8 am: 4b2be4b738 am: 717553a1d3 
Change-Id: I9586461de00c135a392587eca574cb247de21bea
 2020-02-28 17:10:29 +00:00
Automerger Merge Worker
f3b08636d5 Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1 am: 54575ffdfa am: c311369f40 am: 46bc1d437c 
Change-Id: Ieab106f4dcec18d6d54c666a2a8cc3085df54707
 2020-02-28 17:10:04 +00:00
Automerger Merge Worker
0a01900d90 Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1 am: 54575ffdfa am: 6550b96794 am: 44c4818f76 
Change-Id: I05c43bd13bf3b1ab574eda3cee065c6c4bea669a
 2020-02-28 17:09:33 +00:00
Automerger Merge Worker
d858122105 Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec 
Change-Id: I4f4f4356a2b481a18b5aeffdcd72c4f0a23658a2
 2020-02-28 16:56:34 +00:00
Automerger Merge Worker
47efc875da Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec 
Change-Id: Iead26d883a75dc45269a9f060ea74a6b8aae3084
 2020-02-28 16:55:59 +00:00
Automerger Merge Worker
717553a1d3 Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1 am: 31899646f8 am: 4b2be4b738 
Change-Id: I7ec73431763e38843914ef24fcb06496f61749fc
 2020-02-28 16:54:28 +00:00
Automerger Merge Worker
46bc1d437c Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1 am: 54575ffdfa am: c311369f40 
Change-Id: I5c15355f8d8e912b54f0dfe2f1ebbba1c8b69969
 2020-02-28 16:54:22 +00:00
Automerger Merge Worker
44c4818f76 Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1 am: 54575ffdfa am: 6550b96794 
Change-Id: I43df9d5db24c57af93addc7ac3110d7654b17a03
 2020-02-28 16:54:06 +00:00
Sarah Chin
f7fe2b0dec Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev 2020-02-28 16:48:41 +00:00
Automerger Merge Worker
c311369f40 Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1 am: 54575ffdfa 
Change-Id: Id380c299d304da18a1be5678529b62b9fe32f674
 2020-02-28 16:34:23 +00:00
Automerger Merge Worker
4b2be4b738 Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1 am: 31899646f8 
Change-Id: I6b4e151327f47c1330ca07661d3916b5dd7c3ed2
 2020-02-28 16:34:11 +00:00
Automerger Merge Worker
6550b96794 Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1 am: 54575ffdfa 
Change-Id: I2ca3f522a7db1bdd7fd8dab74c378123b8d9a2a3
 2020-02-28 16:33:47 +00:00
Automerger Merge Worker
4fe8922ad4 Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev am: c2153e244b am: 767b00a6e8 am: 4f17dfd7fe am: c6ee91e5b1 
Change-Id: I0204acf7acf706c38f2df6c8b6c8eeec1e76736d
 2020-02-28 16:26:48 +00:00
Automerger Merge Worker
f8bde2b4ce Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev am: c2153e244b am: 9f61f4e415 am: e467048b39 am: 2a7506b793 
Change-Id: I71b82b940186486e20e8499f9b8c662c1eac7f19
 2020-02-28 16:26:30 +00:00
Automerger Merge Worker
c0130ed4be Merge "Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207 am: 48823ea702" into rvc-d1-dev-plus-aosp am: 5889d406c6 am: f927cb1ab3 
Change-Id: Ia8714be4330d201e2cbd97639b5f03647cd1f56d
 2020-02-28 16:25:52 +00:00
Automerger Merge Worker
18aaefda66 Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev am: c2153e244b am: 9f61f4e415 am: e86b816046 am: 5b368251e8 
Change-Id: Ic8a95fea265b22388ea85960e406d27ac331f580
 2020-02-28 16:25:15 +00:00
Automerger Merge Worker
e89813511a Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207 am: d5e10793e5 am: 051020fc6a am: 1197fd7f84 
Change-Id: If26de0d0bae870ab425ca6f160d90222c4670024
 2020-02-28 16:25:03 +00:00
Automerger Merge Worker
4c5cb9315d Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207 am: d5e10793e5 am: c3b12f302b am: 3ce15a6006 
Change-Id: Ia7fb199b387289c7612ed83deef7fc17aef76457
 2020-02-28 16:24:50 +00:00
Automerger Merge Worker
31899646f8 Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1 
Change-Id: Ia318c314d726f84aea16427b50ffb2f569ad44ef
 2020-02-28 16:22:49 +00:00