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

59586 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
5962711f8f Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb 
Change-Id: I5c7a85ba47eb9f069341946957cedbcf084457f0
 2020-03-02 10:13:13 +00:00
Automerger Merge Worker
3248e62e0d Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb 
Change-Id: I339fc21bfa9ecf76e5f0088127bad900df3bb76f
 2020-03-02 10:12:45 +00:00
Automerger Merge Worker
572b728a87 Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d 
Change-Id: I12e169a2271b1c9f10b258bf720f23eeeaf968d4
 2020-03-02 10:12:02 +00:00
Automerger Merge Worker
143575e128 Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d 
Change-Id: Ic4fd81e813044d707d1e3067ed6047c03a67b98c
 2020-03-02 10:11:55 +00:00
Automerger Merge Worker
7cda6b423a Merge "Fix for User edit info dialog during rotation" am: c6603dfda8 
Change-Id: I4f5a29975aed084e1080387d6eb4500121c23ee0
 2020-03-02 10:11:44 +00:00
Treehugger Robot
c6603dfda8 Merge "Fix for User edit info dialog during rotation" 2020-03-02 07:45:36 +00:00
TreeHugger Robot
985b1e8ffb Merge "Fix the button display problem in Dark theme page" into rvc-dev 2020-03-02 07:42:19 +00:00
Jaewan Kim
18e16e416d Merge "Fix MediaSession.Token#equals()" into rvc-dev 2020-03-02 06:28:20 +00:00
Automerger Merge Worker
f3226a5b25 Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4 am: 4e9ab8a65b 
Change-Id: Id0edd2b8f72503b92a04fe68135b61012120e42e
 2020-03-02 05:14:52 +00:00
Automerger Merge Worker
afdfab09f5 Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4 am: 3ea368bc36 
Change-Id: I3f032e01f758caf48a711e432343783cf697af05
 2020-03-02 05:14:41 +00:00
Automerger Merge Worker
4e9ab8a65b Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4 
Change-Id: Id3af44eb9beea5a612e69c25fda4dd26fa22e5c6
 2020-03-02 05:04:50 +00:00
Automerger Merge Worker
3ea368bc36 Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4 
Change-Id: I5ca697af3382e26d3d5e981e972aba269cdad131
 2020-03-02 05:04:44 +00:00
Bonian Chen
1f0c0b18e4 Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev 2020-03-02 04:51:05 +00:00
Sunny Shao
1de4c009ea Fix the button display problem in Dark theme page 
- Dark theme is disabled when Battery save is on.
- Let dark theme page not be searchable when Battery save is on.

Fixes: 150443799
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display.darkmode
Change-Id: I2674499dd64333825765f70ed1f31dcb83e1b895
 2020-03-02 11:59:28 +08:00
Automerger Merge Worker
7dc09bd0ed Merge "Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 am: 2563b5f61d" into rvc-d1-dev-plus-aosp 2020-03-02 01:49:41 +00:00
Automerger Merge Worker
9845b9f08d Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 am: 6b0088679f 
Change-Id: I739b9860174ae08584b0d4c941a9d2976653ec56
 2020-03-02 01:49:37 +00:00
Automerger Merge Worker
275f21d3e7 Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 am: 2563b5f61d 
Change-Id: Ic23a9891a8f667e48c41b0f188a25d5afd4a396e
 2020-03-02 01:49:37 +00:00
Automerger Merge Worker
2563b5f61d Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 
Change-Id: Ifd4be196c59b940bc4888effce73aaf28e50afb8
 2020-03-02 01:39:04 +00:00
Automerger Merge Worker
6b0088679f Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 
Change-Id: I3cccfeaa5e5e5b1e448764a50e503ba02e094f27
 2020-03-02 01:38:51 +00:00
tim peng
d09ecc3e96 Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev 2020-03-02 01:25:09 +00:00
Jaewan Kim
9f9ac53fe6 Fix MediaSession.Token#equals() 
This also fixes the Activity#setMediaController() which previously
ignored because the MediaSessionService failed to find session set to
the foreground activity.

Bug: 149006225
Test: Run MediaActivityTest in CtsMediaTestCases
Change-Id: I18d3097f7b20275a20b1de789be6884f843668ae
 2020-03-02 02:46:44 +09:00
Automerger Merge Worker
4f211b3faa Merge "Only show graphics driver option when the apk is available." into rvc-dev am: f302ee2aff am: bd7f968a1c 
Change-Id: I42faf67d50e8a6ba35e7f8fa7202b08845b69063
 2020-03-01 05:04:00 +00:00
Automerger Merge Worker
d543081a23 Merge "Only show graphics driver option when the apk is available." into rvc-dev am: f302ee2aff am: 2534b7ddf8 
Change-Id: I2b335e3ce004f77b9b2670d63c856a016e4e8c2d
 2020-03-01 05:03:49 +00:00
Automerger Merge Worker
bd7f968a1c Merge "Only show graphics driver option when the apk is available." into rvc-dev am: f302ee2aff 
Change-Id: Iabc6caa61f028cb2a2f5b36a595cc1e6da6c8ec8
 2020-03-01 04:53:23 +00:00
Automerger Merge Worker
2534b7ddf8 Merge "Only show graphics driver option when the apk is available." into rvc-dev am: f302ee2aff 
Change-Id: I8ddf41253e9e5b1b2acd3793d1671b18e6074a0f
 2020-03-01 04:53:09 +00:00
TreeHugger Robot
f302ee2aff Merge "Only show graphics driver option when the apk is available." into rvc-dev 2020-03-01 04:42:02 +00:00
Automerger Merge Worker
309ef55124 Merge "Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473 am: 88416ffaf6" into rvc-d1-dev-plus-aosp 2020-03-01 03:47:20 +00:00
Automerger Merge Worker
d9a9b26030 Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473 am: 88416ffaf6 
Change-Id: I1069a7a2e62c78b98c50f9e6b8eda5dca301b635
 2020-03-01 03:47:12 +00:00
Automerger Merge Worker
0c31cb3f6d Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473 am: c3ab634078 
Change-Id: Ic82d692d4cd8ba491d04e1857705f990e512adc5
 2020-03-01 03:47:08 +00:00
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
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
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
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
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
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
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
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
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
31899646f8 Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1 
Change-Id: Ia318c314d726f84aea16427b50ffb2f569ad44ef
 2020-02-28 16:22:49 +00:00