Commit Graph

54250 Commits

Author SHA1 Message Date
Jordan Liu
19d1f890a0 Merge "Allow radio info on phones with no subscription" 2019-08-14 00:22:42 +00:00
Xin Li
c3ef16882d DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
Bug: 139369544
Change-Id: I483962d870c69d1c454d5bc04c76d9f7d7a12520
2019-08-13 16:36:39 -07:00
android-build-team Robot
573db8a758 Snap for 5674421 from 4a949c0640 to pi-platform-release
Change-Id: Idb0d7d08f9581908c2f5e2881a73b1c806f1ddb9
2019-08-13 16:25:08 +00:00
Jordan Liu
655c1be579 Allow radio info on phones with no subscription
Some info is still helpful for debugging in these cases.

Bug: 139074613
Test: manual
Change-Id: Idbde691c60b53e0ab755df229a3a9dc77406934d
Merged-In: Idbde691c60b53e0ab755df229a3a9dc77406934d
2019-08-12 19:02:27 +00:00
Christine Franks
c586c923aa Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev
am: 37b38f872f

Change-Id: I298f71e7db0840e83af06f5662d6af2d5c60bbac
2019-08-04 00:55:55 -07:00
Christine Franks
caebfbe9c9 [DO NOT MERGE] Update title for null uri when setting changes
am: ea14373666

Change-Id: I8f542126d98beefe8f221266b7f25bc9d7b0f4d5
2019-08-04 00:55:33 -07:00
android-build-team Robot
d767898bf1 Snap for 5778854 from 37b38f872f to qt-c2f2-release
Change-Id: I65f2c3f99c9767109fb4aa653b2e4afcfeedfa51
2019-08-03 23:02:29 +00:00
Christine Franks
37b38f872f Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev 2019-08-03 14:47:40 +00:00
Christine Franks
ea14373666 [DO NOT MERGE] Update title for null uri when setting changes
Currently, the title will not update at all if set to silent.

Bug: 130445562
Test: make RunSettingsRoboTests -j48
Change-Id: Id8fc0182adb37c05436f5924b7dcdffb9d994e0d
2019-08-03 01:00:31 +00:00
Edgar Wang
3448917d8e Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
am: 8e3b202070

Change-Id: Ic8c1eb744a1612fedd187902e65d7718500f4e8d
2019-08-01 22:49:22 -07:00
Edgar Wang
8e3b202070 Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev 2019-08-02 05:38:23 +00:00
android-build-team Robot
3c6f2108a8 Merge cherrypicks of [9131405, 9130772, 9131110, 9131093, 9131019, 9131394, 9131395, 9131396, 9131406, 9131480, 9131397] into qt-c2f2-release
Change-Id: Ib91991cbbbda41bae347ca9f17e1405e9d960f89
2019-08-02 04:02:33 +00:00
Daniel Solomon
eb15083e1b Settings: change the color mode preview image
Change the color mode preview image to better illustrate the difference
between Natural and Boosted color modes.

Bug: 138126243
Test: manual testing on Pixel
Change-Id: I367b383f9f2da9b2e2d5960e51c3ec7821d4915b
(cherry picked from commit 56574d5924)
2019-08-02 04:00:51 +00:00
Daniel Solomon
4c1fa1a5d1 Merge "Settings: change the color mode preview image" into qt-r1-dev
am: c5fbd7b669

Change-Id: Icfc151ca32fa3ab44a68acc4732e3e9307372f22
2019-08-01 13:37:33 -07:00
TreeHugger Robot
c5fbd7b669 Merge "Settings: change the color mode preview image" into qt-r1-dev 2019-08-01 19:58:47 +00:00
Youming Ye
de8c3c5fd3 Check the missing useHomeWfMode case
am: b7923f5a3f

Change-Id: I8ffa6acb13e07b4a28b8f46b348ffc47c143a317
2019-08-01 11:24:55 -07:00
Edgar Wang
58a5be4401 Add skip lock screen in Notification & security lock screen settings
Users may have trouble finding this setting in face auth.
Heard this from dogfood/executive feedback and customer support discussion.
So add Skip Lock Screen preference in
Display > Lock screen display > What to show >
and
App & Notifications > Notifications > Lock Screen >

Bug: 138458558
Test: robotest & manual

Change-Id: I10e420821423821743d65b00c8b7e6d4d1224e00
2019-08-01 11:17:05 +08:00
android-build-team Robot
4f9ca13dab Snap for 5771674 from 4685c785b9 to qt-c2f2-release
Change-Id: Iad6a6b732e6fc157c0355ee58ca23d55363afe0f
2019-08-01 03:11:46 +00:00
Youming Ye
b7923f5a3f Check the missing useHomeWfMode case
Bug: 133812904
Test: Build
Change-Id: If89c67c0595808a1339517c6084f1d1e23f5974b
Merged-In: If89c67c0595808a1339517c6084f1d1e23f5974b
2019-07-31 16:38:32 -07:00
Antony Sargent
e744ee1295 Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev
am: 4685c785b9

Change-Id: I1ce1afeee9ab139ff47a1deec14d536c8c9529ad
2019-07-31 16:04:54 -07:00
Bill Yi
f580528464 [automerger skipped] Import translations. DO NOT MERGE
am: 5a690f3c4c -s ours
am skip reason: subject contains skip directive

Change-Id: Ibc64425d1a731f6cbd45d44b18537edfdd88acbd
2019-07-31 15:53:13 -07:00
TreeHugger Robot
4685c785b9 Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev 2019-07-31 22:39:22 +00:00
Antony Sargent
482415d37e Protect entry points to add an eSIM when admin restricted
If the DISALLOW_CONFIG_MOBILE_NETWORKS admin policy is set, we were
accidentally still allowing access to the flow where you add an eSIM
subscription via the "plus" button on the Network & internet page. While
fixing this, I also noticed that the mobile networks list page (which
only becomes available if you have multiple subscriptions) has a link at
the bottom to start the flow as well, and that wasn't being protected.

The fix for the plus button on the Network & internet page was just to
make sure not to call setEnabled(true) if the preference was already
disabled by admin policy, since that has the effect of overriding the
admin-disabling.

The fix for the mobile networks list page just needed to add the
relevant tags in the layout XML, and then we get it for free.

Fixes: 137627845
Test: make RunSettingsRoboTests
Change-Id: I896ac248f50aaeecc157791938a0a0a98265aa07
2019-07-31 12:53:39 -07:00
Daniel Solomon
56574d5924 Settings: change the color mode preview image
Change the color mode preview image to better illustrate the difference
between Natural and Boosted color modes.

Bug: 138126243
Test: manual testing on Pixel
Change-Id: I367b383f9f2da9b2e2d5960e51c3ec7821d4915b
2019-07-31 12:48:23 -07:00
Bill Yi
5a690f3c4c Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I3e51c61d9bdff182bc83a04242ccd6e1e4f9629d
2019-07-31 12:09:08 -07:00
android-build-team Robot
cc99d7b729 Snap for 5768201 from 17908b1e8f to qt-c2f2-release
Change-Id: Ib718185ee9630ec2e64387665d5c0558629b2597
2019-07-31 03:18:02 +00:00
Quang Luong
815af2ba6e Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev
am: 17908b1e8f

Change-Id: I0adf1cc87a31b4daa762baf67e2e99415b35491a
2019-07-30 17:12:17 -07:00
TreeHugger Robot
17908b1e8f Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev 2019-07-30 23:33:22 +00:00
Antony Sargent
9e58a8df39 Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev
am: 66208e734b

Change-Id: Ifb4c387a8663fda3a642b03b68777079d1c5a619
2019-07-30 15:43:32 -07:00
Bill Yi
c7b0ab4b49 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 67afe87617 -s ours
am skip reason: subject contains skip directive

Change-Id: Iaf9f87ae5aab01ba07c15825d8551460ae810354
2019-07-30 15:42:26 -07:00
TreeHugger Robot
66208e734b Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev 2019-07-30 22:33:32 +00:00
TreeHugger Robot
67afe87617 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-07-30 21:39:43 +00:00
Antony Sargent
6d910e8608 Make EnabledNetworkModePreferenceController listen to setting changes
The controller for the "Preferred network type" preference on the SIM
details page wasn't listening for changes to the underlying global
setting, so changes to the setting would be reflected in SysUI but not
on this page if it happened to be showing.

Bug: 135667565
Test: make RunSettingsRoboTests
Change-Id: I5dfe4843a681c613f49caf4584e9dbebc54e708a
2019-07-30 12:30:19 -07:00
Bill Yi
0501bbb97f Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id8561f757b8520ebbd976cc9b06fa833b68575d8
2019-07-30 11:55:38 -07:00
Bill Yi
f72e0eeddd [automerger skipped] Import translations. DO NOT MERGE am: 9af3e6a625 -s ours
am: f5c8056f7a -s ours
am skip reason: subject contains skip directive

Change-Id: Ia98dea474d8c568821fe7612181a039f48bf9580
2019-07-30 11:53:10 -07:00
Bill Yi
88c1e9ff62 [automerger skipped] Import translations. DO NOT MERGE am: 9af3e6a625 -s ours
am: e5dd9176ca -s ours
am skip reason: subject contains skip directive

Change-Id: Ib09846428898767c3745f7b17e81f09de19eda66
2019-07-30 11:43:41 -07:00
Bill Yi
e5dd9176ca [automerger skipped] Import translations. DO NOT MERGE
am: 9af3e6a625 -s ours
am skip reason: subject contains skip directive

Change-Id: I30d1996db7f73e5e38515fad56ea9bc9d8f44450
2019-07-30 11:34:43 -07:00
Bill Yi
1e7de9c312 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: f63cb669ff -s ours
am skip reason: subject contains skip directive

Change-Id: I3a24b910fa6a98e131419c738600296abdca963b
2019-07-30 11:32:38 -07:00
Bill Yi
f5c8056f7a [automerger skipped] Import translations. DO NOT MERGE
am: 9af3e6a625 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic131b3c52fc5f2c0bd1b735a376df65108490f5e
2019-07-30 11:32:37 -07:00
TreeHugger Robot
f63cb669ff Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-07-30 18:09:15 +00:00
Antony Sargent
20c9eff53e Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev
am: 985d3d570d

Change-Id: I02252dd85f3b11aef3109e1a0193faba8bb9c240
2019-07-30 09:54:25 -07:00
TreeHugger Robot
985d3d570d Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev 2019-07-30 16:41:29 +00:00
Bill Yi
f2e88c8cd7 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ie730f2fa36caf0c3d99159cc649ed7e24ca2ceec
2019-07-29 17:02:13 -07:00
Bill Yi
9af3e6a625 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Idbe888a8bb4d386d7d8e883cc530561c1a5806ad
2019-07-29 16:46:49 -07:00
android-build-team Robot
19ffddb811 Merge cherrypicks of [9007561, 9007562, 9007563, 9007600, 9007801, 9007895, 9007389] into qt-release
Change-Id: Ib68db973c7a9b5875ecd65bcb683793978020065
2019-07-28 22:26:53 +00:00
Kevin Chyn
adef4840f3 Do not request cancel authentication unless currently authenticating
Currently we always send cancel() if ConfirmDeviceCredentialActivity
goes into the background. However, if the biometric state is no longer
authenticating, requesting cancel() in this state will result in an
inconsistent state between BiometricService/client and
ConfirmDeviceCredentials.

BiometricService/client will receive the ERROR_CANCELED message incorrectly,
while ConfirmDeviceCredential is showing / pending user password. When
the password is entered, its result is ignored.

The correct behavior is for ConfirmDeviceCredentialActivity to invoke
cancel() only if it's still authenticating. Otherwise BiometricService
and its client will receive ERROR_CANCELED, instead of the actual password
auth result.

Bug: 138279856

Test: BiometricPromptDemo, enable device credential fallback, get into
      lockout state, successfully enter password. API result is
      success instead of "canceled" now.

Change-Id: I6521e896d0402fe856dc85476f51149c9b3084a8
Merged-In: I6521e896d0402fe856dc85476f51149c9b3084a8
(cherry picked from commit 49c7d07650)
2019-07-28 22:26:26 +00:00
android-build-team Robot
34e21e206a Snap for 5761090 from 04ad8c905a to qt-c2f2-release
Change-Id: I7d4bee917ccbbc7b6ca9a4a0471a03a9f874778b
2019-07-27 23:09:10 +00:00
Jason Chiu
f7423fd7ac Merge "Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings" into qt-r1-dev
am: 04ad8c905a

Change-Id: Id2ee2415fffd70bcf94aa2a305125d983ae5bd9e
2019-07-26 18:45:07 -07:00
TreeHugger Robot
04ad8c905a Merge "Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings" into qt-r1-dev 2019-07-27 01:29:55 +00:00
Kevin Chyn
9f395fd0a9 [automerger skipped] Do not request cancel authentication unless currently authenticating am: 49c7d07650 -s ours
am: 587d8d7005 -s ours
am skip reason: change_id I6521e896d0402fe856dc85476f51149c9b3084a8 with SHA1 0a33d62a17 is in history

Change-Id: I2ed1d97f1fa5104e1c381babc2625cb69b147b6c
2019-07-26 18:14:54 -07:00