Christine Franks
8e7f23910f
Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev am: 37b38f872f
...
am: 31cc369a4d
Change-Id: I578907b141f2a6a705473394e16519507997caa8
2019-08-04 01:37:50 -07:00
Christine Franks
e003f38b53
[DO NOT MERGE] Update title for null uri when setting changes am: ea14373666
...
am: c48918dac0
Change-Id: I268d4d01a515e1c49b83e3c321af230cb06bffc9
2019-08-04 01:32:21 -07:00
Christine Franks
31cc369a4d
Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev
...
am: 37b38f872f
Change-Id: Ie2b1e884d7501fb1d37ce816a5f4c78042be6300
2019-08-04 00:53:35 -07:00
Christine Franks
c48918dac0
[DO NOT MERGE] Update title for null uri when setting changes
...
am: ea14373666
Change-Id: Idca3e0d0855ced876f4bd891739e0141ec86a777
2019-08-04 00:53:29 -07: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
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
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
8e3b202070
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
2019-08-02 05:38:23 +00: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
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
84049d217d
Check the missing useHomeWfMode case
...
am: b7923f5a3f
Change-Id: I81aadd772a8c8b07ca6c967868789aa91fe0dba9
2019-08-01 11:27:48 -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
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
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
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
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
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
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
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
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
Bill Yi
7543f194d4
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 67afe87617
-s ours
...
am: 1b86d59384
-s ours
am skip reason: subject contains skip directive
Change-Id: I2aa2952eec13d8c7fcb0ae1eeb437e780ef8c818
2019-07-30 15:57:25 -07:00
Antony Sargent
5a39d48ab2
Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev
...
am: 66208e734b
Change-Id: I7e1494a1859393844ad5810a9721bf3865ed5f75
2019-07-30 15:43:32 -07:00
Bill Yi
1b86d59384
[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: I253e0acc117f894554878c91ba084cca775eb7bd
2019-07-30 15:42:25 -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
20d501562e
[automerger skipped] Import translations. DO NOT MERGE am: 9af3e6a625
-s ours am: f5c8056f7a
-s ours
...
am: 3cda841897
-s ours
am skip reason: subject contains skip directive
Change-Id: I8670a31858f74816775f9ca91e799e08719d7284
2019-07-30 12:03:57 -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
3cda841897
[automerger skipped] Import translations. DO NOT MERGE am: 9af3e6a625
-s ours
...
am: f5c8056f7a
-s ours
am skip reason: subject contains skip directive
Change-Id: I8d700ef074dff397a3e02cca8945935a549c77df
2019-07-30 11:47:09 -07:00
Bill Yi
7e31de784c
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: f63cb669ff
-s ours
...
am: 50dc17d8bc
-s ours
am skip reason: subject contains skip directive
Change-Id: I594fbdb0e5eea0247dfa12fd5eff51677627e41c
2019-07-30 11:43:40 -07:00
Bill Yi
50dc17d8bc
[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: Ia87ca65aaf5bf3f43c2d15b944bdf06a74f857c6
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
28f6c96822
Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev am: 985d3d570d
...
am: 42861b21c9
Change-Id: I0f3fae2daf7c5df5985e2fd6597fdf563fdb095c
2019-07-30 10:28:26 -07:00
Antony Sargent
42861b21c9
Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev
...
am: 985d3d570d
Change-Id: Ic653102f8f66c0f5e1e3457750cdf150f1dbfd5e
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
Julia Reynolds
cfe218cf43
Merge "Move channel listing into a pref controller" into qt-qpr1-dev
...
am: 2d035ddfa2
Change-Id: Ice7a48d0fdad00b8d1f09a1da1fe39d5a8d85e79
2019-07-29 13:23:00 -07:00
TreeHugger Robot
2d035ddfa2
Merge "Move channel listing into a pref controller" into qt-qpr1-dev
2019-07-29 18:42:25 +00:00
TreeHugger Robot
0805e3d641
Merge "Fix launching of work profile notif settings" into qt-qpr1-dev
2019-07-29 02:28:37 +00:00
Jason Chiu
3ed75c8478
Merge "Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings" into qt-r1-dev
...
am: 04ad8c905a
Change-Id: I2c87041fb5575dfd621f4a9539653342c75d544f
2019-07-26 18:44:26 -07:00