PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
69,283 Commits 1 Branch 0 Tags
123bcc41c95b02f7cfa130d423699b7983a7429c
Commit Graph

69283 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tim peng
af633d3916 Merge "Display previous active media information" into rvc-dev am: 72638462e1 am: 317f7358e5 am: 435d8f80f1 
Change-Id: Id84b541d0f1a7b4ba55645dde576f498dd22b024
 2020-05-15 03:04:40 +00:00
Automerger Merge Worker
17a295a69c Merge "Merge "Display previous active media information" into rvc-dev am: 72638462e1 am: 56ed13a15b" into rvc-d1-dev-plus-aosp 2020-05-15 02:52:00 +00:00
tim peng
e4ff7aaba5 Merge "Display previous active media information" into rvc-dev am: 72638462e1 am: 56ed13a15b 
Change-Id: I4769ef207da842b6dc161e739e8612c35b6cf54b
 2020-05-15 02:51:56 +00:00
tim peng
435d8f80f1 Merge "Display previous active media information" into rvc-dev am: 72638462e1 am: 317f7358e5 
Change-Id: Ie02ae82be432abf7d6165433950796f5339ae7ac
 2020-05-15 02:51:54 +00:00
tim peng
0bb6fa1f2e Merge "Display previous active media information" into rvc-dev am: 72638462e1 am: 317f7358e5 
Change-Id: I1b7bcda24f1f8928f1a474f574ee36f3a6e05245
 2020-05-15 02:51:35 +00:00
Bill Yi
52508c5ba4 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I27989a7173630bea35b9c3a799e2502475a22744
 2020-05-14 19:45:37 -07:00
tim peng
317f7358e5 Merge "Display previous active media information" into rvc-dev am: 72638462e1 
Change-Id: I3f657555614b3f9e3ccdd3563059c1dfc78f3225
 2020-05-15 02:34:59 +00:00
tim peng
56ed13a15b Merge "Display previous active media information" into rvc-dev am: 72638462e1 
Change-Id: I8f5cabc299a99c27b0b6c68be98cd7d583b8fc95
 2020-05-15 02:34:52 +00:00
PETER LIANG
aee3d3e78d Merge "Refine the banner view for accessibility features." 2020-05-15 02:15:00 +00:00
Benedict Wong
ad2421fe5b Hide IKEv2 VPN options if not supported 
This change hides the VPN type options if the FEATURE_IPSEC_TUNNELS is
not supported on the device.

Bug: 156681625
Test: Manually tested
Change-Id: I3ef2e6144371596380351341e58c4ee84d49f39d
 2020-05-14 19:13:53 -07:00
tim peng
72638462e1 Merge "Display previous active media information" into rvc-dev 2020-05-15 02:10:54 +00:00
Bill Yi
c3a32d92d7 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I195e9df86959b2be7ae5acb097fa62fb152d8bff
 2020-05-14 19:03:03 -07:00
Bill Yi
7a917b74a8 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I9aa331208b21992c33ec194e32624494bfe98f2a
 2020-05-14 18:20:16 -07:00
Jay Aliomer
a19c2e498d Revert "Revert "Unable to select twilight scheduling after enabling location"" am: dba11e82b5 am: b56a6e06cf am: cd8ce49cd9 am: 43a243ccd1 
Change-Id: I2fc767df07c43bed534f4efe21542738a832763a
 2020-05-15 01:02:18 +00:00
Jay Aliomer
9fa5b6e5d9 Revert "Revert "Unable to select twilight scheduling after enabling location"" am: dba11e82b5 am: 7bc6358a8c am: ed7092de24 am: 1856fad39c 
Change-Id: Icad3339c12448584b9abd64e674cf8b8abb52143
 2020-05-15 01:00:47 +00:00
Jay Aliomer
e64715b2fb Revert "Revert "Unable to select twilight scheduling after enabling location"" am: dba11e82b5 am: 7bc6358a8c am: e8451d99a0 am: f719aca99d 
Change-Id: I9e3e5fb76ae9256770186c73b8cf5b2717f313af
 2020-05-15 00:59:02 +00:00
Jay Aliomer
43a243ccd1 Revert "Revert "Unable to select twilight scheduling after enabling location"" am: dba11e82b5 am: b56a6e06cf am: cd8ce49cd9 
Change-Id: I89fdab16d3eb2d8be914078e30605619b76180a8
 2020-05-15 00:43:51 +00:00
Jay Aliomer
1856fad39c Revert "Revert "Unable to select twilight scheduling after enabling location"" am: dba11e82b5 am: 7bc6358a8c am: ed7092de24 
Change-Id: Id8c142258ea03417f466880668ae7a7d69d8c8e4
 2020-05-15 00:42:54 +00:00
Jay Aliomer
f719aca99d Revert "Revert "Unable to select twilight scheduling after enabling location"" am: dba11e82b5 am: 7bc6358a8c am: e8451d99a0 
Change-Id: Ic31b6d941ffb8c759fd8117286a675c343f8a8e9
 2020-05-15 00:42:36 +00:00
Jay Aliomer
cd8ce49cd9 Revert "Revert "Unable to select twilight scheduling after enabling location"" am: dba11e82b5 am: b56a6e06cf 
Change-Id: Icb81609cd31cb91a0ffa6abc96ca671099704d15
 2020-05-15 00:29:59 +00:00
Jay Aliomer
e8451d99a0 Revert "Revert "Unable to select twilight scheduling after enabling location"" am: dba11e82b5 am: 7bc6358a8c 
Change-Id: Ibd035c8749e06a8ee0909ec2342e3ca35819e613
 2020-05-15 00:29:24 +00:00
Jay Aliomer
ed7092de24 Revert "Revert "Unable to select twilight scheduling after enabling location"" am: dba11e82b5 am: 7bc6358a8c 
Change-Id: I02fbf42378a0552c99cef09ad1338dc2caac5e78
 2020-05-15 00:29:22 +00:00
Jay Aliomer
7bc6358a8c Revert "Revert "Unable to select twilight scheduling after enabling location"" am: dba11e82b5 
Change-Id: I690971a567b813ff3bc6a7b96649da986e2fd31b
 2020-05-15 00:17:26 +00:00
Jay Aliomer
b56a6e06cf Revert "Revert "Unable to select twilight scheduling after enabling location"" am: dba11e82b5 
Change-Id: I7e9c33644e76e7712d0becfdacfdbf1cfdd26b83
 2020-05-15 00:17:16 +00:00
Jay Aliomer
dba11e82b5 Revert "Revert "Unable to select twilight scheduling after enabling location"" 
This reverts commit 782438347b.
Bug: 153115261
Reason for revert: fixing tests

Change-Id: I497a2b83cbe3eaee5f5fb3eb4df73618130fc6e2
 2020-05-14 15:14:18 +00:00
Peter_Liang
2add394b47 Refine the banner view for accessibility features. 
1. Replace the video with the gif for Magnification.
2. Replace the static image with the gif for Color Inversion.

Bug: 153293657
Bug: 155946967
Test: manual test & robo test
Change-Id: Ic51c0ec45c10a7fd2b9f1ffb63865ebc764846ba
 2020-05-14 21:00:05 +08:00
TreeHugger Robot
2c8448e927 Merge "Do not prebind sticky slices." into rvc-dev am: fa1e102af7 am: 565cc81e97 am: fabd02d872 am: f21486fa0a 
Change-Id: If5af8f536b5ba9bd8b72ec8239554d24d25072ec
 2020-05-14 12:47:51 +00:00
TreeHugger Robot
9238f4fed3 Merge "Do not prebind sticky slices." into rvc-dev am: fa1e102af7 am: 722b197488 am: bd39e9feb5 am: d8690b3caf 
Change-Id: I0b5ffef5524777159d5a6070fdc4632482961759
 2020-05-14 12:47:24 +00:00
TreeHugger Robot
117becf188 Merge "Do not prebind sticky slices." into rvc-dev am: fa1e102af7 am: 722b197488 am: ad332955ba am: 2438ec049a 
Change-Id: I7f4599347a2580663a827fcbd214c729efcd8caa
 2020-05-14 12:45:51 +00:00
TreeHugger Robot
f21486fa0a Merge "Do not prebind sticky slices." into rvc-dev am: fa1e102af7 am: 565cc81e97 am: fabd02d872 
Change-Id: I330ae624d8ecbe19d8b4803507321c03e6b0ef0e
 2020-05-14 12:25:53 +00:00
TreeHugger Robot
d8690b3caf Merge "Do not prebind sticky slices." into rvc-dev am: fa1e102af7 am: 722b197488 am: bd39e9feb5 
Change-Id: I2e6b6b9cb0472640ac47d7b93360c56df9a4bade
 2020-05-14 12:25:38 +00:00
TreeHugger Robot
2438ec049a Merge "Do not prebind sticky slices." into rvc-dev am: fa1e102af7 am: 722b197488 am: ad332955ba 
Change-Id: I8bd72b0c31bb90181c34e66120a5e1c9d72b9c39
 2020-05-14 12:24:05 +00:00
TreeHugger Robot
fabd02d872 Merge "Do not prebind sticky slices." into rvc-dev am: fa1e102af7 am: 565cc81e97 
Change-Id: Iac8ea0eaa2c95d9cd172517b80cfba6b03140f63
 2020-05-14 12:09:18 +00:00
TreeHugger Robot
ad332955ba Merge "Do not prebind sticky slices." into rvc-dev am: fa1e102af7 am: 722b197488 
Change-Id: I09d1e3450adcb2e48a1bb095c5055fa4235bae74
 2020-05-14 12:09:14 +00:00
TreeHugger Robot
bd39e9feb5 Merge "Do not prebind sticky slices." into rvc-dev am: fa1e102af7 am: 722b197488 
Change-Id: I03bde42780aeddc367ca7cc1e4b231c66e8611c7
 2020-05-14 12:09:00 +00:00
TreeHugger Robot
35f12752a6 Merge "[Wi-Fi] Enhance savedaccesspoints2 unit test cases" 2020-05-14 12:00:40 +00:00
TreeHugger Robot
565cc81e97 Merge "Do not prebind sticky slices." into rvc-dev am: fa1e102af7 
Change-Id: I8c6e49c40d6d005096b4f8430d3411679246b779
 2020-05-14 11:55:45 +00:00
TreeHugger Robot
722b197488 Merge "Do not prebind sticky slices." into rvc-dev am: fa1e102af7 
Change-Id: I28fd7a76774639806b79d9ffd7a5b9272dd96bfa
 2020-05-14 11:55:36 +00:00
TreeHugger Robot
fa1e102af7 Merge "Do not prebind sticky slices." into rvc-dev 2020-05-14 11:37:45 +00:00
Jason Chiu
d4ae5dd85b Merge "Add metrics log for special cases" into rvc-dev am: 60071b9287 am: a69f270ac0 am: 997aa1dffa am: c3a57b1549 
Change-Id: I3e37fb0598b1fa626a710752882385dccf8b1a28
 2020-05-14 08:43:24 +00:00
Jason Chiu
105ddbbd80 Merge "Add metrics log for special cases" into rvc-dev am: 60071b9287 am: f067ac4f50 am: 6170f9372e am: 8b9fa9cc01 
Change-Id: Iedbf4e50795101dd56caea21f6041cb9fa7afe3d
 2020-05-14 08:43:03 +00:00
Jason Chiu
cfa83a94b4 Merge "Add metrics log for special cases" into rvc-dev am: 60071b9287 am: f067ac4f50 am: 68335164e1 am: 0f428f485c 
Change-Id: I38394d224bc063b411b596decf9923f0189bc224
 2020-05-14 08:41:34 +00:00
govenliu
a2eae40a79 [Wi-Fi] Enhance savedaccesspoints2 unit test cases 
Add new unit test cases in
1. SavedAccessPointsPreferenceController2Test.java
2. SavedAccessPointsWifiSettings2Test.java
3. SubscribedAccessPointsPreferenceController2Test.java

The coverage rate of com.android.settings.wifi.savedaccesspoints2 will raise from 32% to 85%

Bug: 151696220
Test: Run following test commands
1. make RunSettingsRoboTests ROBOTEST_FILTER=SavedAccessPointsPreferenceController2Test
2. make RunSettingsRoboTests ROBOTEST_FILTER=SavedAccessPointsWifiSettings2Test
3. make RunSettingsRoboTests ROBOTEST_FILTER=SubscribedAccessPointsPreferenceController2Test

Change-Id: I43e43c95019659d507ae0d8b167c5d65cd036b95
 2020-05-14 16:35:26 +08:00
Jason Chiu
c3a57b1549 Merge "Add metrics log for special cases" into rvc-dev am: 60071b9287 am: a69f270ac0 am: 997aa1dffa 
Change-Id: Ibfa9dbbdb4c123da3be5a19c56eba609bb0d85db
 2020-05-14 08:24:05 +00:00
Jason Chiu
8b9fa9cc01 Merge "Add metrics log for special cases" into rvc-dev am: 60071b9287 am: f067ac4f50 am: 6170f9372e 
Change-Id: I2cca8c4968d9afd170f12ec40cd603da0998385a
 2020-05-14 08:22:51 +00:00
Jason Chiu
0f428f485c Merge "Add metrics log for special cases" into rvc-dev am: 60071b9287 am: f067ac4f50 am: 68335164e1 
Change-Id: I98406cafa3429e4b71a5db70d526b0a4cb770806
 2020-05-14 08:22:44 +00:00
Jason Chiu
6170f9372e Merge "Add metrics log for special cases" into rvc-dev am: 60071b9287 am: f067ac4f50 
Change-Id: I8161c7f90ff8645bc9ab83bc91296597fc59803e
 2020-05-14 08:11:11 +00:00
Jason Chiu
997aa1dffa Merge "Add metrics log for special cases" into rvc-dev am: 60071b9287 am: a69f270ac0 
Change-Id: I8a7d1abdd6b270269ea26e26c996e7e3c3ad816d
 2020-05-14 08:10:26 +00:00
Jason Chiu
68335164e1 Merge "Add metrics log for special cases" into rvc-dev am: 60071b9287 am: f067ac4f50 
Change-Id: I5204e67ae2f85a6590d87d721481bf6bc5f39241
 2020-05-14 08:10:12 +00:00
Jason Chiu
a69f270ac0 Merge "Add metrics log for special cases" into rvc-dev am: 60071b9287 
Change-Id: I95e4190ee4492a892e11d65d413db2443c975c8d
 2020-05-14 07:29:02 +00:00