PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
128,258 Commits 1 Branch 0 Tags
b8084ecfcdbefcaaa048d207440aae0155d2da1c
Commit Graph

128258 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
370704d2f9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6258503052 -s ours am: 81d5eecfb3 -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: I7c6706b784b1650ffbbfb46dc5d2f5e4eab62eda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 20:09:21 +00:00
Bill Yi
835431e3d8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 363bcc1584 -s ours am: bbeaca2636 -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: Ic22f7f2636528ceb5fe11f28a91c35fb31b2194c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 20:09:04 +00:00
Bill Yi
adb426ef1d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ddb6d0ea0a -s ours am: 66c4c78f51 -s ours am: 246428d41c -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: I22658ca2ffb3da28fb04ba83004b0dcb26023897
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 20:06:33 +00:00
Bill Yi
4621afff74 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 52b4eb39a6 -s ours am: c0267ceb73 -s ours am: 8909673439 -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: Ife906ff7e9513d148e5565d4110b334b93ad4267
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 20:04:31 +00:00
Treehugger Robot
5dac85040b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: f65e5dc8df -s ours am: 229028fe5c -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: I26bf62b5cb2fe95d32d5b0b85eece8ee4d6567d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 19:59:25 +00:00
Bill Yi
27e61da919 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1dce804a35 -s ours am: 5e8bc7f331 -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: I6d102426a62ec317c3533f25fd7de7c2b8bb7591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 19:59:16 +00:00
Treehugger Robot
1a055fb7d4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 473d36ec42 -s ours am: 5ce5377d52 -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: Ib15c3bb9981a2e81b7417b2da1b6f447bd50da55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 19:59:07 +00:00
Bill Yi
b2f1f13a2c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c796674b36 -s ours am: 6048dbb88d -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: Iac146e07a6506f098aeb4c67cd7bc703ce693139
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 19:58:50 +00:00
Treehugger Robot
a1c2a9a708 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6258503052 -s ours am: c39aa06037 -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: I703a5d34d7755c17f168e2dc490c2cd82528bac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 19:58:31 +00:00
Bill Yi
f1c65704c1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 363bcc1584 -s ours am: 0455ed7fa5 -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: If5d44dfdd0043a811dd9fc6030276ca83714ccfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 19:58:14 +00:00
Bill Yi
246428d41c [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: I155729eaaa5bd7a75c907994751c1d7d11311709
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 19:57:56 +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
8909673439 [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: I44c97489686a34cd09a58a763195a51b28719e85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 19:55:53 +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
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
9eb03be961 Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9 am: 35dae4aefd am: c08206fc7c am: 3883bc720d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254

Change-Id: I31f8e659f70d0138437918d1b015c5a356e3d14f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 18:29:02 +00:00
Julia Tuttle
9d6f04ceeb Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9 am: 2474419ac8 am: 7034984e19 am: 6770a297b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254

Change-Id: I6dff76b6fce1e061a194b42fa9d4e8b0fd41623b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 18:28:36 +00:00
Treehugger Robot
07061b1d8c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 0ccc641715 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3914404d7235e57f0e3632e17446d822959d2923
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 18:26:54 +00:00
Bill Yi
54441884af [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58322c039b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia823b910543a256657bc787882040c00a3cea70e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 18:26:32 +00:00
Julia Tuttle
3883bc720d Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9 am: 35dae4aefd am: c08206fc7c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254

Change-Id: Ibc51286089367c6d873a97ddf31f703f8b8678a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 17:25:10 +00:00
Julia Tuttle
6770a297b6 Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9 am: 2474419ac8 am: 7034984e19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254

Change-Id: If5aa32d9a6139fcfdfbe3618950364a26f213250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 17:25:02 +00:00
Treehugger Robot
0ccc641715 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-05-17 17:18:30 +00:00
Aleksandar Kiridzic
657be564ac speech: Re-add on-device speech recognition settings entry 
After `Settings > System > Languages & input` was separated into
`Settings > System > Languages` and `Settings > System > Keyboard`,
`On-device speech recognition` was lost. This CL adds it in the same
`Speech` preference category where it was before
and moves the category to `Settings > System > Languages`.

Bug: 278279110
Test: Manual, already existing robotests
Change-Id: I040c284dd3596f35ceacb6980ff89e611e29971c
 2023-05-17 18:15:48 +01:00
Julia Tuttle
392eb5883d Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9 am: 2474419ac8 am: e7eb3ab983 am: 2af8ee4e4e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254

Change-Id: Idf999be6d9e69739c4d48917073fe5d94ac86cdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 17:05:57 +00:00
Vania Januar
d9562be0d3 Merge "Disambiguate default notes app user from stylus settings" into udc-qpr-dev am: 2e8e1339a2 am: 0277f1676e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990296

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

Change-Id: Ied228ee481b76e923aefb4d09ac4dffec60c0865
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 17:05:05 +00:00
YK Hung
be5acb6e7a Merge "Fix b/282944866: Java crash" into udc-dev am: 0101e6904f am: b6f257642c am: 1c546b6fc4 am: 10f028f71a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279578

Change-Id: I1a0f3f673c16ac408888ad3183b5ab44716cc0c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 17:04:27 +00:00
YK Hung
57d09a9fec Merge "Fix b/282944866: Java crash" into udc-dev am: 0101e6904f am: cdf9452261 am: 56ce3c42bb am: 29822f8aef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279578

Change-Id: Id2cb4d7cefc68ecc35aafa94b663f5ff87ec2625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 17:03:33 +00:00
Julia Tuttle
2af8ee4e4e Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9 am: 2474419ac8 am: e7eb3ab983 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254

Change-Id: I797efe5d35c4ad315cf399956dba952674f2223b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 16:41:49 +00:00
Vania Januar
0277f1676e Merge "Disambiguate default notes app user from stylus settings" into udc-qpr-dev am: 2e8e1339a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990296

Change-Id: Iabe40045f8193d3b532881d454fd0cf22c748953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 16:41:30 +00:00
TreeHugger Robot
3f32da2295 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: dcc2dc11c6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaea1a469fb9fbd56040fc1cec7a3232202b5d686
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 16:41:10 +00:00