Commit Graph

123009 Commits

Author SHA1 Message Date
Bill Yi
c73287f378 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: d83c9c6f21 -s ours am: f6ece5c0ab -s ours am: e0b712d439 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23278235

Change-Id: Iaa7c2049916600f37f6afa61a63f44c602348d3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 00:05:52 +00:00
Bill Yi
6d44afeab0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f88b1c7f59 -s ours am: 55356a71e8 -s ours am: 1f8eda570b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23278235

Change-Id: I090f1374f4c48a2eb01519461f6820b586abbff5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 00:05:46 +00:00
Bill Yi
e0b712d439 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: d83c9c6f21 -s ours am: f6ece5c0ab -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23278235

Change-Id: I13c856de0a7413af609173dd78408e90059886a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 00:01:15 +00:00
Bill Yi
1f8eda570b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f88b1c7f59 -s ours am: 55356a71e8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23278235

Change-Id: I36bf7c8f1b4c953fc8e862d4b04f4169d75c44ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 00:01:06 +00:00
Bill Yi
f6ece5c0ab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: d83c9c6f21 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23278235

Change-Id: Ifb7fd62b577b15673f9f4b3279fd524b0e855339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 23:16:23 +00:00
Bill Yi
55356a71e8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f88b1c7f59 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23278235

Change-Id: I79b9b76e701588b818b5a1e243d838e63d95ed2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 23:16:08 +00:00
Bill Yi
83ada4112d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d69f19c92f -s ours am: 68f438bdb8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280842

Change-Id: Ie9695538c3c49c180f179323e5838e8546af6b77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 22:35:40 +00:00
Bill Yi
35d68bf328 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f32482d0d4 -s ours am: 296000ea70 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280842

Change-Id: Iebfd0bec2cdb45325d38b939f28364e36d059139
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 22:35:26 +00:00
Bill Yi
f5b40bc281 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1e7e184419 -s ours am: 632c6ef1f1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280839

Change-Id: Id3a7a4a948086ac09b3245402db9681e729838c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 22:35:18 +00:00
Bill Yi
3c5590354a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0cb680936f -s ours am: 81ffcfb260 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280839

Change-Id: I0172e72af8c22afcbad13d28553ad4a7329fc915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 22:34:53 +00:00
Bill Yi
d728499d0e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d4053e03a4 -s ours am: 163b025d23 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280836

Change-Id: Ib6e1c71bfad6646b927abbdf0845031527ae6943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 22:34:34 +00:00
Bill Yi
9be301d060 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f83f62f608 -s ours am: fcc6ea853b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280836

Change-Id: I0ac1ffe01464024d6795542f3b2abd2757ba67fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 22:34:17 +00:00
Bill Yi
68f438bdb8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d69f19c92f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280842

Change-Id: I84548d5e5f038e602dacd978a08730d22c9454d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 22:14:16 +00:00
Bill Yi
296000ea70 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f32482d0d4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280842

Change-Id: I45f879af8501db865c122060e5ef6b46c2c4b4b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 22:14:02 +00:00
Bill Yi
632c6ef1f1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1e7e184419 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280839

Change-Id: I7909c8db48053717c872e236f0c429ab71eba0e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 22:13:55 +00:00
Bill Yi
81ffcfb260 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0cb680936f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280839

Change-Id: Ief0df5dc295f45efa99b5ee6aee718eae499deab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 22:13:30 +00:00
Bill Yi
163b025d23 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d4053e03a4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280836

Change-Id: I2498ac94845175c22aaa1bd1d5b3f85379792795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 22:13:10 +00:00
Bill Yi
fcc6ea853b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f83f62f608 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280836

Change-Id: I1cbaeb739017f600335d98261609e8f31fe870b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 22:12:53 +00:00
Bill Yi
d69f19c92f Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-17 22:08:52 +00:00
Bill Yi
1e7e184419 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-17 22:08:52 +00:00
Bill Yi
d4053e03a4 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-17 22:08:52 +00:00
Bill Yi
d83c9c6f21 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-05-17 22:07:24 +00:00
Bill Yi
65145b98d5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ddb6d0ea0a -s ours am: 66c4c78f51 -s ours am: a5752cc09f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23278234

Change-Id: I37873ddef4a9ba4a8a38b233ca97b64b19329588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 20:19:53 +00:00
Bill Yi
213a58a284 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 52b4eb39a6 -s ours am: c0267ceb73 -s ours am: ca1364fd85 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280841

Change-Id: I9829e799af1322f2ce475bf2c26b2c2547b3d631
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 20:19:06 +00:00
Bill Yi
a5752cc09f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ddb6d0ea0a -s ours am: 66c4c78f51 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23278234

Change-Id: I2cd9c0d35f0e628b6c8d1da33ec02b5d62b1a012
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 19:56:46 +00:00
Bill Yi
ca1364fd85 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 52b4eb39a6 -s ours am: c0267ceb73 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280841

Change-Id: If7c304f19a96c1cb65e72693fdc7a2aa8af709e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 19:55:33 +00:00
Treehugger Robot
922f602daf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: f65e5dc8df -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280843

Change-Id: Ic9927f174745b45757d572ce32bf463aaf4e62e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 19:39:32 +00:00
Bill Yi
dcc49ba3ce [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1dce804a35 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280843

Change-Id: Ib2f91f8a31d78cd66ab3ca32add68fe57967852d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 19:39:23 +00:00
Treehugger Robot
9a763f848a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 473d36ec42 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280840

Change-Id: Id2dac107ca3ce97c0a863637c9d9a1dcbb3d83f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 19:39:15 +00:00
Bill Yi
5268c2cc78 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c796674b36 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280840

Change-Id: Ia72e7cddc3d90f62a78291924e4b0b2a7945a7dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 19:38:56 +00:00
Treehugger Robot
81d5eecfb3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6258503052 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280837

Change-Id: I00b2b0b80f7b61b6bb29b149544d1bd02f6d0b25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 19:38:38 +00:00
Bill Yi
bbeaca2636 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 363bcc1584 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280837

Change-Id: I73caf0f3c12530f2cf029480622efd7217fc54f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 19:38:21 +00:00
Bill Yi
66c4c78f51 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ddb6d0ea0a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23278234

Change-Id: I8735a21a219b140bb20dc84f8972f80112e3b2fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 19:34:27 +00:00
Bill Yi
c0267ceb73 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 52b4eb39a6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280841

Change-Id: Idd4a46b6bb7ac423690cca74019195aea31b4958
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 19:33:15 +00:00
Treehugger Robot
f65e5dc8df Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-05-17 18:52:38 +00:00
Treehugger Robot
473d36ec42 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-05-17 18:52:38 +00:00
Treehugger Robot
6258503052 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-05-17 18:52:38 +00:00
Julia Tuttle
e7eb3ab983 Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9 am: 2474419ac8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254

Change-Id: I8d705d71901d00877f9b51faebf7810a18aa20e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 16:37:32 +00:00
Vania Januar
2e8e1339a2 Merge "Disambiguate default notes app user from stylus settings" into udc-qpr-dev 2023-05-17 16:03:20 +00:00
Julia Tuttle
2474419ac8 Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254

Change-Id: I2ec0a0f37d2d25c82da35689c2c4af3efcdc7f9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 15:35:26 +00:00
YK Hung
7b0f5b38b7 Merge "Fix b/282944866: Java crash" into udc-dev am: 0101e6904f am: cdf9452261
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279578

Change-Id: I4814ae9faac2a6a7049074ca6b78b33974df54d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 15:14:15 +00:00
Julia Tuttle
28edfb8df9 Merge "Add FSI toggle to per-app notification settings" into udc-dev 2023-05-17 14:48:50 +00:00
YK Hung
cdf9452261 Merge "Fix b/282944866: Java crash" into udc-dev am: 0101e6904f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279578

Change-Id: I1992e2b356b78c31fc90f6b467d33f739d99e443
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 14:33:24 +00:00
Julia Tuttle
6630c852d9 Add FSI toggle to per-app notification settings
Bug: 277938609
Test: atest FullScreenIntentPermissionPreferenceControllerTest
Test: # manual, verifying against "Special app access" screen
Change-Id: I9cb0d9bc99ce59a7b0ff6bcd2cab7a3c2d63f45f
2023-05-17 14:30:49 +00:00
YK Hung
0101e6904f Merge "Fix b/282944866: Java crash" into udc-dev 2023-05-17 13:45:32 +00:00
Zoey Chen
61a0dbe187 Merge "[Regional Preference] Set numbering system when select it" into udc-dev am: 74ab90bb53 am: 9752a7be52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258700

Change-Id: I4dfb9f67e0963fca4d859bc5a667a907d1b71f73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 11:25:09 +00:00
Zoey Chen
9752a7be52 Merge "[Regional Preference] Set numbering system when select it" into udc-dev am: 74ab90bb53
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258700

Change-Id: I5d3cda5ac33f624a54ae3c1535575c7b56793e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 10:43:04 +00:00
Zoey Chen
74ab90bb53 Merge "[Regional Preference] Set numbering system when select it" into udc-dev 2023-05-17 09:44:45 +00:00
Zaiyue Xue
6235f4b69a Fix b/282944866: Java crash
Bug: 282944866
Fix: 282944866
Test: presubmit
Change-Id: I6dd9d15f21d4fcb3e75847c5727b18bdafbfa09b
2023-05-17 15:59:55 +08:00
YK Hung
a316530fd5 Merge "Add protection for the BadParcelableException" into udc-dev am: 54f39ec271 am: 6a54517f05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279576

Change-Id: Iccbd753d43b4fdd79617c42aa14d8e48402c7c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 06:23:04 +00:00