Jack Yu
c4a0475681
Only primary user is allowed to control secure nfc am: 0e57ff90cd
am: c098bdcad0
am: 3ccadd2c97
am: 9d643d3042
am: 4745a591c5
am: 34ce0e2c3a
am: 1befdab699
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458
Change-Id: Iafe87e53b9337f84dcd44494e509aa8398b0298c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 14:42:19 +00:00
Jack Yu
1befdab699
Only primary user is allowed to control secure nfc am: 0e57ff90cd
am: c098bdcad0
am: 3ccadd2c97
am: 9d643d3042
am: 4745a591c5
am: 34ce0e2c3a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458
Change-Id: I0df6b9e868058e014644742f2cfa4841d83ad838
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 13:49:58 +00:00
Jack Yu
34ce0e2c3a
Only primary user is allowed to control secure nfc am: 0e57ff90cd
am: c098bdcad0
am: 3ccadd2c97
am: 9d643d3042
am: 4745a591c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458
Change-Id: Ia0803da9acf81da41d5ffd289b705eb3e7128547
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 13:16:57 +00:00
Jack Yu
4745a591c5
Only primary user is allowed to control secure nfc am: 0e57ff90cd
am: c098bdcad0
am: 3ccadd2c97
am: 9d643d3042
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458
Change-Id: I3099c3e158aaf0a99a8fa3d894b0c5dc1713e2b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 12:22:41 +00:00
Jack Yu
9d643d3042
Only primary user is allowed to control secure nfc am: 0e57ff90cd
am: c098bdcad0
am: 3ccadd2c97
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458
Change-Id: I763baefc5b94776c0583273fe9ab47ae99e6a57c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 11:27:23 +00:00
Jack Yu
3ccadd2c97
Only primary user is allowed to control secure nfc am: 0e57ff90cd
am: c098bdcad0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458
Change-Id: I5690485d1cacd39b5b74316f561691bc68d48787
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 10:10:20 +00:00
Jack Yu
c098bdcad0
Only primary user is allowed to control secure nfc am: 0e57ff90cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458
Change-Id: I35c94f779d47e27c170ec3b4becafc563f077a68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 09:21:04 +00:00
Patrick Rohr
d2d340146e
Enable ethernet data usage when FEATURE_USB_HOST is present
...
Ethernet is enabled when either FEATURE_ETHERNET *or* FEATURE_USB_HOST
is present. See ConnectivityService#deviceSupportsEthernet.
ConnectivityService#deviceSupportsEthernet should really be moved to
some commonly accessible location.
Test: TH
Change-Id: I497d99169248db7e5948b3a19134ab42e66d5b9b
2023-02-03 03:32:02 +00:00
Android Build Coastguard Worker
3c6b05ad9d
Snap for 9556973 from a50ca10f33
to tm-qpr3-release
...
Change-Id: Ib79d7b101f55f2c0a09d70d7c98bcbe1a29e0f14
2023-02-03 00:26:07 +00:00
Chengfei Tao
08ac9c1246
Accessibility toggle button small tappable area fix
...
Revert part of the layout change from b/233835795 fix so that
the issue of small tappable area in b/265859032 is fixed while
we continue to look at a better fix for b/233835795
Test: Manually change different Display & Font size to test UI
Test: m RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.biometrics.face.FaceEnrollEducationTest"
Bug: 265859032
Change-Id: I90ba7cc11dc61380dfdf0c3bcd2c59a17b43ee0e
2023-02-02 15:14:28 +08:00
TreeHugger Robot
8d75b9c6d4
Merge "Update illustration for tablet" into tm-qpr-dev am: a50ca10f33
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21187563
Change-Id: Iecd7bf4950b5ea60d0abc648fe7df7ab790ebd3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-02 03:45:23 +00:00
TreeHugger Robot
a50ca10f33
Merge "Update illustration for tablet" into tm-qpr-dev
2023-02-02 03:09:34 +00:00
Josh Hou
0333fd29a5
[automerger skipped] Fix the security vulnerability issue in AppLocalePickerActivity am: 33ef83795e
am: 406abc4d62
-s ours am: 576564873f
-s ours
...
am skip reason: Merged-In I2e25a308bcba6ea0edee89c7a78465f766bdbeac with SHA-1 5d7d1665fe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21152842
Change-Id: I0d19fee172000f2be5a0eae55d63d26ec5267f1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-02 02:02:51 +00:00
Edgar Wang
296f4c4a6f
Update illustration for tablet
...
Fixes: 244271773
Test: visual
Change-Id: Ic8968a951fc6c9b8023aa522aabdac3f1bcb84d3
2023-02-02 01:33:06 +00:00
Josh Hou
576564873f
[automerger skipped] Fix the security vulnerability issue in AppLocalePickerActivity am: 33ef83795e
am: 406abc4d62
-s ours
...
am skip reason: Merged-In I2e25a308bcba6ea0edee89c7a78465f766bdbeac with SHA-1 5d7d1665fe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21152842
Change-Id: I19bad7bb7aa3f25ecc76494082a4a725c690a039
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-02 01:28:45 +00:00
Josh Hou
406abc4d62
Fix the security vulnerability issue in AppLocalePickerActivity am: 33ef83795e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21152842
Change-Id: Ic0ff8ade7897052d04c118dc0a8f67312f5d0ebf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-02 00:50:59 +00:00
Josh Hou
3f4d63b943
Merge "Fix the security vulnerability issue in AppLocalePickerActivity" into tm-qpr-dev am: 1739114d44
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21052003
Change-Id: Iab6296f2dcdef8a25c0cb514bce478afcc70d67d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-02 00:50:04 +00:00
Android Build Coastguard Worker
9419f1918a
Snap for 9552684 from b5215abde7
to tm-qpr3-release
...
Change-Id: I459d226e0f18c5cc1b2bc87e278e17a21be288a7
2023-02-02 00:26:13 +00:00
Josh Hou
1739114d44
Merge "Fix the security vulnerability issue in AppLocalePickerActivity" into tm-qpr-dev
2023-02-02 00:15:12 +00:00
Diya Bera
4d67530e85
Merge "Tests for SUW in work mode" into tm-qpr-dev am: 31406c042d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20505465
Change-Id: Ida39801c898a529725f3fc7484e8907a2591e348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-01 23:59:37 +00:00
Diya Bera
31406c042d
Merge "Tests for SUW in work mode" into tm-qpr-dev
2023-02-01 23:29:35 +00:00
Diya Bera
1021b58ae5
Tests for SUW in work mode
...
Bug: 247049655
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=MultiBiometricEnrollHelperTest
Change-Id: Ifabb96a90c340bc9306cc0f033ba103c614f32a9
2023-02-01 22:05:09 +00:00
Edgar Wang
366ed57197
Merge "Update lottie illustration for tablet" into tm-qpr-dev am: b5215abde7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154459
Change-Id: If11468af414a092695276e4040f735fc88245828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-01 10:45:19 +00:00
Edgar Wang
b5215abde7
Merge "Update lottie illustration for tablet" into tm-qpr-dev
2023-02-01 10:22:46 +00:00
Josh Hou
33ef83795e
Fix the security vulnerability issue in AppLocalePickerActivity
...
Examine whether the packages is allowed to display app locales list when creating the AppLocalePickerActivity, and examine whether the target user is the same as the calling user.
Bug: 257954050
Test: Follows the test step listed in b/257954050#comment14
Change-Id: I2e25a308bcba6ea0edee89c7a78465f766bdbeac
Merged-In: I2e25a308bcba6ea0edee89c7a78465f766bdbeac
2023-02-01 15:49:20 +08:00
Josh Hou
5d7d1665fe
Fix the security vulnerability issue in AppLocalePickerActivity
...
Examine whether the packages is allowed to display app locales list when creating the AppLocalePickerActivity, and examine whether the target user is the same as the calling user.
Bug: 257954050
Test: Follows the test step listed in b/257954050#comment14
Change-Id: I2e25a308bcba6ea0edee89c7a78465f766bdbeac
Merged-In: I2e25a308bcba6ea0edee89c7a78465f766bdbeac
2023-02-01 15:42:22 +08:00
Edgar Wang
2f5f6d4ee6
Update lottie illustration for tablet
...
Bug: 243889662
Bug: 243889643
Test: visual
Change-Id: Icac10e4401da3d704350aef6ef2723ff92ca34f8
2023-02-01 07:27:18 +00:00
Android Build Coastguard Worker
303363bf45
Snap for 9547664 from 7e524288b5
to tm-qpr3-release
...
Change-Id: I6866fe1edb4de21662977670c83613a063f25f03
2023-02-01 00:26:14 +00:00
Yong Zhang
f691b4302d
Merge "Adjust AlwaysExpand List so that face detail settings will show in side panel while posture guidance will show full-screen" into tm-qpr-dev am: 6cb1a7ce5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21135024
Change-Id: I64554550e193357bc8e7061888e771f1e1d27b44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-01 00:11:05 +00:00
Yong Zhang
6cb1a7ce5a
Merge "Adjust AlwaysExpand List so that face detail settings will show in side panel while posture guidance will show full-screen" into tm-qpr-dev
2023-01-31 23:33:24 +00:00
Derek Jedral
f97be25252
Add strings for active unlock in settings am: 7e524288b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21085463
Change-Id: Iaa95d0da2da997d685cedffe6b9c0396c92f6e2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-31 20:55:11 +00:00
Jack Yu
0e57ff90cd
Only primary user is allowed to control secure nfc
...
Bug: 238298970
Test: manual
Merged-In: I945490ef1e62af479a732c9a260ed94bdd8bc313
Change-Id: I945490ef1e62af479a732c9a260ed94bdd8bc313
2023-01-31 07:41:49 +00:00
Derek Jedral
7e524288b5
Add strings for active unlock in settings
...
Add strings that active unlock needs to consume when surfacing itself in
combined biometrics settings.
Test: none, strings aren't consumed yet.
Bug: 266583888
Bug: 240437016
Change-Id: I41e3b9c1830212303fc3379462e80cb18a23d026
Merged-In: I41e3b9c1830212303fc3379462e80cb18a23d026
2023-01-30 18:17:32 -08:00
Android Build Coastguard Worker
14a1f7e03c
Snap for 9541236 from 6b55b6c07a
to tm-qpr3-release
...
Change-Id: I2dc862c51001bc0f38b0877c8da34eab1caa8d94
2023-01-31 00:26:16 +00:00
Treehugger Robot
b1963ab733
Merge "Fixes resource file exemption." am: 888759dd9f
am: b6050b438d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2395652
Change-Id: Idf4f02ff98d516d42e48e372bac9455386247906
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-30 22:20:06 +00:00
Treehugger Robot
b6050b438d
Merge "Fixes resource file exemption." am: 888759dd9f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2395652
Change-Id: I36b5629352f9dcff89dc387e50e77d1eed083ad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-30 21:36:22 +00:00
Treehugger Robot
888759dd9f
Merge "Fixes resource file exemption."
2023-01-30 20:28:12 +00:00
TreeHugger Robot
da5b93a2ac
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6b55b6c07a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21128395
Change-Id: I8d1a053931f09b1be50630d1bc943c37110a000a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-30 18:12:36 +00:00
Bill Yi
a60cc4b92f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72a66bbf28
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21128395
Change-Id: Ie4f6c55d788b07a6cc1fb7d6f6ea10012aede46f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-30 18:12:03 +00:00
TreeHugger Robot
6b55b6c07a
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-01-30 17:44:51 +00:00
Valentin Iftime
64d45c576e
Fix notification settings bottom sheet scroll in landscape am: 1e81f6eb95
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21142898
Change-Id: I46a70404c8a2032ae605ba7bbdb95a6b04be728b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-30 17:08:32 +00:00
Valentin Iftime
1e81f6eb95
Fix notification settings bottom sheet scroll in landscape
...
Fix layout size and configuration listener for landscape orientation.
Test: adb shell cmd notification post "Test notif" &
adb shell am start -a android.settings.CHANNEL_NOTIFICATION_SETTINGS --es android.provider.extra.CHANNEL_FILTER_LIST "sound" --es android.provider.extra.CHANNEL_ID "shell_cmd" --es android.provider.extra.APP_PACKAGE "com.android.shell
Bug: 238845213
Change-Id: I6c2ba149cddfdf35292b0b6fc92c0d8418a86c54
2023-01-30 15:14:54 +00:00
Chengfei Tao
b5e5100f92
Adjust AlwaysExpand List so that face detail settings will show in side panel
...
while posture guidance will show full-screen
Test: Manual testing with power cycle
Bug: 263068723
Change-Id: I6d632d08dcb3597cd8470f8d3d34258e4280dc14
2023-01-30 10:17:04 +08:00
Android Build Coastguard Worker
b420deb9b7
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21091560'] into tm-qpr2-release.
...
Change-Id: I3c4506dd06c6d9c185c699d63297f4fe586ab843
2023-01-28 02:57:21 +00:00
Behnam Heydarshahi
a61c636eab
DO NOT MERGE ANYWHERE
...
Revert "Read flag to show/hide notification slider"
Revert submission 20180104-flag_for_b38477228
Reason for revert: b/261809910 fixing for qpr2
Reverted changes: /q/submissionid:20180104-flag_for_b38477228
Change-Id: Id3ebc6627d6b46172cae1ce9e5c7500a652e719d
(cherry picked from commit b1195633da9d203056d29df8f119820425a33254)
Merged-In: Id3ebc6627d6b46172cae1ce9e5c7500a652e719d
2023-01-28 02:56:59 +00:00
Android Build Coastguard Worker
df796f6482
Snap for 9535926 from 4591a191e1
to tm-qpr3-release
...
Change-Id: I1062b1704e43d4ee5deb51548c6ba74d9b3d169e
2023-01-28 02:26:09 +00:00
Bill Yi
72a66bbf28
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If0994989dc0ca9781b9cce2543977117050691a3
2023-01-27 14:18:04 -08:00
Treehugger Robot
fc8edace62
Merge "Add mtv engineers to owners for emergency code reviews" am: 3272025234
am: f706f0fc0f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2404300
Change-Id: I80de049254f8ae4503a137cccf466dd984873b6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-27 21:15:59 +00:00
Treehugger Robot
f706f0fc0f
Merge "Add mtv engineers to owners for emergency code reviews" am: 3272025234
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2404300
Change-Id: I50416ec05b1f205986f48fa3635190ec9f48a64d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-27 20:25:55 +00:00
Treehugger Robot
3272025234
Merge "Add mtv engineers to owners for emergency code reviews"
2023-01-27 19:21:59 +00:00