Alex Johnston
4a4e2bae61
Merge "RequestManageCredentials dark theme" into sc-dev
2021-04-21 08:45:06 +00:00
TreeHugger Robot
2994c48135
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 73a806fa37 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14261574
Change-Id: I09e49acd89e10b6d56d4d20a7ed63f1d4bb59af4
2021-04-21 08:41:09 +00:00
TreeHugger Robot
e93c8524ae
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6d25cfcc3b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14261566
Change-Id: I3dbd96a9a6f84fed5ea033197ce97fbd807274bf
2021-04-21 08:40:21 +00:00
TreeHugger Robot
30096f6235
Merge "[Provider Model] Carrie Wi-Fi offload toggle request (panel)" into sc-dev am: b8f0a8e2dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14251407
Change-Id: I7f808313788d73852f3d7af81ee4c4357587fe4f
2021-04-21 08:40:12 +00:00
TreeHugger Robot
f83576092c
Merge "[Provider Model] Carrie Wi-Fi offload toggle request" into sc-dev am: d4a4fead67
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14236566
Change-Id: Id0118f30be2fcae220369a15f31a76753727696d
2021-04-21 08:40:01 +00:00
TreeHugger Robot
58ff823e7e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b2185f5ede -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14261000
Change-Id: I905f157e08ee5b07b2ea5a0851212faa53b4fb3a
2021-04-21 08:39:24 +00:00
Bill Yi
95ffa79af1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 34ce6187c8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14260991
Change-Id: I218735c7a6468d882769285c4f4fa0e7ab1d563c
2021-04-21 08:39:21 +00:00
TreeHugger Robot
bdd118dd32
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-04-21 08:35:24 +00:00
TreeHugger Robot
73a806fa37
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-21 08:25:07 +00:00
TreeHugger Robot
6d25cfcc3b
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-21 08:25:04 +00:00
TreeHugger Robot
b2185f5ede
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-04-21 08:21:52 +00:00
TreeHugger Robot
b8f0a8e2dc
Merge "[Provider Model] Carrie Wi-Fi offload toggle request (panel)" into sc-dev
2021-04-21 08:19:23 +00:00
TreeHugger Robot
d4a4fead67
Merge "[Provider Model] Carrie Wi-Fi offload toggle request" into sc-dev
2021-04-21 08:19:13 +00:00
Alex Johnston
e9717d265e
Fix maximum time to lock
...
Changes
* Restore previous timeout behaviour. This
behaviour was modified in Android S and
was previously working on Android R.
* If the selected timeout is less than
the max timeout set by the admin, select
the largest possible timeout.
* If there are no possible timeouts for the
user, disable the preference.
Manual testing steps
* Download CtsVerifier and CtsEmptyDeviceOwner apks
* Set device owner
* Run Policy transparency test > set max time to lock
* Set max time to lock and verify correct value is
shown in Settings. Compare behaviour with Android R.
Bug: 184104507
Test: manual testing
atest com.android.settings.display.ScreenTimeoutSettingsTest
Change-Id: I8d0e66ccce14cca244bcd380fd225a31df0b8999
2021-04-21 08:09:25 +00:00
Bill Yi
1d413d8390
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic67b0bfa2e86c32e2084d36459916aae031f97ed
2021-04-21 07:25:12 +00:00
Bill Yi
18bbddbc72
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I179f0d31dcca4db83624ecd31c0d88fc24a93559
2021-04-21 07:17:44 +00:00
Bill Yi
258d71bdb5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I78ea5296db70d652825abe7a8838613027945e53
2021-04-21 07:13:04 +00:00
Bill Yi
34ce6187c8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia246265007d3858abdac7c9c5d368c607afd5a15
2021-04-21 07:09:42 +00:00
Bill Yi
ca4797df06
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia3bcf08024545d44f87ac3208f6c2d5ff7a1d8fc
2021-04-21 07:06:47 +00:00
YUKAI HUNG
e72b6017a3
Merge "Add data validator to verify and log abnormal queried history data" into sc-dev am: 2f4ae2a0e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14251247
Change-Id: I8861428832fc78a9339bf366f119cc494828776f
2021-04-21 07:06:09 +00:00
Bill Yi
c7be92bf6a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id494d2571fc237ef47af58f96be1ef9e9025dc5e
2021-04-21 07:03:23 +00:00
YUKAI HUNG
2f4ae2a0e4
Merge "Add data validator to verify and log abnormal queried history data" into sc-dev
2021-04-21 06:45:57 +00:00
Menghan Li
03b4052395
Merge "[Material Next] Update main feature switch for Caption preferences." into sc-dev am: d3cc241c42
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14255410
Change-Id: If48503a6cd26b2df1fda8b65301d0e619d74ce72
2021-04-21 06:04:00 +00:00
Menghan Li
d3cc241c42
Merge "[Material Next] Update main feature switch for Caption preferences." into sc-dev
2021-04-21 05:46:20 +00:00
Sunny Shao
c361e3426f
Fix background inconsistency of the Settings page in SUW
...
- Pass the extra arguments to target page from vision settings.
- Add the android:colorBackground to LightTheme.SubSettings.SetupWizard.
Fixes: 185873105
Bug: 184901818
Test: manual test
Change-Id: I063a8df875b727aa0e119b03dfb782c2b95dc1b5
2021-04-21 13:35:45 +08:00
menghanli
b4558c9607
[Material Next] Update main feature switch for Caption preferences.
...
Fix: 185950803
Test: manual test
Change-Id: I5431461f3088652ddff7400b24b3eea25ddf5f9a
2021-04-21 11:39:56 +08:00
Jeremy Goldman
18cefd4e8c
Merge "Remove the "+" button on the help menu if no secure vpns can be created" into sc-dev am: 2fcb8531ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233625
Change-Id: Ia73668d79d196bde927c3724e944710ac2792ea2
2021-04-21 03:05:15 +00:00
Jason Hsu
17328af7f2
Merge "Fix accessibility settings page did not update the preference state" into sc-dev am: e8063609eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14029862
Change-Id: I6e1c8a6fe7d5eaa54fffe5c61e935a36d6e77d18
2021-04-21 03:05:05 +00:00
Jeremy Goldman
2fcb8531ab
Merge "Remove the "+" button on the help menu if no secure vpns can be created" into sc-dev
2021-04-21 03:01:39 +00:00
ykhung
70bef1049f
Add data validator to verify and log abnormal queried history data
...
Bug: 177406865
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I331922cf0b0e946066a72eb0bfcf9885dde9a7ce
2021-04-21 02:52:20 +00:00
Jason Hsu
e8063609eb
Merge "Fix accessibility settings page did not update the preference state" into sc-dev
2021-04-21 02:29:23 +00:00
Chloris Kuo
f06f289a85
NAS setting migration
...
Cancel onboarding notification when user migrates from settings
Test: make RunSettingsRoboTests
Bug: 185428329
Change-Id: I8b6b2eb8340442907c363e686bbd0b32b62d0db0
2021-04-20 19:03:56 -07:00
Curtis Belmonte
d758022916
Log new auth-related framework atoms for Android 12
...
Adds logging to Settings for new authentication and biometric atoms
introduced as part of ag/13856328.
Test: Manually trigger each case and verify log statements are called.
Bug: 185136248
Change-Id: Ic41a89da4f148dc94864f140e85b55f63643681b
2021-04-20 17:33:16 -07:00
Mady Mellor
2a95a27125
Merge "Change bubble settings to use Secure rather than Global" into sc-dev am: 2affde3202
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13474542
Change-Id: Icd245581e859780354add9daea801a3190e95f2c
2021-04-20 23:09:47 +00:00
Mady Mellor
2affde3202
Merge "Change bubble settings to use Secure rather than Global" into sc-dev
2021-04-20 23:06:40 +00:00
TreeHugger Robot
307dea2d9c
Merge "Fix search index for a financed device" into sc-dev am: db3767e7b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14163911
Change-Id: I2d30a620a9c7f2fd877806bed5d71355edef331d
2021-04-20 21:38:45 +00:00
Jay Aliomer
dd5137ddfa
Notif history Long tap functions as short tap
...
Test: manual
Fixes: b/175465501
Change-Id: I21602e87ca3d9260ba2e99006ac13d1358e4db0a
2021-04-20 17:14:29 -04:00
TreeHugger Robot
db3767e7b3
Merge "Fix search index for a financed device" into sc-dev
2021-04-20 21:06:45 +00:00
TreeHugger Robot
b6bc26e075
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 33583e7990 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14252815
Change-Id: I7454efd4d14dc6e38cc0a9965ed45b0325d9e56b
2021-04-20 20:26:01 +00:00
TreeHugger Robot
0788a02d99
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f988d7688b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14253505
Change-Id: I169ccbaf79145e066058ce47442ec3b17401d1c8
2021-04-20 20:25:23 +00:00
TreeHugger Robot
33583e7990
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-20 20:04:02 +00:00
TreeHugger Robot
f988d7688b
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-20 19:46:16 +00:00
Salud Lemus
9068481299
Fix search index for a financed device
...
Now with two preference controllers, one for enterprise device and one
for financed device, the search index issue (querying "Financed device
info" in Settings does not show a search result) is fixed. The financed
preference controller is used when the device is a financed device.
Otherwise, the enterprise preference controller is used.
Bug: 183551684
Test: Used a test device that is registered via ZT
Test: m RunSettingsRoboTests ROBOTEST_FILTER=EnterprisePrivacyPreferenceControllerTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=FinancedPrivacyPreferenceControllerTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=PrivacyPreferenceControllerHelperTest
Change-Id: I051144ec9004f86456285078ebb1c72266f80a55
2021-04-20 12:17:39 -07:00
Bill Yi
1d6b60889e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7f73237f7a7fcef3389c3afebadcafdb0be4d60c
2021-04-20 18:42:47 +00:00
Bill Yi
bf0d0fe30e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I02e17fc7d05452a591f4df992135821a4d8524cc
2021-04-20 18:35:03 +00:00
Neil Fuller
26d094b4a3
Remove restriction for "Use location..."
...
Remove restriction for "Use location to set time zone" toggle.
This setting should not be restricted. Using location is a personal
choice since it involves the use of the device's location.
Bug: 166579161
Test: manual testing with / without date/time restriction
Change-Id: I89973e1df5cad8b4c639c13478298f9b39f37b5f
2021-04-20 18:30:05 +01:00
sallyyuen
d95f92839e
Add extra dim keywords to aosp settings
...
Test: na
Bug: 170973645
Change-Id: I9cbb1b4245f4f656137c076c385bc1e404f8ed55
2021-04-20 09:51:51 -07:00
ykhung
339f760250
Add footer for battery usage page am: 1415cbc49a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14235152
Change-Id: I7314d2219346037931896a0b75aa2c105841519e
2021-04-20 16:50:37 +00:00
ykhung
3861d5d116
Add battery usage time summary to usage list item am: 7cc616e90f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233636
Change-Id: I7516e842303427752f9053df338716522401342b
2021-04-20 16:50:36 +00:00
Alex Johnston
dce68bf7a5
RequestManageCredentials dark theme
...
Manual testing steps
* Enable dark theme via Settings > display
* Install TestDPC and select 'Request to manage credentials'
* Verify dark theme is displayed (including light text)
Bug: 177901172
Test: atest com.android.settings.security.RequestManageCredentialsTest
manual testing
Change-Id: I6db1361ffcbf1e193673eb5ca7ef3f403d5023b1
2021-04-20 15:21:14 +00:00