Commit Graph

70327 Commits

Author SHA1 Message Date
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
PETER LIANG
ee45e5035e Merge "Refine the banner view for accessibility features." am: aee3d3e78d
Change-Id: I82cf50a78dc1bf88ff0d7749eef3a952663124f6
2020-05-15 02:35:10 +00: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
1c01c7e121 Revert "Revert "Unable to select twilight scheduling after enabling location"" am: dba11e82b5 am: b56a6e06cf am: cd8ce49cd9 am: 43a243ccd1 am: a19c2e498d
Change-Id: Ie498700d1afe53fe1c8c453be97d68c02fab97fc
2020-05-15 01:20:13 +00:00
Jay Aliomer
3f242e1c03 Revert "Revert "Unable to select twilight scheduling after enabling location"" am: dba11e82b5 am: 7bc6358a8c am: ed7092de24 am: 1856fad39c am: 9fa5b6e5d9
Change-Id: I4cf7a30dd81a47e36f1796434651f798a2e3d7e4
2020-05-15 01:19:58 +00:00
Jay Aliomer
d7398ff15e Revert "Revert "Unable to select twilight scheduling after enabling location"" am: dba11e82b5 am: 7bc6358a8c am: e8451d99a0 am: f719aca99d am: e64715b2fb
Change-Id: Ic9a42ce56a6db88b2eeb3a867e9aaa10dbddf85b
2020-05-15 01:19:33 +00:00
Edgar Wang
badcb4e415 Remove duplicate search result when search "Calls" and "Messages".
Settings indexed entries and screen title both, which caused duplicated
result.
so we make screen title as non-searchable to resolve duplicate.

Bug: 155849111
Test: manual
Change-Id: I2d0dd718c25499a574a35509d99668358ce07baa
2020-05-15 09:08:07 +08: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
Arc Wang
41f23de712 [Wi-Fi] Replace WifiTracker with WifiPickerTracker in WifiSettings
WifiSettings uses WifiTracker in SettingsLib while WifiSettings2
uses WifiPickerTracker in WifiSettingsLib.

1. Remove WifiSettings.
2. Rename WifiSettings2 to WifiSettings.
3. Remove the files only used in the removed WifiSettings.
   (Saved networks files are not included)

Bug: 152571756
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
      atest WifiSettingsUiTest
Change-Id: I800b434c8049121db115cff87d51e164e4529999
2020-05-14 21:24:57 +08:00
TreeHugger Robot
8d66d265e5 Merge "Do not prebind sticky slices." into rvc-dev am: fa1e102af7 am: 565cc81e97 am: fabd02d872 am: f21486fa0a am: 2c8448e927
Change-Id: Id143729858f0252feee332d62248a4abdb9e11c9
2020-05-14 13:17:23 +00:00
TreeHugger Robot
5052122c61 Merge "Do not prebind sticky slices." into rvc-dev am: fa1e102af7 am: 722b197488 am: bd39e9feb5 am: d8690b3caf am: 9238f4fed3
Change-Id: I6173fdcd29871ad7817de91db78d0d25685efd5e
2020-05-14 13:17:03 +00:00
TreeHugger Robot
87884879b8 Merge "Do not prebind sticky slices." into rvc-dev am: fa1e102af7 am: 722b197488 am: ad332955ba am: 2438ec049a am: 117becf188
Change-Id: I64952f7602bcb6d0287333497a18eb166175f876
2020-05-14 13:16:46 +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
3ac27cf100 Merge "[Wi-Fi] Enhance savedaccesspoints2 unit test cases" am: 35f12752a6
Change-Id: I72042206503959d9b0fc13531ae90c64dff98762
2020-05-14 12:15:25 +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
8205ab1009 Merge "Add metrics log for special cases" into rvc-dev am: 60071b9287 am: a69f270ac0 am: 997aa1dffa am: c3a57b1549 am: d4ae5dd85b
Change-Id: I42d68a3bf23034c7e8e70391d47649ccee307a56
2020-05-14 08:59:21 +00:00
Jason Chiu
4af2219b62 Merge "Add metrics log for special cases" into rvc-dev am: 60071b9287 am: f067ac4f50 am: 6170f9372e am: 8b9fa9cc01 am: 105ddbbd80
Change-Id: I72af7364d4f3cf0ba4e2144af9976f237dc29b07
2020-05-14 08:59:01 +00:00