Commit Graph

54447 Commits

Author SHA1 Message Date
Kevin Chyn
ffcc25ba92 Merge changes from topic "face-bypass-move" into qt-r1-dev
* changes:
  Make bypass controller consistent with rest of face unlock settings
  Move lockscreen bypass setting to Settings > Security > Face unlock
2019-06-12 21:51:42 +00:00
Michael Groover
724a977f8c Merge "Remove developer option to disable device ID access restrictions" into qt-dev am: ad85d6b942
am: b31b522513

Change-Id: Iecf9903356794b13ce628843d0dfda821d6305d3
2019-06-12 14:36:59 -07:00
Michael Groover
edef325b20 Merge "Remove developer option to disable device ID access restrictions" into qt-dev am: ad85d6b942
am: 628d311d0c

Change-Id: I1679817363e1f9e7d5541c8bd575194d24605edd
2019-06-12 14:33:33 -07:00
Kevin Chyn
d7ec14a5b5 Call finish() when enrollment loses focus
am: e9d50cd91b

Change-Id: Ic48cdf5e244689481b8b53af5b55b4b316dc5c56
2019-06-12 14:30:30 -07:00
Michael Groover
628d311d0c Merge "Remove developer option to disable device ID access restrictions" into qt-dev
am: ad85d6b942

Change-Id: Ie49e2845fe5c3389b9a44803e293789971ecb485
2019-06-12 14:20:33 -07:00
Michael Groover
b31b522513 Merge "Remove developer option to disable device ID access restrictions" into qt-dev
am: ad85d6b942

Change-Id: I8884f4b01a3980bfc00e9a57ea1b8c43c27578d3
2019-06-12 14:17:03 -07:00
Michael Groover
ad85d6b942 Merge "Remove developer option to disable device ID access restrictions" into qt-dev 2019-06-12 20:31:16 +00:00
Kevin Chyn
059980d215 Make bypass controller consistent with rest of face unlock settings
1) Should only be shown for owner profile
2) Should be disabled if A) not enrolled, B) DevicePolicyManager, C) HAL issue

Fixes: 134700640
Test: Manual test of conditions above
Change-Id: Id72db59c662df6c529c98aafd610de8c86c77ebd
2019-06-12 13:27:22 -07:00
Kevin Chyn
6a4a0e7396 Move lockscreen bypass setting to Settings > Security > Face unlock
Fixes: 134700640

Test: atest FaceSettingsLockscreenBypassPreferenceControllerTest
Test: enabling/disabling setting through Settings > Security > Face unlock
      works as expected
Test: preference controller no longer seen in Settings > Display > Lock screen display

Change-Id: I54807ad92fac62398a2b9dab93dd638775a09c8d
2019-06-12 13:27:18 -07:00
Kevin Chyn
e9d50cd91b Call finish() when enrollment loses focus
Bug: 134971919

Test: Entering keyguard on any enrollment screen finishes enrollment now
Test: Going back/forward works

Change-Id: I2c80a5586c10fa3feb780a5eadfe203abed52dea
2019-06-12 11:05:47 -07:00
TreeHugger Robot
7855c640c7 Merge "Fix launching of work profile notif settings" 2019-06-12 17:44:14 +00:00
Julia Reynolds
142920e0c2 Fix launching of work profile notif settings
Test: manual
Fixes: 132289017
Change-Id: I3c177aae1f4dd46556b652253d24b225d01987eb
2019-06-12 11:39:39 -04:00
joshmccloskey
c528013b8c Merge "Increased toggling area" into qt-r1-dev am: a854373bee
am: 388b26d4d5

Change-Id: I8deab601444497676d929704637613ab824d19e4
2019-06-11 22:56:01 -07:00
joshmccloskey
388b26d4d5 Merge "Increased toggling area" into qt-r1-dev
am: a854373bee

Change-Id: I628397789acf5a7b879a52f3d12cc9786d0869e2
2019-06-11 22:51:01 -07:00
TreeHugger Robot
a854373bee Merge "Increased toggling area" into qt-r1-dev 2019-06-12 05:40:53 +00:00
joshmccloskey
c2cb46782c Increased toggling area
Test: Tapping the whole area will now toggle the switch. Note that
it is no longer possible to individually select the title and subtitle during
talkback, but you can select them as a group.
Test: Verified that without talkback the user must actually press
switch.
Fixes: 130398575

Change-Id: I369637f23e41ac6dc4333293b95a5ccae259ee1f
2019-06-12 02:57:17 +00:00
Fan Zhang
3480ab1cbd Merge "Update mainline module versions string." into qt-dev am: 2aa94b97c7 am: a621f8a374
am: 32ae5db2ee

Change-Id: I03b897745f6662efd847900313e217e6464bf696
2019-06-11 14:48:07 -07:00
Fan Zhang
33caf61878 Merge "Update mainline module versions string." into qt-dev am: 2aa94b97c7 am: 2c9bd6707d
am: 2bbb1bf2e0

Change-Id: I7a31d766b5e8285d49afc523a980692549271745
2019-06-11 14:47:44 -07:00
Fan Zhang
32ae5db2ee Merge "Update mainline module versions string." into qt-dev am: 2aa94b97c7
am: a621f8a374

Change-Id: Iaafcb9bcc773ecf48fe2e4d57ab8b8ee6223654e
2019-06-11 14:44:43 -07:00
Fan Zhang
2bbb1bf2e0 Merge "Update mainline module versions string." into qt-dev am: 2aa94b97c7
am: 2c9bd6707d

Change-Id: Id9bb6359eaf6ddd60237c929522418ea291412d5
2019-06-11 14:42:45 -07:00
Fan Zhang
2c9bd6707d Merge "Update mainline module versions string." into qt-dev
am: 2aa94b97c7

Change-Id: I0004f9860c2c8f16be3612c165b3e2a40031819c
2019-06-11 14:38:42 -07:00
Fan Zhang
a621f8a374 Merge "Update mainline module versions string." into qt-dev
am: 2aa94b97c7

Change-Id: I3ac299e4e8b591a54ebb082d57e4dd408152029c
2019-06-11 14:38:42 -07:00
TreeHugger Robot
2aa94b97c7 Merge "Update mainline module versions string." into qt-dev 2019-06-11 21:20:12 +00:00
Antony Sargent
795a9ccc41 Merge "Merge "Remove on/off toggle for physical SIMs" into qt-dev am: 5836158f2e am: af8fa25cfd" into qt-r1-dev-plus-aosp
am: 7a952730bd

Change-Id: Ibac314194218920b10c5808d98527b184ce4b4db
2019-06-11 13:28:20 -07:00
Antony Sargent
4d76ef7b2e Merge "Remove on/off toggle for physical SIMs" into qt-dev am: 5836158f2e am: 5d186f5346
am: f0e3ac6f27

Change-Id: I4dd3e2855de57f1a3e3001fa8cda3206e8e045f4
2019-06-11 13:27:54 -07:00
Android Build Merger (Role)
7a952730bd Merge "Merge "Remove on/off toggle for physical SIMs" into qt-dev am: 5836158f2e am: af8fa25cfd" into qt-r1-dev-plus-aosp 2019-06-11 20:20:05 +00:00
Antony Sargent
f0e3ac6f27 Merge "Remove on/off toggle for physical SIMs" into qt-dev am: 5836158f2e
am: 5d186f5346

Change-Id: Ib92cedd28e291ba8e606f21883a7d69e73251a5c
2019-06-11 13:19:53 -07:00
Antony Sargent
9d1961e074 Merge "Remove on/off toggle for physical SIMs" into qt-dev am: 5836158f2e
am: af8fa25cfd

Change-Id: I51513b2df9aa1d5f22cdb118abe4935f0193e6ec
2019-06-11 13:19:51 -07:00
Antony Sargent
af8fa25cfd Merge "Remove on/off toggle for physical SIMs" into qt-dev
am: 5836158f2e

Change-Id: Idfe1855b09448feea3036185f092b3f56b10f18e
2019-06-11 13:13:52 -07:00
Antony Sargent
5d186f5346 Merge "Remove on/off toggle for physical SIMs" into qt-dev
am: 5836158f2e

Change-Id: I3cfdbf15953adff2133ec4e59195c0403701c13e
2019-06-11 13:12:52 -07:00
TreeHugger Robot
5836158f2e Merge "Remove on/off toggle for physical SIMs" into qt-dev 2019-06-11 20:06:54 +00:00
Yi Jiang
878476e9ba Merge "Show a 'permission missing' message in Screen Attention settings." into qt-r1-dev am: 9fb76d02bb
am: ecbaa00855

Change-Id: I01a2ce816150cac7e14f046904b333c93bea49c9
2019-06-11 12:34:56 -07:00
Yi Jiang
ecbaa00855 Merge "Show a 'permission missing' message in Screen Attention settings." into qt-r1-dev
am: 9fb76d02bb

Change-Id: I4131b9f13778ccb1c05ff60a94ebfc49a02319cf
2019-06-11 12:28:15 -07:00
TreeHugger Robot
9fb76d02bb Merge "Show a 'permission missing' message in Screen Attention settings." into qt-r1-dev 2019-06-11 19:13:45 +00:00
tmfang
ef5766906c Fix overlapping problem on notification screen am: 564fcb90ab am: a5715f7d9c
am: 003bdbf7cc

Change-Id: If81ab3a8d637fc16953905b6262ad85d78260b9f
2019-06-11 11:02:08 -07:00
tmfang
dad177ada4 Fix overlapping problem on notification screen am: 564fcb90ab am: 1c474bf789
am: 114864981a

Change-Id: I1dcbbdece7db796fe2a83fc9c81c88d794534319
2019-06-11 10:59:45 -07:00
tmfang
003bdbf7cc Fix overlapping problem on notification screen am: 564fcb90ab
am: a5715f7d9c

Change-Id: I06f96d7f366ec3efa9b656c5dbe5d349435e9f60
2019-06-11 10:55:08 -07:00
tmfang
114864981a Fix overlapping problem on notification screen am: 564fcb90ab
am: 1c474bf789

Change-Id: I39a2ee35350be2439cab8f3718ecc68fc99c4c82
2019-06-11 10:52:47 -07:00
tmfang
a5715f7d9c Fix overlapping problem on notification screen
am: 564fcb90ab

Change-Id: I4843fe2b835b5487695ccb522848127028042d4c
2019-06-11 10:46:32 -07:00
tmfang
1c474bf789 Fix overlapping problem on notification screen
am: 564fcb90ab

Change-Id: I22700badde84ab5a723b41d59fbd72a9f751452e
2019-06-11 10:45:44 -07:00
Fan Zhang
933786b399 Merge changes I05beec7d,Iad4e9fc2
* changes:
  Remove "platform_slice" attribute from Settings.
  Use slice uri from slice index db directly.
2019-06-11 17:12:12 +00:00
Yi-Ling Chuang
d6bd5b1339 Update sound summary when it is set to None.
Currently when the sound is set to None, we don't update the summary,
unless users go to other pages and come back. Now we refreash it for a
better user experience.

Fixes: 134994978
Test: robotest
Change-Id: I5d9c0238ee31e0c26ebde3201794c17737791c62
2019-06-11 17:21:58 +08:00
Arc Wang
751eba205b [Wi-Fi DPP] Support WPA2/WPA3 transition mode
This change shows buttons of QR code scnanner and QR code generator
for a connected Wi-Fi network.

Bug: 134706055
Test: Generate QR code for a WPA2/WPA3 personal transition mode Wi-Fi AP
          and check if the security type is WPA2 personal.
      Generate QR code for open network.
      Generate QR code for OWE network.
      Scan a QR code of open network, verify connection.
      Scan a QR code of OWE network, verify connection.
      Scan a QR code of WPA3 network, verify connection.
      Scan a QR code of WPA3 network, verify transition mode connection.

Change-Id: I60f2c38585f85745f992fa63a5ea85312f08c5e5
2019-06-11 15:10:43 +08:00
tmfang
564fcb90ab Fix overlapping problem on notification screen
If we didn't set view and lifecycle for EntityHeaderController,
it only sets "z-order" as 0 for action bar.

So, user sees overlapped problem while user is scrolling view.

For now, we set view and lifecycle as parameter for EntityHeaderController,
then EntityHeaderController can change "z-order" while scrolling view.

Test: visual, robotest
Fixes: 132819126
Change-Id: Ieb01b26e4d6ca4d82f72371620938665de8149a0
2019-06-11 13:57:57 +08:00
Fan Zhang
308a532852 Update mainline module versions string.
We are putting this particular Google string into AOSP because:
1. This feature is part of platform mainline and has a hard dependency
   to Google Play.
2. Settings code has no way to target gms devices, or mainline devices.
   It's either AOSP or OEM. And this change is beyond OEM.

Fixes: 134101529
Test: manual
Change-Id: Ic4e7a7539230db0390bb9230931132e5500a1eb4
2019-06-11 02:31:25 +00:00
Anthony Han
9c79591c42 Merge "Hide color mode in search during A11y" into qt-r1-dev am: 9eaf5de974
am: f43839da91

Change-Id: Iace1bdf9a10c85ed9e04ae2d8425f79f42606233
2019-06-10 17:53:21 -07:00
Anthony Han
f43839da91 Merge "Hide color mode in search during A11y" into qt-r1-dev
am: 9eaf5de974

Change-Id: I91808e8c6fd981a1fc794d2584214036c8cb895c
2019-06-10 17:32:17 -07:00
Yi Jiang
c26745207d Show a 'permission missing' message in Screen Attention settings.
Bug: 129284701
Test: Manually verified.
Test: atest AdaptiveSleepSettingsTest

Change-Id: I6375929d59479a0aeb7e4aec184bd36e7f3ab33b
2019-06-10 17:18:10 -07:00
TreeHugger Robot
9eaf5de974 Merge "Hide color mode in search during A11y" into qt-r1-dev 2019-06-10 23:21:06 +00:00
Antony Sargent
e548fc6334 Remove on/off toggle for physical SIMs
Our original design for mobile network subscription management included
having an on/off toggle for both eSIMs and physical SIMs. However, it
turns out that our current telephony stack has some problems with
disabling physical SIMs, so for now we're removing the on/off
toggle. Because of this, we've added a footer to the SIM details page
for physical SIMS letting users know that to disable them you need to
remove them from the device.

Even though we're removing the on/off toggle for pSIMs, there are still
a few edge cases where you could end up with a disabled one (eg having
two SIMs in single-SIM mode where the eSIM is active and then you erased
the eSIM). In order to have a way to re-enable the pSIM in these cases,
this CL changes the relevant pref's summary to "Tap to activate <name>"
and makes the tap action begin the re-enabling. This can affect either
the Mobile network pref on the Network & internet main page (if this
disabled pSIM is the only SIM), or an entry in the Mobile networks list
page (if there are still multiple SIMs present).

Finally, this also fixes a problem where we weren't showing the on/off
toggle for eSIMs if you only had one SIM total; we actually always want
to show it for eSIMs.

Bug: 132921553
Test: make RunSettingsRoboTests
Change-Id: Id0750ebd5bed46dc2450b65b53cc81847ef09b82
2019-06-10 14:41:08 -07:00