Commit Graph

123690 Commits

Author SHA1 Message Date
Bill Yi
48bdacaaf7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f83f62f608 -s ours am: b128113876 -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: Ifc3827435ed25ceee62f4a834af8b204b2d084dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 22:34:22 +00:00
Bill Yi
2de88d0b1c [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: I387d68d785d14d0f27e18742518ee9205e346e01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 22:33:19 +00:00
Bill Yi
95797d87c4 [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: I9a951a8265c877b5f8284f8a7cbd78b670290441
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 22:33:06 +00:00
Bill Yi
40c3425391 [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: Ifcdaf3b5197eb09b1e97ecd8bfbd7343748f5fa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 22:32:59 +00:00
Bill Yi
082888caa1 [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: I37f418ae4ca455743bd6c8842ac5635ddbdc51ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 22:32:34 +00:00
Bill Yi
8e3df8142e [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: I303c184b2d57ce25f15c4de2753071b8a5b985f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 22:32:14 +00:00
Bill Yi
df2455c53f [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: I3e46f21de96cf18b4ba3df80193deb432d809f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 22:31:56 +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
b128113876 [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: I21de7fa9a4e0d693dca946b40375d33a40e15113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 22:13:10 +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
e1e8f9deff [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 52b4eb39a6 -s ours am: 38de5c85af -s ours am: d7c728d9a5 -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: I2bec06cb96d1a7a75404d6fdc0734f39268db404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 20:42:28 +00:00
Bill Yi
d7c728d9a5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 52b4eb39a6 -s ours am: 38de5c85af -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: I62a5dbdd7a386560a10b5dab6855aa4fb9c3427b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 20:21:18 +00:00
Bill Yi
f75f692907 [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: Ib688ab277e97d57216d419fd2f155abf783e69c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 20:18:05 +00:00
Bill Yi
99297d5e32 [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: Id83528911193fd74d55d996bd1d4e254eb57b9d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 20:16:44 +00:00
Bill Yi
7941e279d2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ddb6d0ea0a -s ours am: 66c4c78f51 -s ours am: 0e9bbc5b01 -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: Ib3c2b386cb6ac5d4f813419a8dd50eae378be706
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 20:10:24 +00:00
Bill Yi
1689e9a8ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 52b4eb39a6 -s ours am: c0267ceb73 -s ours am: 2f74303357 -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: I5c916c68d5cd5334e62ae95d71585fb4a0becf5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 20:09:36 +00:00
Bill Yi
0e9bbc5b01 [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: Ib94b89c8ec34fa31eff640b967e061a7e3c64706
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 19:57:28 +00:00
Bill Yi
2f74303357 [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: Ibfd383bc8df617a0e1a9de8ec5eaaebc5d677cff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 19:57:09 +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
Bill Yi
38de5c85af [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: Ibe4514e280b94d37ea66c683ba46dd71be83deec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 19:34:43 +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
229028fe5c [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: I6fad5ea372014ea982b4a9d28a2354f68605eed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 19:09:21 +00:00
Bill Yi
5e8bc7f331 [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: I8caba277c8af5bc84f841095d1b58c62c2a4f05e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 19:09:16 +00:00
Treehugger Robot
5ce5377d52 [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: Ief59e6842a1fb9e04b2886f274f8942a78ad2574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 19:09:05 +00:00
Bill Yi
6048dbb88d [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: I02892e0444bb20d49b32343874a062132598affa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 19:08:45 +00:00
Treehugger Robot
c39aa06037 [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: I9442e67634975684942efefdbc478a39fb4e75f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 19:08:26 +00:00
Bill Yi
0455ed7fa5 [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: Id3adeade42f336f8835cbefe240821c6dcde3ee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 19:08:09 +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
c08206fc7c Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9 am: 35dae4aefd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254

Change-Id: I018b1d39d02c42473923a921cdd89fcccb00764c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 16:38:36 +00:00
Julia Tuttle
7034984e19 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: I88fe8929dc6cebc76430d1d810b8714c619d94e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 16:33:28 +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
Julia Tuttle
35dae4aefd 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: Ia5524ccfb7d3eac04f5aa780494f35650824faec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 15:31:12 +00:00
YK Hung
1c546b6fc4 Merge "Fix b/282944866: Java crash" into udc-dev am: 0101e6904f am: b6f257642c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279578

Change-Id: I1e6d4139662dbf40d7be4cd50411c4bb30838ef5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 15:14:45 +00:00
YK Hung
56ce3c42bb 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: Ifadf784a346565d56b1345a60bf4708cbf247517
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 15:10:19 +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
b6f257642c 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: Iaa8c51b627d423135a7cfce3a55e360493e1d233
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 14:29:10 +00:00
YK Hung
0101e6904f Merge "Fix b/282944866: Java crash" into udc-dev 2023-05-17 13:45:32 +00:00