Commit Graph

33329 Commits

Author SHA1 Message Date
Rubin Xu
5e51ed6a89 Allow setting password during provisioning if FRP is not supported
On devices without PersistentDataBlock support, we should
always allow setting up password during provisioning.

Bug: 157451551
Test: make RunSettingsRoboTests
      ROBOTEST_FILTER=com.android.settings.password
Test: On cuttlefish, file ACTION_SET_NET_PASSWORD before SUW completes
Change-Id: Ic7b5d99b38e6427750ce70fa7e38f7ef6054d4ad
2020-05-28 10:30:47 +01:00
Edgar Wang
b36ae16050 Merge "Fix NPE if default supervisor is not defined" am: 9bc3b6a207 am: 4d93ad694b am: 3cb8e75d85 am: 60a3d7d01d am: 757e453581
Change-Id: I9f368ee2a47ef60faf73bf555c5bfc8325fd22bf
2020-05-28 07:51:42 +00:00
Edgar Wang
60a3d7d01d Merge "Fix NPE if default supervisor is not defined" am: 9bc3b6a207 am: 4d93ad694b am: 3cb8e75d85
Change-Id: I6fd5b20fc63513e939ff30091bd8f7815e5618bc
2020-05-28 07:07:25 +00:00
Edgar Wang
3cb8e75d85 Merge "Fix NPE if default supervisor is not defined" am: 9bc3b6a207 am: 4d93ad694b
Change-Id: Ibb53d7709aab6f98d61045a5745fd0d52d108346
2020-05-28 06:59:05 +00:00
Edgar Wang
4d93ad694b Merge "Fix NPE if default supervisor is not defined" am: 9bc3b6a207
Change-Id: I74e93eca610194d7251c596bb854446bbc3dc129
2020-05-28 06:45:04 +00:00
Edgar Wang
9bc3b6a207 Merge "Fix NPE if default supervisor is not defined" 2020-05-28 06:30:46 +00:00
TreeHugger Robot
1035b0abb3 Merge "Enable the filterTouchesWhenObscured in Special app access" into rvc-dev am: 01338915d8 am: d078f8e326 am: da614c603f am: b5a0ab2830
Change-Id: I18ff2d91405edbb430f22401f2e1e992786c62f8
2020-05-28 03:57:56 +00:00
TreeHugger Robot
da614c603f Merge "Enable the filterTouchesWhenObscured in Special app access" into rvc-dev am: 01338915d8 am: d078f8e326
Change-Id: I90a02cd29e01764568066bef01f73442c779a0cf
2020-05-28 03:22:38 +00:00
TreeHugger Robot
d078f8e326 Merge "Enable the filterTouchesWhenObscured in Special app access" into rvc-dev am: 01338915d8
Change-Id: Ia4845ed6f59769cbd763e2137a807afa54696e62
2020-05-28 03:07:04 +00:00
TreeHugger Robot
aae8734076 Merge "Enable the filterTouchesWhenObscured in Special app access" into rvc-dev am: 01338915d8
Change-Id: Ia7dc3014b9dd92c787b692395f359f5bedc51ea5
2020-05-28 03:06:59 +00:00
TreeHugger Robot
01338915d8 Merge "Enable the filterTouchesWhenObscured in Special app access" into rvc-dev 2020-05-28 02:58:23 +00:00
TreeHugger Robot
4b196e4875 Merge "Some notification history fixes" into rvc-dev am: 69d210c7df am: 39507de82b am: 3e6e83faf9 am: 2fbf0c12a1
Change-Id: I1362b39bb707a4c1393b899641693d8e7836a068
2020-05-27 21:25:09 +00:00
TreeHugger Robot
2fbf0c12a1 Merge "Some notification history fixes" into rvc-dev am: 69d210c7df am: 39507de82b am: 3e6e83faf9
Change-Id: I8312e5776282257c7c2f09e297bcf04da5dca67a
2020-05-27 21:09:15 +00:00
TreeHugger Robot
5910536ffe Merge "Some notification history fixes" into rvc-dev am: 69d210c7df am: 39507de82b
Change-Id: Id2097ac899c051e44ebf465cc90dcdee5da1247f
2020-05-27 20:53:41 +00:00
TreeHugger Robot
256f070ed0 Merge "Some notification history fixes" into rvc-dev am: 69d210c7df
Change-Id: I7b7eecab337ba84983d37d4a909f5cc1b89c9dad
2020-05-27 20:35:55 +00:00
TreeHugger Robot
39507de82b Merge "Some notification history fixes" into rvc-dev am: 69d210c7df
Change-Id: I122252be30db11ea6030d5d23c353d36b617b059
2020-05-27 20:35:46 +00:00
TreeHugger Robot
69d210c7df Merge "Some notification history fixes" into rvc-dev 2020-05-27 20:25:36 +00:00
Adam Bookatz
3d806a3dfb Merge "Opening Multiuser doesn't toggle it on" into rvc-dev am: f8fd6156ae am: 43e7fa6d51 am: 325e71b897 am: 3e45415f0c
Change-Id: I0101f01b7ab94366f59fb5411e64c837262df145
2020-05-27 18:17:10 +00:00
Adam Bookatz
325e71b897 Merge "Opening Multiuser doesn't toggle it on" into rvc-dev am: f8fd6156ae am: 43e7fa6d51
Change-Id: Ic289a592535de3d7bd5bcff5b7ab4d01faaabd9b
2020-05-27 17:55:21 +00:00
Benedict Wong
d7a50cb62f Merge "Hide IKEv2 VPN options if not supported" into rvc-dev am: 5e2f733aee
Change-Id: Ifad4d14eb356a70d1a4eb5a543219b9d1eb3b852
2020-05-27 17:33:14 +00:00
Adam Bookatz
43e7fa6d51 Merge "Opening Multiuser doesn't toggle it on" into rvc-dev am: f8fd6156ae
Change-Id: I0df967353ef0dd28f75e91d210bd50b0eaf74a14
2020-05-27 17:33:00 +00:00
Adam Bookatz
dcd4edc456 Merge "Opening Multiuser doesn't toggle it on" into rvc-dev am: f8fd6156ae
Change-Id: I33a68598516d6a7e1537e899ef173b6f46114171
2020-05-27 17:32:20 +00:00
Benedict Wong
5e2f733aee Merge "Hide IKEv2 VPN options if not supported" into rvc-dev 2020-05-27 17:31:02 +00:00
Adam Bookatz
f8fd6156ae Merge "Opening Multiuser doesn't toggle it on" into rvc-dev 2020-05-27 17:15:33 +00:00
Julia Reynolds
ef4c044053 Some notification history fixes
- Update header count when item swiped away
- Clean up container when last notification is swiped away
- Long pressing on the top two section brings you to settings to
modify notification behavior
- Show more notification content

Test: manual
Bug: 157547283
Change-Id: I1d43cacca7a0f22f83cef9187cf288839e0d5795
2020-05-27 09:45:32 -04:00
TreeHugger Robot
bcf9d9e97f Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: e3e2ce74f7 am: a9df21b508 am: 43a459cb1b
Change-Id: I0ffcb7bfd8fed9aa2f769a144e1c33c330d7c9ff
2020-05-27 12:37:04 +00:00
TreeHugger Robot
43a459cb1b Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: e3e2ce74f7 am: a9df21b508
Change-Id: Ife00386ab5045ed1121707a202308e35b56404ee
2020-05-27 12:17:11 +00:00
TreeHugger Robot
e56caf1577 Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: e3e2ce74f7
Change-Id: Ibbe7b902e7e0a618a607059a33e94f42cbc30df6
2020-05-27 12:05:08 +00:00
TreeHugger Robot
e3e2ce74f7 Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659
Change-Id: Icf1d67fe6a49b14e3bebb19ff4f8c3a3a691b09f
2020-05-27 11:55:38 +00:00
TreeHugger Robot
ebef186155 Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659
Change-Id: Ifef1e319dacc0d12c4ae7d162d221daa0a342597
2020-05-27 11:55:38 +00:00
Stanley Wang
d5b08e8959 Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04 am: a17be1f732 am: ae8cdee154 am: f6398a09fa
Change-Id: I0b3774f7cb8ab6d242446a7d757549c7c84d7751
2020-05-27 11:55:22 +00:00
Stanley Wang
f6398a09fa Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04 am: a17be1f732 am: ae8cdee154
Change-Id: I415a1fdce3245a313479331e9e37417525a24daa
2020-05-27 11:48:46 +00:00
TreeHugger Robot
4d44702659 Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev 2020-05-27 11:36:45 +00:00
Stanley Wang
c83abc4906 Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04 am: a17be1f732
Change-Id: Icba85289fb428f8c5e36aa0b76a95e91364ff7d7
2020-05-27 11:34:10 +00:00
Stanley Wang
a17be1f732 Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04
Change-Id: I7f9508b3d8487900655526ea1544306e8c58a7d9
2020-05-27 11:20:28 +00:00
Stanley Wang
f86897477c Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04
Change-Id: Ia8dd974c1c6f3d2fd1de6b67c0fe76a0407c02e5
2020-05-27 11:20:28 +00:00
Stanley Wang
12e3efcb04 Merge "Fix the search result "Google Account" doesn't work." into rvc-dev 2020-05-27 11:12:02 +00:00
Benedict Wong
149cd3dd77 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
Merged-In: I3ef2e6144371596380351341e58c4ee84d49f39d
(cherry picked from commit e37fb7fc00)
2020-05-27 09:22:54 +00:00
Sunny Shao
ee4ec4b33f Enable the filterTouchesWhenObscured in Special app access
- Enable the filterTouchesWhenObscured attribute on all toggle
  switches in all pages of the special app access

Fixes: 155288585
Test: make RunSettingsRoboTests
Change-Id: I011cfe4b7e4e624a8338332ac47a353f7f3ab661
2020-05-27 17:21:24 +08:00
Automerger Merge Worker
cf3792525b Merge "Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451 am: c3ce91706a" into rvc-d1-dev-plus-aosp am: 6fd3b32197 am: 91a0015d5d
Change-Id: Ia4f55724adcd915d3f6d0df9e9d4d49c4bcd5cf3
2020-05-27 08:57:01 +00:00
Bonian Chen
9e03c1fd57 Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev am: d9d9a9be8d am: db253d31d8 am: 612e3c409c am: 5c8755d1ca
Change-Id: I0378b52cb0e41141e8e497631ed707371ba00e77
2020-05-27 08:56:24 +00:00
Tim Peng
33914e738d Improve feedback when failing transferring a disconnected device
-Set "failed" string for subtitle
-Add test case

Bug: 157139936
Test: make -j42 RunSettingsRoboTests
Change-Id: I1fcd51f954a63cbc9ac0e573e5a8bb43cca6f087
2020-05-27 16:49:17 +08:00
Edgar Wang
8de2ab6a66 Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451 am: c3ce91706a
Change-Id: I71b4e430f93e7637017a86f0c8c3adcc33d51716
2020-05-27 08:31:43 +00:00
Bonian Chen
612e3c409c Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev am: d9d9a9be8d am: db253d31d8
Change-Id: Ib5cf4d28e58881d0e16a9dc2364353707701a944
2020-05-27 08:31:36 +00:00
Edgar Wang
c3ce91706a Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451
Change-Id: I3240458b67d03283dac6bb15d9fbef02ef7febeb
2020-05-27 08:19:00 +00:00
Edgar Wang
4cec7ebd7a Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451
Change-Id: Ic0649f4c8488bf86ca366b60c468dc0e9dd5ef5f
2020-05-27 08:18:56 +00:00
Bonian Chen
1a10069e6a Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev am: d9d9a9be8d
Change-Id: Ia0af2c7912b6d6af31ba7cb67747f9cd952f4428
2020-05-27 08:18:36 +00:00
Bonian Chen
db253d31d8 Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev am: d9d9a9be8d
Change-Id: I06a1e5612384f99dea432ca90058269a661f4c4a
2020-05-27 08:18:32 +00:00
Edgar Wang
e1a9a56451 Merge "Update summary of Gesture" into rvc-dev 2020-05-27 08:14:17 +00:00
Bonian Chen
d9d9a9be8d Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev 2020-05-27 08:08:35 +00:00