Joe Bolinger
0c8e25d2f6
Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272
am: 74efeebf5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813
Change-Id: Ibc1f8a07a645d6b7749c0af4a4b47a7c8e33a6de
2021-08-13 01:16:00 +00:00
Kevin Chyn
9e7a7cc40e
Do not show work profile strings for parent-managed enrollment am: 570540b15c
am: a92e3d9a03
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546128
Change-Id: I6c26b77b1539be5ef128250f3bb82d731434ac3a
2021-08-13 01:15:52 +00:00
Joe Bolinger
74efeebf5c
Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813
Change-Id: I28682e9fbbbb6c83b08ef45f10fd923d156c7742
2021-08-13 01:14:44 +00:00
Joe Bolinger
c78af9a272
Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev
2021-08-13 01:08:16 +00:00
Kevin Chyn
61c508e0a8
Do not show work profile strings for parent-managed enrollment am: 570540b15c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546128
Change-Id: Icf7a5685809ee27143391ea9215de680b3b33094
2021-08-13 01:01:35 +00:00
Kevin Chyn
a92e3d9a03
Do not show work profile strings for parent-managed enrollment am: 570540b15c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546128
Change-Id: I626b65d8db83f232ca4d173697dfb5d62e60d39d
2021-08-13 00:59:39 +00:00
Joe Bolinger
2296f618cc
Add biometric OWNERS to unit tests.
...
Fix: 196452210
Test: N/A
Change-Id: I6f76bef97dd61130dd546749591338864665352b
2021-08-12 16:17:03 -07:00
Kevin Chyn
570540b15c
Do not show work profile strings for parent-managed enrollment
...
Work profiles and parental management both utilize the
DevicePolicyManager KEYGUARD_DISABLE_* flags. This CL ensures that
work profile strings are only shown for work profiles, and not
parent-managed devices.
Bug: 196060286
Bug: 196443744
Test: Set up child account, then enroll from Settings > Security
Change-Id: Ib5ed1d63dd5d58ac64caf30010e340ac7784c38f
2021-08-12 15:56:38 -07:00
Julia Reynolds
2ffbb747d4
Handle spanned conversation labels
...
Test: Robotests
Fixes: 194446117
Change-Id: If21f727e00b181f0da127b09e5a1c46ec3257836
2021-08-12 20:11:00 +00:00
Calvin Pan
3bf80c66ff
Remove unnecessary condition
...
The call forward timer is only valid for the CF_REASON_NO_REPLY reason,
and it will be 0 in other cases. Remove the condition to prevent disable
processing not working.
Bug: 194112447
Test: Build pass
Change-Id: I824a61383b595284ee5694fcd31e58e2379997fb
2021-08-12 14:05:37 +00:00
Zoey Chen
95bcd7cb23
[Settings] Fix RTL issue of Calls and SMS
...
Screenshot: https://screenshot.googleplex.com/9BqEh99vz7xp2g4.png
Bug: 189300799
Test: make
Change-Id: I022253efbe0ea25f11d5ac6c2b3b0fcd1d9f54aa
(cherry picked from commit 54bd206fbc
)
Merged-In: I022253efbe0ea25f11d5ac6c2b3b0fcd1d9f54aa
2021-08-12 13:47:21 +00:00
Zoey Chen
f982f286a2
[Povider Model] Fix string in SIMs
...
Bug: 192058192
Test: make
Change-Id: I4314802840a4952acf7f090d81ca19ec28b793b2
(cherry picked from commit 84073b9851
)
Merged-In: I4314802840a4952acf7f090d81ca19ec28b793b2
2021-08-12 13:47:05 +00:00
Treehugger Robot
79978071e2
Merge "Add owner to the connected device folder" am: 6cbb4dfbe1
am: 004f5168d4
am: f5ddc8ffaa
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1793371
Change-Id: I1d0d6dd5c519aa6931771135dbc13c51c82ce8c0
2021-08-12 05:07:07 +00:00
Treehugger Robot
f5ddc8ffaa
Merge "Add owner to the connected device folder" am: 6cbb4dfbe1
am: 004f5168d4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1793371
Change-Id: Ic41c5d666d0740dc8a6f4bdbb9e644ad981adee1
2021-08-12 04:54:18 +00:00
Treehugger Robot
004f5168d4
Merge "Add owner to the connected device folder" am: 6cbb4dfbe1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1793371
Change-Id: I49a8ef27a0a7d45bd8e03666eee28db19fac2977
2021-08-12 04:41:10 +00:00
Treehugger Robot
6cbb4dfbe1
Merge "Add owner to the connected device folder"
2021-08-12 04:23:29 +00:00
Hugh Chen
ddf63eac87
Add owner to the connected device folder
...
Bug: 196287361
Test: local test
Change-Id: Ib800955f04bbd6c23b9a1700faa918f8b1126d79
2021-08-12 11:16:18 +08:00
Kevin Chyn
583301e49f
Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll am: 715e337af8
am: c97269a900
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15536197
Change-Id: I330f953a42777b7e9cf848a3c3446e9ac18b2c47
2021-08-12 01:26:27 +00:00
Kevin Chyn
4cf058b144
Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll am: 715e337af8
am: 26d1877a7b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15536197
Change-Id: I5984a44ef7519066dfd3150576825df631866d4c
2021-08-12 01:25:34 +00:00
Kevin Chyn
c97269a900
Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll am: 715e337af8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15536197
Change-Id: Ib119a60b7538073218d8b77d06d071bc57fd7973
2021-08-12 01:10:53 +00:00
Kevin Chyn
26d1877a7b
Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll am: 715e337af8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15536197
Change-Id: Id2a8c43f9bca79200f837759ce9de0a6eba2a37a
2021-08-12 01:10:01 +00:00
Kevin Chyn
715e337af8
Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll
...
Bug: 196060286
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL
Change-Id: Ib157dd916b1cfd2238cf6844a970d70cbf56faa6
2021-08-11 16:35:35 -07:00
Julia Reynolds
273df63430
Limit the number of concurrent notifs appear on screen am: abe9246caa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531757
Change-Id: I686166bf858ec7fde221e76b28c8280decc9ec13
2021-08-11 22:31:14 +00:00
Julia Reynolds
abe9246caa
Limit the number of concurrent notifs appear on screen
...
To avoid an ANR in notification history
Test: Manual; with an app with 10k recent notifications
Bug: 183712803
Change-Id: Ia1340accadf43620c7b5a2c94ca1032cfe49ea59
2021-08-11 20:22:53 +00:00
Bill Yi
3fe3a3368a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc24b1fc5
-s ours am: 4d8e7b1053
-s ours am: ef23c240bb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15516770
Change-Id: Ia437c2785e9efb14c44bd869532962497f282ad1
2021-08-11 02:08:47 +00:00
Bill Yi
428bc4eeb1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc24b1fc5
-s ours am: 4d8e7b1053
-s ours am: a882d0fb25
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15516770
Change-Id: Ib6c4cd5d366619532f152e7f81b11ed9ab9ea2da
2021-08-11 02:07:43 +00:00
Bill Yi
ef23c240bb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc24b1fc5
-s ours am: 4d8e7b1053
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15516770
Change-Id: I5e58552d5c13ac2af70eb4ad7ec20d799eac685f
2021-08-11 01:53:42 +00:00
Bill Yi
a882d0fb25
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc24b1fc5
-s ours am: 4d8e7b1053
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15516770
Change-Id: I8c181cc60b8fc5aa80148e97de80d8af1939c8c4
2021-08-11 01:52:50 +00:00
Bill Yi
4d8e7b1053
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc24b1fc5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15516770
Change-Id: Iecc762cad3adca3df40bd806c0cfb194ca519a9f
2021-08-11 01:41:07 +00:00
Joe Bolinger
9e9f1249d4
Refresh biometric preference controllers on lifecycle events.
...
Fix: 195961101
Test: make RunSettingsRoboTests
Test: manual (enroll via settings and verify preferences enabled after enrolling)
Change-Id: Ie50cd862a42c96eb95f2156a33f34748b2b8b50c
2021-08-10 13:29:05 -07:00
Bill Yi
38ee99244a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8bb1d57d6
-s ours am: bb0c70c0dd
-s ours am: b7bd3b2b27
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15516773
Change-Id: I79c183c86c647ca6c55dc581f2d73bb6959e04a2
2021-08-10 19:55:46 +00:00
TreeHugger Robot
2e00e26ac1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 57641d0db8
-s ours am: e0cc807a09
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15516775
Change-Id: Id786b27914c81be474b2eebaef61700661b6276f
2021-08-10 19:55:02 +00:00
Bill Yi
3a1bb9ed75
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8bb1d57d6
-s ours am: bb0c70c0dd
-s ours am: 372cc737af
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15516773
Change-Id: If4bca75a17c1102004aec8fdd1164b8fe7f5f71b
2021-08-10 19:54:50 +00:00
TreeHugger Robot
5a41d5afd4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 57641d0db8
-s ours am: c27e9b56fa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15516775
Change-Id: Id89d9907fcdd64e22ebd3f6db93d54c3ab8ecd9f
2021-08-10 19:54:26 +00:00
TreeHugger Robot
898179e43e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9aa8b8906e
-s ours am: 282a8c66c6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15516777
Change-Id: I05b37d91d8b3faae51f48d8a47369cec693b8138
2021-08-10 19:54:12 +00:00
TreeHugger Robot
a85c2cd999
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9aa8b8906e
-s ours am: 2732d753b9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15516777
Change-Id: I65b24b7b1a1f43bae1a9fe8a9d6ba10ff69a4615
2021-08-10 19:53:48 +00:00
Bill Yi
b7bd3b2b27
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8bb1d57d6
-s ours am: bb0c70c0dd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15516773
Change-Id: I20c34249b46bfad620489420f6c76890626ec98d
2021-08-10 19:40:11 +00:00
TreeHugger Robot
e0cc807a09
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 57641d0db8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15516775
Change-Id: I3408bedc4ee206ceb22dca0a61e19fdd11b0294b
2021-08-10 19:39:58 +00:00
TreeHugger Robot
282a8c66c6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9aa8b8906e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15516777
Change-Id: I405927f0d2ea72cbc09861162de46b1d9fd133d0
2021-08-10 19:39:28 +00:00
Bill Yi
372cc737af
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8bb1d57d6
-s ours am: bb0c70c0dd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15516773
Change-Id: I8c52ad8d7f44822a542a5959b0c9bb19b40783bb
2021-08-10 19:39:16 +00:00
TreeHugger Robot
c27e9b56fa
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 57641d0db8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15516775
Change-Id: I553ed3667349a5e1331cc74dfcc468c3aef53ba0
2021-08-10 19:38:46 +00:00
TreeHugger Robot
2732d753b9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9aa8b8906e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15516777
Change-Id: Idb1e357d747a4ebc3892a8ff24ef53d472389c30
2021-08-10 19:38:04 +00:00
Bill Yi
bb0c70c0dd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8bb1d57d6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15516773
Change-Id: I1a7b00df39eb4fcd47e0086e3237d072a06a5139
2021-08-10 19:37:53 +00:00
TreeHugger Robot
57641d0db8
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-10 19:25:35 +00:00
TreeHugger Robot
9aa8b8906e
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-10 19:25:19 +00:00
Bill Yi
385f45f7a0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iebb44c911ceb4598c1653402af1d3b91b2b62a55
2021-08-10 15:29:49 +00:00
Bill Yi
2c121e8336
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I905ee0fb3da18a7bd2311f97da60b7735a36678a
2021-08-10 15:23:37 +00:00
Bill Yi
c8bb1d57d6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie5ba752738776fe16d802cb3a87cdff5da5f6481
2021-08-10 15:08:45 +00:00
Bill Yi
5cc24b1fc5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie9007a25abc0b77eae5dff3bb6c3e14bfcaa1c92
2021-08-10 14:53:51 +00:00
Tom Hsu
06c28db36d
Merge "Selects a active sim to MobileNetworkActivity w/o subscription ID input" into sc-dev am: 939136b34b
am: e8b42fbf1b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498710
Change-Id: I222469918bc674c6a0df8c330a36c2ff72cb8792
2021-08-10 06:26:56 +00:00