Commit Graph

135849 Commits

Author SHA1 Message Date
Bill Yi
4ef9001b41 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours am: 3c00fdbe8e -s ours am: 27c5a172b5 -s ours am: 6c8c7465c3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I111226d0c1c9a98ca983d940553f9b923480ef4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 05:39:59 +00:00
Bill Yi
a09672a68e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours am: fddbd76bd8 -s ours am: 11184d6acc -s ours am: fedfb4417d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifb8c3125aa7e30c773550c9645e4f992d42b8fc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 05:39:53 +00:00
Bill Yi
22d61264c8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744 -s ours am: 8f824b54ea -s ours am: 8c0e6c44c0 -s ours am: 04b43abeb4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifc8a90add870c6759912ba80523e0202b6649d6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 05:39:32 +00:00
Bill Yi
6c8c7465c3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours am: 3c00fdbe8e -s ours am: 27c5a172b5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iadf71ae24b753ca6583d2bd50038b81118a31366
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 05:09:01 +00:00
Bill Yi
fedfb4417d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours am: fddbd76bd8 -s ours am: 11184d6acc -s ours
am skip reason: subject contains skip directive

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

Change-Id: If9b85a05c24451ccbcff9055907c99dab4966ce8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 05:08:49 +00:00
Bill Yi
04b43abeb4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744 -s ours am: 8f824b54ea -s ours am: 8c0e6c44c0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4f0813d02035f122dd064cbae62f1d2a19252d59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 05:08:34 +00:00
Bill Yi
27c5a172b5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours am: 3c00fdbe8e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id83be08685aff164ffe578384d0127628dc0b984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 04:36:04 +00:00
Bill Yi
11184d6acc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours am: fddbd76bd8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7ac16244743db5b39d988efcca249fc6a47c4e4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 04:35:51 +00:00
Bill Yi
8c0e6c44c0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744 -s ours am: 8f824b54ea -s ours
am skip reason: subject contains skip directive

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

Change-Id: I86ab265f33bef673092c1c34df16eee78cee1807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 04:35:37 +00:00
Bill Yi
93e55f37cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours am: 2a7ad51854 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I155479c1de21266c2dfeae6523d00b0272e454ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 04:19:17 +00:00
Bill Yi
1ed9caa084 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours am: b96f505024 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaaadb4415e7c33847e31ce446e6fcecd6c63cef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 04:19:09 +00:00
Bill Yi
7ed7f910cf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744 -s ours am: 634343e027 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I360741872a48239c001b74f2a048df3597fec8db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 04:18:51 +00:00
Bill Yi
2a7ad51854 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I16adcd7307548edf047d3120c36d85010ea9165a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 03:50:39 +00:00
Bill Yi
b96f505024 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icbfbb4d3b4b82114a20bf12de1f23d59c8de8e99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 03:50:29 +00:00
Bill Yi
634343e027 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5a28ccffab9a0dbe175f1cb47fb8683bbe852981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 03:50:13 +00:00
Bill Yi
3c00fdbe8e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I803cfed0e98c681d6b42fadb6a3ab5d077ddd531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 03:49:07 +00:00
Bill Yi
fddbd76bd8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id9ec59a7cac6f4e7cd51108f6d5bee2a5d47d1f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 03:49:01 +00:00
Bill Yi
8f824b54ea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4fcb7e808a391d3aadda7a376ecdaa6e99dfd86b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 03:48:41 +00:00
Bill Yi
10a9e88148 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3dd12cecf3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id3f73a20013eb3c805d487afb2c85a2f9ede5eeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 03:27:50 +00:00
Bill Yi
aa48a59290 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-10-03 03:12:03 +00:00
Bill Yi
9102470b11 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-10-03 03:12:03 +00:00
Bill Yi
7b38ca4ff1 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-10-03 03:09:01 +00:00
Allen Su
1c2440aab0 Merge "Fix notificaiton not working in work profile" into main 2023-10-03 02:11:34 +00:00
Bill Yi
226a244a25 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 16eacc3097 -s ours am: a46afe3b67 -s ours am: a4d991c836 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I804e52eaa850af60e2a5703b9a55faa522f10e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 22:16:40 +00:00
Bill Yi
b953cc93a5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 217974d1f4 -s ours am: aab00637cc -s ours am: f6f7ede780 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibde8d87d3c0460161edf2b124fd1a3ed76514dba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 22:16:26 +00:00
Bill Yi
bbe7ac8c45 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 91787589e3 -s ours am: f0a398ba6b -s ours am: 4a626d4856 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie0c48594a34a736cef7af29342349be010c79b5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 22:16:14 +00:00
Bill Yi
dd7cc6e3da [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 16eacc3097 -s ours am: ce90d7667c -s ours am: 93e23bf143 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iad6653606dd0a479138aa12df760189ffc575216
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 22:10:38 +00:00
Bill Yi
bb715f9628 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 217974d1f4 -s ours am: 96802b6b87 -s ours am: 9ae139073c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9df831e7489b40360da70ddae4b0641648342d6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 22:10:27 +00:00
Bill Yi
91334e9ef6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 91787589e3 -s ours am: 7931cdc634 -s ours am: 6aad472dd7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0d46239bb3c1bd1dff307098684f31571aebdd90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 22:10:11 +00:00
Bill Yi
a4d991c836 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 16eacc3097 -s ours am: a46afe3b67 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If140cde3fa73c42d44835b0c0d711a099d5eb4e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 21:53:05 +00:00
Bill Yi
f6f7ede780 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 217974d1f4 -s ours am: aab00637cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I797be00c50ebf72300920a7dae86416f3787cf82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 21:52:56 +00:00
Bill Yi
4a626d4856 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 91787589e3 -s ours am: f0a398ba6b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie8ce4bba986ffe7f981cede371ca4bbb75a7ed06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 21:52:38 +00:00
Bill Yi
93e23bf143 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 16eacc3097 -s ours am: ce90d7667c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ide6754ce608595849806942f83c50246dc222f05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 21:41:07 +00:00
Bill Yi
9ae139073c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 217974d1f4 -s ours am: 96802b6b87 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I69dd33eb0f7766615058cad7c1014007692c5526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 21:40:56 +00:00
Bill Yi
6aad472dd7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 91787589e3 -s ours am: 7931cdc634 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie245c6293e0a8602139efd93eff2c34f977f2593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 21:40:41 +00:00
Bill Yi
a46afe3b67 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 16eacc3097 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib1ec58f407f5944ced7195c326c5723360a2c105
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 21:28:21 +00:00
Bill Yi
aab00637cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 217974d1f4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9c5520137b09186da19a7c125a99fc4271ae3114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 21:28:13 +00:00
Bill Yi
f0a398ba6b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 91787589e3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I725f3b25cd3d541787998e5dd0cb42392e1da116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 21:27:55 +00:00
Bill Yi
ce90d7667c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 16eacc3097 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If84ed710468ff2b2cbf16d427a6b82c71180966b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 21:27:15 +00:00
Bill Yi
96802b6b87 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 217974d1f4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibe2e81b80090008486ebe9ac88b2acf0bedf4668
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 21:27:09 +00:00
Bill Yi
7931cdc634 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 91787589e3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2fec3a9a5be1fa658c88dc32da3ccb565022d4ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 21:26:48 +00:00
Bill Yi
925ae72ae7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f336e73db9 -s ours am: fe0c995a5d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8e6cc8c6f40c13428d724f518ac612f7d7a7c67f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 21:01:33 +00:00
Bill Yi
16eacc3097 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-10-02 20:38:39 +00:00
Bill Yi
fe0c995a5d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f336e73db9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I563f617b607eca39ef91d6450be0f7fa0903f089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 19:58:35 +00:00
Omer Ozer
9952d054d9 Merge "Add feature flags for Factory Reset Wizard." into main 2023-10-02 15:44:12 +00:00
Bill Yi
8a08dc33bf Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I724e5ecb79014bcd6a7979e6e15f2c289c26c5db
2023-10-02 07:07:06 -07:00
Bill Yi
5283d99789 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6e3161d23673e01aa65c4670b97b958059ce27fd
2023-10-02 06:53:51 -07:00
Shivangi Dubey
097a9e736c Merge "Disable Fold lock behavior setting by default" into main 2023-10-02 10:00:10 +00:00
Allen Su
7b31a7a612 Fix notificaiton not working in work profile
Bug: 298592379
Test: atest SettingsRoboTests:com.android.settings.localepicker
Change-Id: I1da93e0dd2a7f98c2e635a1d7a520c88ba8258e0
2023-10-02 09:34:40 +00:00
Bill Yi
217974d1f4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2d0eaf947accd684a1b8d5eed229e46ba3e3bac7
2023-10-02 00:09:28 -07:00