Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
69,275 Commits 1 Branch 0 Tags
5993000b7b2b892c55a1fee2445a4d0748932626
Commit Graph

32835 Commits

Author SHA1 Message Date
TreeHugger Robot
5993000b7b Merge "Avoid launching activity-based feature to force stop exist actiivty and recreate it." into rvc-dev am: 45910eec3f am: ceb23bb736 am: d89a58f00f am: 9a26cc3405 
Change-Id: I288f9d43f76552b1c50744c6834d5bf20a0be41f
 2020-05-16 02:32:22 +00:00
TreeHugger Robot
d89a58f00f Merge "Avoid launching activity-based feature to force stop exist actiivty and recreate it." into rvc-dev am: 45910eec3f am: ceb23bb736 
Change-Id: I6327182f4400f7cbca26a79aa10f6b781a02a361
 2020-05-16 01:57:18 +00:00
TreeHugger Robot
ceb23bb736 Merge "Avoid launching activity-based feature to force stop exist actiivty and recreate it." into rvc-dev am: 45910eec3f 
Change-Id: I71b7429b2acd35016b655bdaba8cc536f5325e07
 2020-05-16 01:31:36 +00:00
Benedict Wong
e37fb7fc00 Merge "Hide IKEv2 VPN options if not supported" am: 806523a7cd am: 63a1447508 am: 6f7a25cedc am: f594281fef am: fe9e41e638 
Change-Id: I835dd2d269e52261316ae38c9b2c94c968f9f9f5
 2020-05-16 01:30:56 +00:00
TreeHugger Robot
45910eec3f Merge "Avoid launching activity-based feature to force stop exist actiivty and recreate it." into rvc-dev 2020-05-16 01:09:07 +00:00
Benedict Wong
f594281fef Merge "Hide IKEv2 VPN options if not supported" am: 806523a7cd am: 63a1447508 am: 6f7a25cedc 
Change-Id: I71c8258a7356d28f70a2a8800e851517b79cff9f
 2020-05-16 00:58:39 +00:00
Benedict Wong
6f7a25cedc Merge "Hide IKEv2 VPN options if not supported" am: 806523a7cd am: 63a1447508 
Change-Id: I33bc05a44f0c7a1862fdd725a6dcff2d848df4ed
 2020-05-16 00:46:18 +00:00
Benedict Wong
63a1447508 Merge "Hide IKEv2 VPN options if not supported" am: 806523a7cd 
Change-Id: I3e8b13b615bfc6c2095efd5bd7c2f61beebf7b3e
 2020-05-16 00:25:53 +00:00
TreeHugger Robot
07c525c487 Merge changes from topic "jr-update" into rvc-dev am: 4bbe564aea am: 0217cbd19e am: 2806494683 am: e8d332dc54 
Change-Id: I035d09faa19a1269adf361a5e0cfdb8c9d74eb8b
 2020-05-16 00:06:05 +00:00
Julia Reynolds
32d189fbfe Add settings for apps that don't use full conversations am: eca1e4d197 am: 33e6708f75 am: 2ae175233b am: 6a87cdcd50 
Change-Id: Ic01e59c4462f51128cd9b425075087459add3057
 2020-05-16 00:06:02 +00:00
TreeHugger Robot
2806494683 Merge changes from topic "jr-update" into rvc-dev am: 4bbe564aea am: 0217cbd19e 
Change-Id: I674ec92dbe8ec7f0c5486ecf08bd9ddba7065996
 2020-05-15 23:45:36 +00:00
Julia Reynolds
2ae175233b Add settings for apps that don't use full conversations am: eca1e4d197 am: 33e6708f75 
Change-Id: I6ccfcafac1a64842e227e9657c0ccee57bea103d
 2020-05-15 23:45:34 +00:00
TreeHugger Robot
0217cbd19e Merge changes from topic "jr-update" into rvc-dev am: 4bbe564aea 
Change-Id: If57ab8c7d45fbd771b5be23aa5812cdb9e0b35e5
 2020-05-15 23:39:09 +00:00
Julia Reynolds
33e6708f75 Add settings for apps that don't use full conversations am: eca1e4d197 
Change-Id: I3360ffd3f7975346f24d0943912cc31b88b2a07d
 2020-05-15 23:39:06 +00:00
TreeHugger Robot
4bbe564aea Merge changes from topic "jr-update" into rvc-dev 
* changes:
  Update conversation launch point
  Add settings for apps that don't use full conversations
 2020-05-15 23:35:06 +00:00
TreeHugger Robot
76215df1df Merge "[Wi-Fi] Quit worker thread in WifiNetworkListFragment" 2020-05-15 20:11:05 +00:00
Julia Reynolds
cd237ccf9b Update conversation launch point 
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.notification"
Fixes: 156670585
Change-Id: I31f306d1b7d480ac0ef0cc4a5f7e66efe528383d
 2020-05-15 19:40:56 +00:00
Julia Reynolds
eca1e4d197 Add settings for apps that don't use full conversations 
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.notification"
Fixes: 155276427
Change-Id: Ie145b9cdc9555d4676a8bd225427abc9222f31c5
 2020-05-15 19:38:14 +00:00
Yanting Yang
838957c0f9 Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: b9104da715 am: 8a20f65064 am: fa064bf433 
Change-Id: Ia51c13206f46b78aa7f23a86eb80683cc03d8af2
 2020-05-15 12:53:51 +00:00
Yanting Yang
8a20f65064 Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: b9104da715 
Change-Id: Ifd6e80cd31be4654f250d040c43b133157d5a865
 2020-05-15 12:13:32 +00:00
Yanting Yang
8b3c7b20b5 Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 
Change-Id: If322e9049dc828a406533694cd2062f4fe6456ac
 2020-05-15 12:01:28 +00:00
Yanting Yang
b9104da715 Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 
Change-Id: I21ed82dc007d52cd0e4d157ca20d07198830fbdc
 2020-05-15 12:00:56 +00:00
Yanting Yang
5812014ff7 Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev 2020-05-15 11:44:20 +00:00
tim peng
71972d0d54 Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f am: 0eec352212 am: 7c834b43dc am: 2e9f24c131 
Change-Id: Ia5200dc1bf0c5fd175bae2235709ffaa4e7ef6ca
 2020-05-15 04:08:51 +00:00
tim peng
7c834b43dc Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f am: 0eec352212 
Change-Id: Ie2ece21e9907a8582e96b1b8a921780fa70b892d
 2020-05-15 03:33:15 +00:00
tim peng
84ed686f8c Merge "Display previous active media information" into rvc-dev am: 72638462e1 am: 317f7358e5 am: 435d8f80f1 am: af633d3916 
Change-Id: I56aa8ac16a9e461a356ea8797853fd1d4f97922e
 2020-05-15 03:17:43 +00:00
tim peng
bd75d389e9 Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f 
Change-Id: I9ab4c04b75fdb9d5bd3f1b5f2ff56c00f744e8fd
 2020-05-15 03:17:23 +00:00
tim peng
0eec352212 Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f 
Change-Id: If946b5c4db62164b39c8e56c0801e506a1016e69
 2020-05-15 03:17:22 +00:00
Arc Wang
fa128687ae [Wi-Fi] Quit worker thread in WifiNetworkListFragment 
Should quit worker thread when a fragment is about to
be destroyed.

Bug: 145100890
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiNetworkListFragmentTest
Change-Id: I840750ac4e9601fe553ce219305876581bea7197
 2020-05-15 11:17:20 +08:00
tim peng
764387772f Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev 2020-05-15 03:04:52 +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
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
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
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
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
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
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
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
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