Tsung-Mao Fang
74b1a46cb1
Move Automatic System Updates from Developer Options to System
...
- Move the preference to the system xml file.
- DisableAutomaticUpdatesPreferenceController should not
inherit from the developer preference controller now since it's not used
in developer page anymore. Instead, just use toggle preference
controller for changing the state.
- Rewrite the test cases based on new controller.
Test: The ui works well and search can navigate to correct path.
Fix: 196001125
Change-Id: Iaea3e11d9cdbfa073ebd41bc3c84356d564c7e71
2021-08-13 08:11:22 +00:00
TreeHugger Robot
1741d5d12c
Merge "Handle spanned conversation labels" into sc-qpr1-dev
2021-08-13 04:11:04 +00:00
Bill Yi
d486302dc9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifc717c2991b14f66c2f9f6af95aab4a68113bf57
2021-08-13 03:48:58 +00:00
Bill Yi
f30152962c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib9973baa15d3f4d64436daf4afa21dc213118f6a
2021-08-13 03:42:27 +00:00
Bill Yi
d9ba125bb8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I34d0556797fbf5a0e80e97c5e76b7d805b303e83
2021-08-13 03:32:57 +00:00
Bill Yi
dff93bb6b3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I42ad0edeea635e7c8c12ebffad01b2e0d6bba1a8
2021-08-13 03:28:24 +00:00
Bill Yi
d54aa0fb4c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id8e88bc2762dcd1996cbaa52d7ac66d58320bfc9
2021-08-13 03:24:52 +00:00
Bill Yi
ca003ac628
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7b8e508353852d4626453b56e71f222ab40c7f6f
2021-08-13 03:13:32 +00:00
Bill Yi
914383ee99
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia4a9c0e4621a7a13ac202564ae83d45a44a94517
2021-08-13 03:08:13 +00:00
Joe Bolinger
2c0b7fdb90
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: Ia879a9fc3d00f2a04062d58df740fcb0c7281c93
2021-08-13 01:16:37 +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
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
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
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
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
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
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
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
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
1d8c6a6188
Merge "Selects a active sim to MobileNetworkActivity w/o subscription ID input" into sc-dev am: 939136b34b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498710
Change-Id: I1b126ab2dabd818a2675d8b2ac26f6a7949e13cf
2021-08-10 06:13:41 +00:00
Tom Hsu
939136b34b
Merge "Selects a active sim to MobileNetworkActivity w/o subscription ID input" into sc-dev
2021-08-10 06:00:44 +00:00
Tom Hsu
a17fc042dd
Selects a active sim to MobileNetworkActivity w/o subscription ID input
...
Bug:194754151
Test: Sanity test with test build. See b/194754151#21
Change-Id: Ic3449392a7f564b69c3f42cc762ec4c9ec642797
2021-08-10 04:40:52 +00:00
Curtis Belmonte
5968c28caf
Merge "Make face education handle timeout result correctly" into sc-dev am: 4cb6d12b55
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15505151
Change-Id: I9299449e882dd42a6e5a56d500430e3e3f962ad6
2021-08-10 00:18:20 +00:00
Curtis Belmonte
4cb6d12b55
Merge "Make face education handle timeout result correctly" into sc-dev
2021-08-10 00:06:17 +00:00
Curtis Belmonte
ea07bb8d2f
Make face education handle timeout result correctly
...
Ensures that a result code of RESULT_TIMEOUT always causes the face
enroll education screen to finish and propagate the result.
Test: Lock and unlock screen at each stage of face enrollment
Fixes: 194857793
Change-Id: Ie4b09235f923c8a40de18878b0727f166112140f
2021-08-09 14:12:45 -07:00
TreeHugger Robot
b4d5a623bd
Merge "The wifi dialog text should be Google Sans Text" into sc-dev am: 9000bdc25f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15472615
Change-Id: I3d67364a06f6486e8aab5c7e86100f8aaab85665
2021-08-09 20:20:18 +00:00
TreeHugger Robot
9000bdc25f
Merge "The wifi dialog text should be Google Sans Text" into sc-dev
2021-08-09 19:59:07 +00:00
TreeHugger Robot
869e01eecb
[automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31
-s ours am: 876d9ec0dc
-s ours am: 88b0676d08
-s ours
...
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15207347
Change-Id: Ia3cf15d66f84dc53d92efab02577ec44a755416c
2021-08-09 13:25:40 +00:00
TreeHugger Robot
88b0676d08
[automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31
-s ours am: 876d9ec0dc
-s ours
...
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15207347
Change-Id: Id2f1a85f30eb2b95459b22426dcab5abb696aed4
2021-08-09 13:06:56 +00:00
TreeHugger Robot
9246df546a
[automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31
-s ours am: 4a3bbeee1a
-s ours am: c06aef8e7f
-s ours
...
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15207347
Change-Id: I9b5c5cc4f9cbf7df96aad8378f99442cf141d96e
2021-08-09 12:52:43 +00:00
TreeHugger Robot
f346e833e9
Merge "Fix launch flags for channel panel" into sc-dev am: 82fee52083
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498277
Change-Id: I05ce4cf13fca889c18a2442f891bec8cb1b05d6e
2021-08-09 12:52:40 +00:00
TreeHugger Robot
c06aef8e7f
[automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31
-s ours am: 4a3bbeee1a
-s ours
...
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15207347
Change-Id: I4fc8d0c172bf1c708296ed418e7e1364455bce1a
2021-08-09 12:51:56 +00:00
TreeHugger Robot
4a3bbeee1a
[automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31
-s ours
...
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15207347
Change-Id: I51036566e38a1909f07146ea93c6df89b37805df
2021-08-09 12:44:21 +00:00
TreeHugger Robot
876d9ec0dc
[automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31
-s ours
...
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15207347
Change-Id: I7922d372f0a6867af34b93bf852bdda93a6e4c7a
2021-08-09 12:44:20 +00:00
TreeHugger Robot
82fee52083
Merge "Fix launch flags for channel panel" into sc-dev
2021-08-09 12:38:47 +00:00
TreeHugger Robot
9d509c0b31
Merge changes from topic "add_permission_wifidialog" into rvc-dev
...
* changes:
[DO NOT MERGE] Add SafetyNet logging
[DO NOT MERGE] Add permission checking to WifiDialogActivity
2021-08-09 12:28:48 +00:00