Commit Graph

54908 Commits

Author SHA1 Message Date
Edgar Wang
09f2469440 Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070
am: 063cc34713

Change-Id: Ic856426092578e47418498de40e22aa484badb19
2019-08-01 23:00:15 -07: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
063cc34713 Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
am: 8e3b202070

Change-Id: Ib1cf35ee24f88a9eae71714349fe40cb982214b0
2019-08-01 22:49:22 -07:00
Edgar Wang
345315c440 Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
am: 8e3b202070

Change-Id: I37b7b29cd4c88948a6e7f0197bec84d0d1c2b0e4
2019-08-01 22:49:04 -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
2b40b40a95 Merge "Settings: change the color mode preview image" into qt-r1-dev am: c5fbd7b669
am: 4c1fa1a5d1

Change-Id: Iedf98f0f2b96ff79c567457c2aad7f2ef8e2e434
2019-08-01 13:54:52 -07:00
Daniel Solomon
442a2b26b4 Merge "Settings: change the color mode preview image" into qt-r1-dev am: c5fbd7b669
am: 8e699b6ec8

Change-Id: I5fb775ba96631cbf9ac28b2c9946d2915ea99c10
2019-08-01 13:53:32 -07:00
Daniel Solomon
6f2c664186 Merge "Settings: change the color mode preview image" into qt-r1-dev am: c5fbd7b669
am: 8e699b6ec8

Change-Id: I077cdf4c165158aa927f4d1aa0632b6c343b2fb2
2019-08-01 13:51:28 -07:00
Daniel Solomon
8e699b6ec8 Merge "Settings: change the color mode preview image" into qt-r1-dev
am: c5fbd7b669

Change-Id: I719cdde36a264519900584b9835d5c6e70cc5818
2019-08-01 13:38:20 -07: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
Daniel Solomon
c249d21eb4 Merge "Settings: change the color mode preview image" into qt-r1-dev
am: c5fbd7b669

Change-Id: Ic8e7827609bf0ae9862cbf38d7db5659c8107a6d
2019-08-01 13:27:42 -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
e4b53c55d2 Check the missing useHomeWfMode case am: b7923f5a3f
am: 84049d217d

Change-Id: I101a0d837a4912e316c3cd25f6f829d15cbc8745
2019-08-01 11:58:55 -07:00
Youming Ye
a427771754 [automerger skipped] Check the missing useHomeWfMode case am: b7923f5a3f
am: 84049d217d -s ours
am skip reason: change_id If89c67c0595808a1339517c6084f1d1e23f5974b with SHA1 b7923f5a3f is in history

Change-Id: I3bf159aeec518e09d910ca4ec9c96dc74f68fae3
2019-08-01 11:43:22 -07:00
Youming Ye
34599f661d Check the missing useHomeWfMode case am: b7923f5a3f
am: de8c3c5fd3

Change-Id: I068d40471deb73869b0586e2bd4ebbba522ac85d
2019-08-01 11:41:05 -07:00
Youming Ye
d893200d78 Check the missing useHomeWfMode case
am: b7923f5a3f

Change-Id: I359a8f3a93837b54a119f7dd9d8a7ca3b508e257
2019-08-01 11:30:47 -07:00
Youming Ye
84049d217d Check the missing useHomeWfMode case
am: b7923f5a3f

Change-Id: I81aadd772a8c8b07ca6c967868789aa91fe0dba9
2019-08-01 11:27:48 -07: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
afb537f589 Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev am: 4685c785b9
am: e744ee1295

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

Change-Id: Iff96dd12f5e8ce6ea3f63d442ca549d78a94eb54
2019-07-31 16:07:46 -07:00
Antony Sargent
bf2c5ce274 Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev am: 4685c785b9
am: ad2f49f851

Change-Id: I3caaf466e7c62cee4de6ef2a4e9695e8725736f1
2019-07-31 16:06:59 -07:00
Bill Yi
1aef5e268e [automerger skipped] Import translations. DO NOT MERGE am: 5a690f3c4c -s ours
am: 1ccff0ddc6 -s ours
am skip reason: subject contains skip directive

Change-Id: I4d033bda95f189c0617f59cffb021c31f477cab7
2019-07-31 16:05:53 -07:00
Antony Sargent
2e04fe31a3 Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev am: 4685c785b9
am: ad2f49f851

Change-Id: I7a87b32111936ce805f90cf68b7cbe7c8df498f9
2019-07-31 16:05:35 -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
Antony Sargent
81aab4471a Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev
am: 4685c785b9

Change-Id: Id759b8df825b2be7c0a4abff45630916807c1d19
2019-07-31 16:04:53 -07:00
Bill Yi
64512eb053 [automerger skipped] Import translations. DO NOT MERGE am: 5a690f3c4c -s ours
am: 1ccff0ddc6 -s ours
am skip reason: subject contains skip directive

Change-Id: I69d8e92cdbaca6f83a068ed2507b623728c8eac3
2019-07-31 16:04:50 -07:00
Antony Sargent
ad2f49f851 Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev
am: 4685c785b9

Change-Id: I5792ff5333005e2e0c66fd24d594b79bf67d140c
2019-07-31 15:56:00 -07:00
Bill Yi
1ccff0ddc6 [automerger skipped] Import translations. DO NOT MERGE
am: 5a690f3c4c -s ours
am skip reason: subject contains skip directive

Change-Id: Ic10bfa052664715f150c09abfc3f0015aa530ee8
2019-07-31 15:53:52 -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
Bill Yi
b7ac64528c [automerger skipped] Import translations. DO NOT MERGE
am: 5a690f3c4c -s ours
am skip reason: subject contains skip directive

Change-Id: I307a72b8b552d3ea5d81dfab8d5e76bcef70b368
2019-07-31 15:52:53 -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
dc74124232 Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev am: 17908b1e8f
am: 5c4a0e3444

Change-Id: I68a1a9451dda22ab32baf6bae395c0368b1f9b9b
2019-07-30 17:35:06 -07:00
Quang Luong
89a61d9374 Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev am: 17908b1e8f
am: 815af2ba6e

Change-Id: Ib5e2be02b8363dca4e129ac2c0aeba03c277ee91
2019-07-30 17:27:19 -07:00
Quang Luong
b66a8c86a4 Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev am: 17908b1e8f
am: 5c4a0e3444

Change-Id: Ib5545caea7cce930898c81fc0158877416666f89
2019-07-30 17:26:35 -07:00
Quang Luong
5c4a0e3444 Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev
am: 17908b1e8f

Change-Id: Ie1cdb83f47bac988b93401b3994a096d85333ce6
2019-07-30 17:16:00 -07: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
Quang Luong
877d4d6d0a Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev
am: 17908b1e8f

Change-Id: I52e92aeffd349ed17f832b34b352f28a6c575ccb
2019-07-30 17:10:59 -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
2640dd028e Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev am: 66208e734b
am: 9e58a8df39

Change-Id: Ie592b8f8639d1a29b1eb26f9979b55e1a895b02e
2019-07-30 15:59:27 -07:00
Antony Sargent
96c01305b2 Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev am: 66208e734b
am: 5a39d48ab2

Change-Id: I997f4cacaed95a2cc77af01cebc6d4452368d05e
2019-07-30 15:58:36 -07:00
Antony Sargent
87929ae314 Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev am: 66208e734b
am: 5a39d48ab2

Change-Id: Id51073c918d19403b47cc0bf21964a122d6cadf3
2019-07-30 15:58:21 -07:00