Bill Yi
02b5415b3a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567
-s ours am: fa3505fdd8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590657
Change-Id: I21a0af17579c11c689e78382f4fe1e16bc91b416
2021-08-17 20:21:42 +00:00
Bill Yi
fa3505fdd8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590657
Change-Id: Ib5eb493e9092ee4f57bea4cc9238a995284b1cf8
2021-08-17 20:06:51 +00:00
TreeHugger Robot
1bdc58284d
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-08-17 19:46:30 +00:00
TreeHugger Robot
6a41d25bcc
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-08-17 19:44:13 +00:00
Bill Yi
73f4597617
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib8067f7f7b9ce0b3c3c9b164c16c2124754259f4
2021-08-16 22:54:27 -07:00
Bill Yi
d49b8b74d0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibe35735e2e3ab8087dfc0f2303e4b32318ac95a3
2021-08-16 22:37:14 -07:00
Bill Yi
f82b80a567
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie28ab84cb3ef23d6602af63e2e531d7057000d2f
2021-08-16 22:24:38 -07:00
Curtis Belmonte
36a42b630b
Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: Ia1824f9bbb81d95e928f32f39f088a4a6aeaef9e
2021-08-17 01:02:08 +00:00
Curtis Belmonte
7fb2316a21
Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev
2021-08-17 00:47:58 +00:00
Yomna Nasser
ea343fa5a4
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273
Change-Id: Ic40a46ce6d36e5147fc99ed3afb1bb1735164cad
2021-08-17 00:30:30 +00:00
Yomna Nasser
cf77b7a248
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev
2021-08-17 00:12:39 +00:00
Curtis Belmonte
dc9b53c446
Remove/replace old fingerprint icon in SUW/Settings
...
Replaces instances of the old fingerprint icon shown during Setup Wizard
or in Settings with either an updated version or an entirely different
icon.
Test: Manual
Fixes: 196600265
Change-Id: If78e8f0dbdb033f557614a019d4c9dde4493b6c6
2021-08-16 14:44:15 -07:00
TreeHugger Robot
7efaff8d0f
Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev
2021-08-14 07:13:12 +00:00
TreeHugger Robot
0af8e8e5cd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9
-s ours am: d3a02937ce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15550359
Change-Id: Id0f6ec90720888d2fce39b8f7a9f7064aa4c1e57
2021-08-13 19:32:44 +00:00
Bill Yi
15bb8d9aae
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628
-s ours am: 04c33bbf71
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551606
Change-Id: Ib46ff621c7f360961004af6281f08e3ced8acc59
2021-08-13 19:32:41 +00:00
TreeHugger Robot
d3a02937ce
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15550359
Change-Id: Iad4634164373b9bdfff5b8a8ad9895c9696bca40
2021-08-13 19:18:31 +00:00
Bill Yi
04c33bbf71
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551606
Change-Id: Ic593602b09a52dc77d36de8f7f7133668fc0182a
2021-08-13 19:17:59 +00:00
TreeHugger Robot
87a7ebe1d9
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-08-13 19:08:56 +00:00
TreeHugger Robot
cc5b59c9a4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551919
Change-Id: I43fffed8c0c65794a17abeaea2a64e76a318000e
2021-08-13 18:56:01 +00:00
TreeHugger Robot
7508bd0cd2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 65d286f6a9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551913
Change-Id: I4fcd4bde39ddac78133671de50de523056314084
2021-08-13 18:55:57 +00:00
TreeHugger Robot
96bd289bf7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b75551a41c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551901
Change-Id: I947c5595859294f600c17d4d3286769211f2e7a3
2021-08-13 18:54:45 +00:00
TreeHugger Robot
737f4d76c9
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-13 18:50:16 +00:00
TreeHugger Robot
65d286f6a9
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-13 18:45:05 +00:00
TreeHugger Robot
b75551a41c
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-13 18:39:35 +00:00
TreeHugger Robot
de4d5cb3f9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4
-s ours am: ede03fcc17
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551611
Change-Id: I31207099de86903024e9d1b4a7e272e312a5cfcf
2021-08-13 18:22:30 +00:00
Bill Yi
4a7acc1636
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3
-s ours am: 7eb41e014f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551617
Change-Id: Ia9390d5d0ecc35c365747ecead6f3cb48ff8eb95
2021-08-13 18:22:28 +00:00
TreeHugger Robot
ede03fcc17
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551611
Change-Id: Ibdd232bdacd1459c383ae9dffcec8ad5f22beae1
2021-08-13 18:07:10 +00:00
Bill Yi
7eb41e014f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551617
Change-Id: I83e695e78c6e05bb2c37e7d1b0188f1f9579f6f0
2021-08-13 18:06:19 +00:00
TreeHugger Robot
1fca8341c4
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-08-13 17:59:41 +00:00
Alfred Lin
7f8e775754
Prototyping : Demo Image on color setting
...
Implement prototyping of demo image on color setting
Bug: 182797883
Test: adb shell am instrument -w -e class com.android.settings.display.ColorModePreferenceFragmentTest com.android.settings.tests.unit/androidx.test.runner.AndroidJUnitRunner test pass
Change-Id: Iebaaa6867f2039a25a5e1fd280a89b5bc9297e6b
2021-08-13 15:08:58 +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
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