Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
67,067 Commits 1 Branch 0 Tags
7a1047f75c337b236ef68668935a569ee5ff489e
Commit Graph

32084 Commits

Author SHA1 Message Date
Julia Reynolds
207b456da5 Merge "Fix jank on conversation screen" into rvc-dev am: 35a839a689 am: 68bac97932 
Change-Id: Ia987a204e3da68686487f530197b10b2f459e044
 2020-05-16 03:02:06 +00:00
Julia Reynolds
68bac97932 Merge "Fix jank on conversation screen" into rvc-dev am: 35a839a689 
Change-Id: I10bbbd88906a0af08babb761366a569b3f2a6f0c
 2020-05-16 02:46:56 +00:00
Julia Reynolds
35a839a689 Merge "Fix jank on conversation screen" into rvc-dev 2020-05-16 02:30:09 +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
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
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
Julia Reynolds
f0c3245639 Fix jank on conversation screen 
Onboarding should only appear if needed

Test: manual
Fixes: 156756305
Change-Id: I663677772806db9c80979cdac103c9fa657ee7e2
 2020-05-15 19:41:12 +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
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
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
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
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
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
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
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
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
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
Jason Chiu
f067ac4f50 Merge "Add metrics log for special cases" into rvc-dev am: 60071b9287 
Change-Id: I6fcbbcb9b1dddfcd2114cfd81ee225bad0fc7e9f
 2020-05-14 07:28:56 +00:00
Tim Peng
493e1a62c8 In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list 
-The group view should not be clickable
-Disable view clickable flag

Bug: 151126466
Test: make -j50 RunSettingsRoboTests
Change-Id: Ia617f436a615168d422d208959db5513b38e6564
 2020-05-14 15:19:39 +08:00
Jason Chiu
60071b9287 Merge "Add metrics log for special cases" into rvc-dev 2020-05-14 07:12:47 +00:00
Tim Peng
a402e4f3ce Display previous active media information 
-Pending intent is not updated

Bug: 156561083
Test: make -j50 RunSettingsRoboTests
Change-Id: If4fdb85d7097bc48f0512b3d11f950af1d57dcd7
 2020-05-14 13:32:51 +08:00
TreeHugger Robot
d034853465 Merge "Add null check for intent in AppPermissionPreferenceController" into rvc-dev am: bb7a65a19b am: 35c1670be2 
Change-Id: I944b56d97a8f73ca9408b951bbc24613fd87879d
 2020-05-14 03:42:57 +00:00
Yi-Ling Chuang
ac59ea8e23 Do not prebind sticky slices. 
We have a precheck mechanism to filter out slices that are not eligible
to be displayed on the homepage. Since sticky cards are designed to
be always available, which implies they will never be null, so skip
prechecking on them.

This allows us to prevent from the precheck timeout which usually leads
to the disappearance of cards.

Fixes: 152365480
Test: robotests
Change-Id: Ic9e3df8b55609e9b5d1d3fd3a8d95e4086d3d7a4
 2020-05-14 11:38:47 +08:00
TreeHugger Robot
27a4a17aac Merge "Add null check for intent in AppPermissionPreferenceController" into rvc-dev am: bb7a65a19b 
Change-Id: Id3005fde29c015152fbc345bd1b8d7fe3d2efd20
 2020-05-14 03:32:22 +00:00
TreeHugger Robot
35c1670be2 Merge "Add null check for intent in AppPermissionPreferenceController" into rvc-dev am: bb7a65a19b 
Change-Id: I97a73c098c57975aead1e70a57accba636a782fd
 2020-05-14 03:32:17 +00:00
TreeHugger Robot
bb7a65a19b Merge "Add null check for intent in AppPermissionPreferenceController" into rvc-dev 2020-05-14 03:16:51 +00:00
tim peng
de76affbde Merge "When only one device is selected in dynamic group, the device should be disabled" into rvc-dev am: 8d2c8f1f33 am: 6ca2cc572e 
Change-Id: I59f24e15319f9f87432b7cb13446fe29f2e6de04
 2020-05-14 01:59:22 +00:00