Julia Reynolds
8126e93ff2
Remove explicit number from string
...
So it can be translated properly
Test: View notification history screen
Fixes: 222128037
Change-Id: I2d11dd4e427c19ef0c003b1fa2b6882267e2026e
2023-03-16 12:27:37 -04:00
Matías Hernández
08893ed0b3
Merge "Refresh the app's "Conversations" list when there are none" into udc-dev
2023-03-16 15:57:11 +00:00
Matías Hernández
a5eea1c034
Refresh the app's "Conversations" list when there are none
...
Also hide the header in that case (simiarly to bubbles).
Test: atest (new) + manual
Fixes: 273748214
Change-Id: I4f758a0bf5bb8cfa91701185f1568b358d8903a0
2023-03-16 15:07:13 +01:00
Jason Hsu
3f86f0f5b4
Merge "Update strings for hearing device U features" into udc-dev am: 5c1652eab0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087473
Change-Id: I83ec4d6b9eb362f5c8da0877d76dc2c1a5c68778
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 09:44:37 +00:00
Jason Hsu
5c1652eab0
Merge "Update strings for hearing device U features" into udc-dev
2023-03-16 09:16:51 +00:00
jasonwshsu
7be7ef9ecc
Update the exclamation icon can be announced by screen reader
...
* In hearing deivce and flash notifications U features.
Bug: 268144365
Test: open screen reader to read the footer preference
Change-Id: Ifb0809c1e445aea4aeea9db9b4ec09cd6d0d4095
2023-03-16 16:08:46 +08:00
jasonwshsu
1b0a454344
Update strings for hearing device U features
...
Bug: 270086620
Test: flash the rom and check UI
Change-Id: Iafc1691d2a51fc1c8111059ff5b2953889b40012
2023-03-16 16:08:40 +08:00
Chaohui Wang
63981f9be2
Merge "Move LogEvent action to Settings" into udc-dev am: ba39aa506b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22067164
Change-Id: I69e095201cc99178ad85e47621a08d18a77eefff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 06:41:27 +00:00
Chaohui Wang
ba39aa506b
Merge "Move LogEvent action to Settings" into udc-dev
2023-03-16 06:34:14 +00:00
Bill Yi
2f0033dd50
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 1b76d26f1b -s ours am: ad6b0526ee -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087425
Change-Id: I7cb16eb36325b6080eb3102d61926bd7e65d7aa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 05:46:57 +00:00
Bill Yi
37d10ccd54
Merge changes from topic "tc_change_23031509_20" into udc-dev am: ef87f55d9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087425
Change-Id: Iec816626c6f5516d93a16465aad4a2d9502a530e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 05:45:32 +00:00
Bill Yi
82a6b13f7d
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 787231f181 am: 6484f81d9e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087425
Change-Id: I5112e7bce93662db5edeccb76df0bfab29f4b8be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 05:45:21 +00:00
Bill Yi
ad6b0526ee
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 1b76d26f1b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087425
Change-Id: I0bc07fa0395e104736cb53de3e0271578e1ba382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 05:43:52 +00:00
Bill Yi
1b76d26f1b
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-03-16 05:20:45 +00:00
Bill Yi
ef87f55d9a
Merge changes from topic "tc_change_23031509_20" into udc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 787231f181
Import translations. DO NOT MERGE ANYWHERE
2023-03-16 05:20:45 +00:00
menghanli
796fcccd9b
Update color-check-baseline.xml
...
(Fixed according to the instructions in prebuilts/checkcolor/README.md)
Bug: 273556105
Test: repo upload checks
Change-Id: Iaf4ab9f6cc1c836348226bc36358cbb73d2583d2
Merged-In: Ife355166df080ce7371a95b5cea28575227153f0
2023-03-16 02:29:38 +00:00
TreeHugger Robot
edd5806c98
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8d91a57792 -s ours am: f4c558c9cb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22084583
Change-Id: I3273fc96519697ec7d788b6ce25bc83f702ed5e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 02:04:55 +00:00
TreeHugger Robot
f4c558c9cb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8d91a57792 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22084583
Change-Id: Ie3156715be7dc47c0f6801066949f1becf6d50ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 01:24:54 +00:00
TreeHugger Robot
7321675c49
Merge changes from topic "tc_change_23031509_19" into udc-dev am: 8cb7a890c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22084583
Change-Id: I929c22b32c70358031c8f28b19f350c883b689d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 01:12:24 +00:00
Bill Yi
df1118f378
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10f88f394b am: aef5e4d513 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22084583
Change-Id: I90ce65819f43e8d21d7c4bfd816eae5674ac39cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 01:12:14 +00:00
TreeHugger Robot
8d91a57792
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-03-16 00:51:39 +00:00
TreeHugger Robot
8cb7a890c7
Merge changes from topic "tc_change_23031509_19" into udc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10f88f394b
Import translations. DO NOT MERGE ANYWHERE
2023-03-16 00:51:39 +00:00
Dmitry Dementyev
ed19f07538
Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe am: 9bec974991 am: a3d15a91e1 am: 92babcaef5 am: c03f2fe49c am: 84e533536d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: I0377f99b4ed639dddbbbb6c9b88ecce3512f306e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 00:10:55 +00:00
Diya Bera
7df7e5cab9
Merge "Remove subtitle from biometric prompt in Settings (Passwords & Accounts)" into tm-qpr-dev am: f7359a5001 am: ed1bb20ff1 am: 1e6508ef77
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22084586
Change-Id: Ic26a5890b1c623e80cb1fad180ef010f5d464953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 00:10:12 +00:00
Dmitry Dementyev
84e533536d
Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe am: 9bec974991 am: a3d15a91e1 am: 92babcaef5 am: c03f2fe49c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: I4a906b5a00c86fbe93141acda9db00cc190ce7c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 23:31:06 +00:00
Diya Bera
1e6508ef77
Merge "Remove subtitle from biometric prompt in Settings (Passwords & Accounts)" into tm-qpr-dev am: f7359a5001 am: ed1bb20ff1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22084586
Change-Id: I15927b82d701b37054746103c42ced0f3f7ab9c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 23:30:45 +00:00
Dmitry Dementyev
ccfdc32542
Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe am: 9bec974991 am: 6faa24da9d am: c264e26eb2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: I5d32642eb5e57f654015a7008045827cd4803ec1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 23:14:09 +00:00
Dmitry Dementyev
c03f2fe49c
Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe am: 9bec974991 am: a3d15a91e1 am: 92babcaef5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: Ib6464d437f7b2ead5cd9b00f13431149979ff8b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 23:11:46 +00:00
Dmitry Dementyev
92babcaef5
Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe am: 9bec974991 am: a3d15a91e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: Id32c9274ed8290b709328924d698dbdf130b8d88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:55:00 +00:00
Dmitry Dementyev
c264e26eb2
Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe am: 9bec974991 am: 6faa24da9d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: I78c604d15fbb47533e9b302a501c71f5e38a9f78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:52:45 +00:00
Diya Bera
ed1bb20ff1
Merge "Remove subtitle from biometric prompt in Settings (Passwords & Accounts)" into tm-qpr-dev am: f7359a5001
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22084586
Change-Id: I190752b9c2a65024c140b7dab92524097c183ee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:52:07 +00:00
Lifu Tang
caa1b51ef2
Revert "Remove duplicate strings."
...
Revert submission 19748582-settings_yesno
Reason for revert: Common strings in English could be translated into different strings in other languages.
Reverted changes: /q/submissionid:19748582-settings_yesno
Bug: 272603842
Test: build and open Settings app
Test: atest SettingsRoboTests
Change-Id: Iaad301c5513478fb95e40987ea3ccb4f923d71fa
2023-03-15 22:39:24 +00:00
TreeHugger Robot
6c40ca859e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 827333d9b6 -s ours am: bc3053ca51 -s ours am: 49c4abbf69 -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: I6695c490dd407d36530776bf85e1587ac42832b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:39:23 +00:00
Bill Yi
46d66084bc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1de90287e1 -s ours am: 350628d706 -s ours am: 3fe085e762 -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: Iaa3569b1b563a7a74e535c67784c26bc3211b9fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:39:12 +00:00
TreeHugger Robot
ef288d9201
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 70bb56cb83 -s ours am: 053aec9616 -s ours am: 29827c0b25 -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: I82ea0aa63538ab504eb8cfe1f22ea28fb037ebc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:38:55 +00:00
Bill Yi
5b69ffcefe
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a73552148b -s ours am: 89ec1ab87e -s ours am: 9db3fa17e0 -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: Icc4c848fad67261cab3f6e86d4661d015644d8dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:38:41 +00:00
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