Michael Groover
e2e59e35ba
[RESTRICT AUTOMERGE] Add isTrue to assertThat statements in CredentialManagerPCTest am: 5b5da43ef8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22102862
Change-Id: Ia636db0342f676b2aff5b57399941ff05fb5aa89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:33:39 +00:00
Diya Bera
f7359a5001
Merge "Remove subtitle from biometric prompt in Settings (Passwords & Accounts)" into tm-qpr-dev
2023-03-15 22:28:10 +00:00
TreeHugger Robot
49c4abbf69
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 827333d9b6
-s ours am: bc3053ca51
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087793
Change-Id: I1cb6df101c5d3a150d62ef1d333900a5bddb35ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:22:37 +00:00
Bill Yi
3fe085e762
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1de90287e1
-s ours am: 350628d706
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087793
Change-Id: I26a8ef0a711e15f9f452a8c1912f4a4ff1f6fa2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:22:32 +00:00
TreeHugger Robot
29827c0b25
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 70bb56cb83
-s ours am: 053aec9616
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22086176
Change-Id: I5cc6aaa53dac09a10f7e3e5d4253f3b26069362a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:22:16 +00:00
Bill Yi
9db3fa17e0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a73552148b
-s ours am: 89ec1ab87e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22086176
Change-Id: I347e6418c56cccb6a3aaee67dda7392ec0de0ef9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:21:56 +00:00
Dmitry Dementyev
a3d15a91e1
Convert argument to intent in AddAccountSettings. am: c7e8052b52
am: f56584cd21
am: 32813a2bef
am: 4f67ca0cfa
am: 7f73a168fe
am: 9bec974991
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: I33ee7b0b3fd191ed993a3537d598d102c2d6ffb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:18:42 +00:00
Dmitry Dementyev
6faa24da9d
Convert argument to intent in AddAccountSettings. am: c7e8052b52
am: f56584cd21
am: 32813a2bef
am: 4f67ca0cfa
am: 7f73a168fe
am: 9bec974991
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: Ieaea748f1a7f75954f16acce47a94aeb20d86fd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:17:09 +00:00
TreeHugger Robot
bc3053ca51
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 827333d9b6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087793
Change-Id: I1ad68d1100681f6df21668d62485f9f29f9c4d8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 21:45:00 +00:00
Bill Yi
350628d706
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1de90287e1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087793
Change-Id: I59b1204fb9eba20091d3033860819796c1ca58a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 21:44:57 +00:00
TreeHugger Robot
053aec9616
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 70bb56cb83
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22086176
Change-Id: Ia29ddec60f6c08bf86280b31f3329f9327cc0d2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 21:44:47 +00:00
Bill Yi
89ec1ab87e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a73552148b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22086176
Change-Id: I61380c2773ea05dcac939334bad338e4dd8c52b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 21:44:10 +00:00
Dmitry Dementyev
9bec974991
Convert argument to intent in AddAccountSettings. am: c7e8052b52
am: f56584cd21
am: 32813a2bef
am: 4f67ca0cfa
am: 7f73a168fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: Ia0bfeee6be995a2df857147a0aadc17f41672d63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 21:34:39 +00:00
TreeHugger Robot
827333d9b6
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-03-15 21:24:10 +00:00
TreeHugger Robot
70bb56cb83
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-03-15 21:24:10 +00:00
Dmitry Dementyev
7f73a168fe
Convert argument to intent in AddAccountSettings. am: c7e8052b52
am: f56584cd21
am: 32813a2bef
am: 4f67ca0cfa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: I4815a1e5e05bcee661a8ce037a2671086d16faee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 21:01:01 +00:00
Dmitry Dementyev
4f67ca0cfa
Convert argument to intent in AddAccountSettings. am: c7e8052b52
am: f56584cd21
am: 32813a2bef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: I887d715a24724806bf20808ca91b6ed23d492b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 20:19:04 +00:00
Dmitry Dementyev
32813a2bef
Convert argument to intent in AddAccountSettings. am: c7e8052b52
am: f56584cd21
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: I859c957eb1f94bd9c5858b71c551a1e2e10b0468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 19:39:21 +00:00
Michael Groover
5b5da43ef8
[RESTRICT AUTOMERGE] Add isTrue to assertThat statements in CredentialManagerPCTest
...
Change-Id: I34f808bc497971aa53fc7842159795d8407ed113
Fixes: 273763249
Test: atest CredentialManagerPreferenceControllerTest
2023-03-15 19:28:36 +00:00
Dmitry Dementyev
f56584cd21
Convert argument to intent in AddAccountSettings. am: c7e8052b52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: I83ab1d878491552ccb3ea1545742d1915fd8a6f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 19:01:57 +00:00
Bill Yi
aef5e4d513
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10f88f394b
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22084583
Change-Id: Ic930418914a624eefdcb9094c3684e76f2f170d1
2023-03-15 16:58:00 +00:00
Bill Yi
6484f81d9e
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 787231f181
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087425
Change-Id: I462ed789b5300979b9e8bd61a548f1dee85a7ca9
2023-03-15 16:57:59 +00:00
Julia Reynolds
0b188773d0
Merge "Don't show NLSes with excessively long component names" into tm-qpr-dev am: 7626600bbf
am: ce0c1c4de7
am: 4d1535441e
am: c410a2c9ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22066389
Change-Id: Ie3a446e61fb67ee1a1302a7a49733037c4b1242a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 15:48:52 +00:00
Julia Reynolds
ec75b98047
Merge "Don't show NLSes with excessively long component names" into tm-qpr-dev am: 7626600bbf
am: ce0c1c4de7
am: 4d1535441e
am: 22e40c5184
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22066389
Change-Id: I82f742554d77278d8853499505cc37010ab5bab9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 15:48:23 +00:00
Julia Reynolds
31b021a570
Merge "Reduce jank when revoking notification permission" into udc-dev am: 068a55384b
am: 1619d4cd25
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21888168
Change-Id: Ibb21322fe957713ce05000dea5224b90f97a4c75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 15:38:16 +00:00
Julia Reynolds
686e7169ca
Merge "Reduce jank when revoking notification permission" into udc-dev am: 068a55384b
am: 84671635cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21888168
Change-Id: I0531dfd13ac5a1639275fadd3432fedf893a1f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 15:37:08 +00:00
Julia Reynolds
22e40c5184
Merge "Don't show NLSes with excessively long component names" into tm-qpr-dev am: 7626600bbf
am: ce0c1c4de7
am: 4d1535441e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22066389
Change-Id: I4aedc78dc4646c90e196be2501a1cfcb5b8add55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 15:11:47 +00:00
Julia Reynolds
1619d4cd25
Merge "Reduce jank when revoking notification permission" into udc-dev am: 068a55384b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21888168
Change-Id: I569c9eebdb67f5715b0546ffb6effbac5eacc42f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 15:11:28 +00:00
Julia Reynolds
c410a2c9ae
Merge "Don't show NLSes with excessively long component names" into tm-qpr-dev am: 7626600bbf
am: ce0c1c4de7
am: 4d1535441e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22066389
Change-Id: Ic1210a586808bfb8080e17f6ecfd5ec69b7e3be8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 15:09:15 +00:00
Julia Reynolds
84671635cb
Merge "Reduce jank when revoking notification permission" into udc-dev am: 068a55384b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21888168
Change-Id: Ib8b029ddfcd77aa82c94c698fb7e2830014bdcdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 15:07:36 +00:00
Julia Reynolds
4d1535441e
Merge "Don't show NLSes with excessively long component names" into tm-qpr-dev am: 7626600bbf
am: ce0c1c4de7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22066389
Change-Id: I03d1f3a7b40598abfa3bbd1fee85b457a471acd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 15:00:44 +00:00
Julia Reynolds
068a55384b
Merge "Reduce jank when revoking notification permission" into udc-dev
2023-03-15 14:50:07 +00:00
Julia Reynolds
ce0c1c4de7
Merge "Don't show NLSes with excessively long component names" into tm-qpr-dev am: 7626600bbf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22066389
Change-Id: I90173ce86cc356ba97e4ff51dffd6b6588bb0c49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 14:27:39 +00:00
Julia Reynolds
7626600bbf
Merge "Don't show NLSes with excessively long component names" into tm-qpr-dev
2023-03-15 13:59:23 +00:00
Julia Reynolds
a331c50b53
Reduce jank when revoking notification permission
...
-Reorder fields so the appear/disappear more cleanly
-Remove some divider lines- they don't animate with the content, for
some reason
-Remove an unused field
-Hide the badge field (remaining field with divider) if there are no
channels
-Change style of 'Notifications are blocked' field to better match
the other fields
Test: revoke notification permission for apps with and without channels
Test: BadgePreferenceControllerTest
Fixes: 233962859
Change-Id: Ife894172bf91d838edf3b0546c5ee00e206a855f
2023-03-15 09:08:10 -04:00
Jason Hsu
44d0882f80
Merge "Click the search result "System Sounds" will crash the Settings app" into udc-dev am: 9f29b957e7
am: a14e57b917
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21974622
Change-Id: I1477e47557eb7e63c69ba505c7ea13265923071d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 12:52:15 +00:00
TreeHugger Robot
daf85805f6
Merge "Hide Dock speaker plays from sound pages" into udc-dev am: df5bbc630d
am: 2dfc20bb43
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21955162
Change-Id: Ica6d30bcd5478be64cbc132ec14c9d76ce7fb7d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 12:51:18 +00:00
Jason Hsu
c2dffa7aa4
Merge "Click the search result "System Sounds" will crash the Settings app" into udc-dev am: 9f29b957e7
am: 54fffdc6ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21974622
Change-Id: I3d8dc59a5ade8161d2d43e6b1ee9fdf78f0bb9c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 12:50:52 +00:00
TreeHugger Robot
db2bd32285
Merge "Hide Dock speaker plays from sound pages" into udc-dev am: df5bbc630d
am: 59b7f47307
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21955162
Change-Id: I95a3d90e0b6f6bcd213c11ec3c4cb33e2132a4f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 12:49:19 +00:00
Jason Hsu
54fffdc6ec
Merge "Click the search result "System Sounds" will crash the Settings app" into udc-dev am: 9f29b957e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21974622
Change-Id: I57f2f6fcedac3abfc8dd65d70ea9b85e5244b10b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 12:15:50 +00:00
Jason Hsu
a14e57b917
Merge "Click the search result "System Sounds" will crash the Settings app" into udc-dev am: 9f29b957e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21974622
Change-Id: I63879c27940834f5dfde70e1252c7b3c953af158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 12:15:45 +00:00
TreeHugger Robot
59b7f47307
Merge "Hide Dock speaker plays from sound pages" into udc-dev am: df5bbc630d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21955162
Change-Id: Ib02077e90eb31f378ce1fe54d99ec408dea8e18b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 12:15:27 +00:00
TreeHugger Robot
2dfc20bb43
Merge "Hide Dock speaker plays from sound pages" into udc-dev am: df5bbc630d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21955162
Change-Id: If6222c00ef5746db591519644f8a4b70853233a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 12:15:00 +00:00
Jason Hsu
9f29b957e7
Merge "Click the search result "System Sounds" will crash the Settings app" into udc-dev
2023-03-15 12:00:37 +00:00
TreeHugger Robot
df5bbc630d
Merge "Hide Dock speaker plays from sound pages" into udc-dev
2023-03-15 11:52:38 +00:00
Matías Hernández
88ea5f9dae
Merge "Delete stuff related to removed "Conversations that can interrupt" settings" into udc-dev am: 2cabe8786e
am: f38b8aa4c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21988900
Change-Id: I186dba052ad815e341651c745828e11dff97b3d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 11:00:52 +00:00
SongFerng Wang
e7e8ffef71
Merge "Avoid ANR when UI query network selection state" into udc-dev am: 40cf9a2132
am: 53255717ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087477
Change-Id: I9e440d1c2674bd453491e58f50af1ff7656b611b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 11:00:15 +00:00
Matías Hernández
6b13d794bc
Merge "Delete stuff related to removed "Conversations that can interrupt" settings" into udc-dev am: 2cabe8786e
am: be3c8b66ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21988900
Change-Id: Ifc5f1477f20b3c33075bc866ed473fbd5e6649b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 10:59:30 +00:00
SongFerng Wang
1576e0a241
Merge "Avoid ANR when UI query network selection state" into udc-dev am: 40cf9a2132
am: ea5a05780f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087477
Change-Id: Ia6aeaffc1755f4b669864abd5ba9313f66cf8764
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 10:58:47 +00:00
Bill Yi
5c24e1864d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie52051d98db9590f6a0de10033febcd6a5126b75
2023-03-15 03:34:19 -07:00