YUKAI HUNG
50ecf12ece
Merge "Fix typo for Illustration Preference (picked from Wendy's patch)" into sc-v2-dev am: d7bf769cc4
am: cc29f09349
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15530295
Change-Id: I76802169c0f1a555862c4447b16c8b2a7355d30b
2021-08-12 06:10:24 +00:00
YUKAI HUNG
cc29f09349
Merge "Fix typo for Illustration Preference (picked from Wendy's patch)" into sc-v2-dev am: d7bf769cc4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15530295
Change-Id: I5fb53da6e34a89ed65d1abbcff0f7a6504ba6154
2021-08-12 06:01:16 +00:00
Treehugger Robot
c156dd95fb
Merge "Add owner to the connected device folder" am: 6cbb4dfbe1
am: 004f5168d4
am: f5ddc8ffaa
am: 79978071e2
am: b41e35a304
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1793371
Change-Id: Ic8f5ee6abc79ea05d1b8b822ff652c466c8a9135
2021-08-12 05:45:45 +00:00
Treehugger Robot
b41e35a304
Merge "Add owner to the connected device folder" am: 6cbb4dfbe1
am: 004f5168d4
am: f5ddc8ffaa
am: 79978071e2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1793371
Change-Id: I6815488dcd2599c423d7f197fc93983ae5184793
2021-08-12 05:35:45 +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
YUKAI HUNG
d7bf769cc4
Merge "Fix typo for Illustration Preference (picked from Wendy's patch)" into sc-v2-dev
2021-08-12 05:05:06 +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
Wendy Sung
91f0c5938b
Fix typo for Illustration Preference (picked from Wendy's patch)
...
Test: Manual Build
Bug: 194819372
Change-Id: Idbc6891dc1139227e5fb5585e2aadb717d5d6205
2021-08-12 04:01:17 +00:00
TreeHugger Robot
5bef3f74f9
Merge "Fix USB tethering is not turned on with a single tap"
2021-08-12 03:52:32 +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
bb465ea420
Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll am: 715e337af8
am: c97269a900
am: 7863a996a7
am: 06d93c0a6c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15536197
Change-Id: Ice88d7282b6998b162e1c95e76420c2ecba9b772
2021-08-12 02:01:46 +00:00
Kevin Chyn
8b662d0c33
Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll am: 715e337af8
am: c97269a900
am: 583301e49f
am: 5ddfd29c79
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15536197
Change-Id: Ic59bde6d78b24a9a4ed3e9642919394c1d9a7f7c
2021-08-12 02:01:24 +00:00
Kevin Chyn
f013457b4c
Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll am: 715e337af8
am: 26d1877a7b
am: 4cf058b144
am: 29f8d4ddef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15536197
Change-Id: I166ca7ef41b3d8456e3b6b0bb6469f9cb99cd585
2021-08-12 02:01:09 +00:00
Kevin Chyn
fb5f9df066
Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll am: 715e337af8
am: 75725902d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15536197
Change-Id: I242c5c9c57cdf61085b4b3e6066fa8544d37ca71
2021-08-12 01:50:39 +00:00
Kevin Chyn
06d93c0a6c
Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll am: 715e337af8
am: c97269a900
am: 7863a996a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15536197
Change-Id: I27d66045f009bdc5da681136cb7436f71d59065f
2021-08-12 01:47:24 +00:00
Kevin Chyn
5ddfd29c79
Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll am: 715e337af8
am: c97269a900
am: 583301e49f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15536197
Change-Id: I7831cf5980ab30d4bbd2636e7e039a8169846174
2021-08-12 01:47:02 +00:00
Kevin Chyn
29f8d4ddef
Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll am: 715e337af8
am: 26d1877a7b
am: 4cf058b144
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15536197
Change-Id: I410da5392b9bbdadf7e2fe0dea028d187b033bdd
2021-08-12 01:46:51 +00: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
7863a996a7
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: Iad28764dd36dcc5da2d0938490f6970302224986
2021-08-12 01:26:19 +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
75725902d1
Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll am: 715e337af8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15536197
Change-Id: Ie25264479438de25c51d4601db1ae75fd173adf1
2021-08-12 01:09:56 +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
Automerger Merge Worker
fc69958a51
Merge "Limit the number of concurrent notifs appear on screen am: abe9246caa
am: 8c385c261c" into sc-v2-dev-plus-aosp am: edddc0f3a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531757
Change-Id: Idf881c7fc3265e5f12e243eecfd8353ec456abe5
2021-08-11 23:12:58 +00:00
Julia Reynolds
cb3a1940a6
Limit the number of concurrent notifs appear on screen am: abe9246caa
am: 273df63430
am: 86887fcb9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531757
Change-Id: I6cf45299e7387c68637145195ddbbd2500e2c1cf
2021-08-11 23:12:39 +00:00
Automerger Merge Worker
edddc0f3a2
Merge "Limit the number of concurrent notifs appear on screen am: abe9246caa
am: 8c385c261c" into sc-v2-dev-plus-aosp
2021-08-11 22:52:26 +00:00
Julia Reynolds
03ecd3ca01
Limit the number of concurrent notifs appear on screen am: abe9246caa
am: 8c385c261c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531757
Change-Id: I4b188fe0813c63b46e86cd03ff1d2abbdb8fa12b
2021-08-11 22:52:23 +00:00
Julia Reynolds
86887fcb9a
Limit the number of concurrent notifs appear on screen am: abe9246caa
am: 273df63430
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531757
Change-Id: Ia192c759c3a982740fe2dcb9de9a6acdd55bfa44
2021-08-11 22:52:21 +00:00
Julia Reynolds
8c385c261c
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: Ie041911e9cba51365fc6c26e44f6cd3c3dce60bb
2021-08-11 22:31:14 +00: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
Joshua Lewis
144f222afb
Merge "Create Dialog to edit TARE factors"
2021-08-11 16:54:45 +00:00
Yuri Lin
813d923c2a
Merge "Move automatic rules ("Schedules") into general DND category."
2021-08-11 14:46:19 +00:00
Bill Yi
daf3d89359
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc24b1fc5
-s ours am: 4d8e7b1053
-s ours am: ef23c240bb
-s ours am: 229a3c6fd5
-s ours am: 0b2493e964
-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: I23ba7c3102ba6d6e09ca17bb90d66a9c54830452
2021-08-11 02:35:45 +00:00
Bill Yi
c19263b304
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc24b1fc5
-s ours am: 4d8e7b1053
-s ours am: ef23c240bb
-s ours am: 3fe3a3368a
-s ours am: b69c096e88
-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: Ia82fa60e946f67e1f18eb1117de6d630f82b8f33
2021-08-11 02:35:27 +00:00
Bill Yi
87007a4080
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc24b1fc5
-s ours am: 4d8e7b1053
-s ours am: a882d0fb25
-s ours am: 428bc4eeb1
-s ours am: d53506d9c8
-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: If3a1bc6f83831c47df7679ddcb981e8d2b6bf87c
2021-08-11 02:34:39 +00:00
Bill Yi
0b2493e964
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc24b1fc5
-s ours am: 4d8e7b1053
-s ours am: ef23c240bb
-s ours am: 229a3c6fd5
-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: Ib71cadece2ffa63190c693592bc56cfed7e706d5
2021-08-11 02:22:07 +00:00
Bill Yi
b69c096e88
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc24b1fc5
-s ours am: 4d8e7b1053
-s ours am: ef23c240bb
-s ours am: 3fe3a3368a
-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: I4973f6c25105276696830c1bd8c5a248b31925b5
2021-08-11 02:21:37 +00:00
Bill Yi
d53506d9c8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc24b1fc5
-s ours am: 4d8e7b1053
-s ours am: a882d0fb25
-s ours am: 428bc4eeb1
-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: Ifc72ca9f2eeb3e9114af2b24a52e60c349f447f3
2021-08-11 02:21:30 +00:00
Bill Yi
229a3c6fd5
[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: I5feb87eeed0629bc3c866c2ea0dd12605d185336
2021-08-11 02:08:51 +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
a7d1579cfa
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc24b1fc5
-s ours am: 4d8e7b1053
-s ours am: 444bdd4f2b
-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: I301c582c57b176331a6414d4a5109b0b60c11fb5
2021-08-11 02:07:49 +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
444bdd4f2b
[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: Idab3e67efaf01de0ab03ce34873c3dc108d90808
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