Bill Yi
7e7efd0f80
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d26a94857
-s ours am: 4e2f191fe5
-s ours am: df9839f6d9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744951
Change-Id: Ie4a2fd92674e6cc3623d0d5f072d88786fc3487b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 00:12:23 +00:00
Bill Yi
aa2ae14f84
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eaa3838179
-s ours am: 64677e15d9
-s ours am: 8f1383cba3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744950
Change-Id: I88cadc37896dee9e2e6f5011fc5a38e5f9fc37c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 00:12:20 +00:00
Bill Yi
73006ce3e3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5753866bb
-s ours am: ebedb167fc
-s ours am: 28743336b7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744950
Change-Id: Iaf3b7edef07c39562659b3ab37a4588c179c5fab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 00:12:11 +00:00
Bill Yi
588c5b7c9d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 883a2b633e
-s ours am: b1e0ae99ce
-s ours am: 8c3f41b3f7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744004
Change-Id: Ia14824711e4943950481e0731942b62befefda5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-15 00:11:55 +00:00
Bill Yi
2e4673500f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 880a595859
-s ours am: cca1e959ee
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744951
Change-Id: I23cd04d07b0e762ad09a0120c7d38bbd01e7baa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:36:10 +00:00
Bill Yi
df9839f6d9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d26a94857
-s ours am: 4e2f191fe5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744951
Change-Id: I2ca8072521f3d6d4a2d63d7291fd34834f6ea80e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:36:07 +00:00
Bill Yi
8f1383cba3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eaa3838179
-s ours am: 64677e15d9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744950
Change-Id: I4bdd0d4530076ede0c28e4677a19bb0ee037f230
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:36:04 +00:00
Bill Yi
28743336b7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5753866bb
-s ours am: ebedb167fc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744950
Change-Id: I713e7bf989f8d69d7c30b525cb646a51c54d3976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:35:54 +00:00
Bill Yi
8c3f41b3f7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 883a2b633e
-s ours am: b1e0ae99ce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744004
Change-Id: I0a17d2096360a573d9a044e4ee73e2985bf0f163
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:35:40 +00:00
Bill Yi
1f8443d6d2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 880a595859
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744951
Change-Id: I2525b6d2474a436572a0b2d135707a5669856661
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:31:18 +00:00
Bill Yi
250f3c8c9b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d26a94857
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744951
Change-Id: Ie1471a20c8d9ff3eda6469b71364059a2933b38d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:31:13 +00:00
Bill Yi
44adc2b02a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eaa3838179
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744950
Change-Id: I73375276dd12e0b36f5cd7a26f958463d0893f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:31:09 +00:00
Bill Yi
1605dfab0b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5753866bb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744950
Change-Id: Id3cece510886a8139e78f9c3b61247922bd59ca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:30:57 +00:00
Bill Yi
02cdab0a91
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 883a2b633e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744004
Change-Id: I26b465cbee66b582976f57f7374d4c953d409648
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:30:44 +00:00
Bill Yi
cca1e959ee
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 880a595859
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744951
Change-Id: If995c1c1d9eb8d5023e42ea8996fa6fdc324f8ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:22:23 +00:00
Bill Yi
4e2f191fe5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d26a94857
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744951
Change-Id: I24d9904d6fef76ba1efe2360858b05f2e3d8dfd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:22:19 +00:00
Bill Yi
64677e15d9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eaa3838179
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744950
Change-Id: Ic39f291d6dd9e58de865f710a5d7cf3a61cbb7c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:22:15 +00:00
Bill Yi
ebedb167fc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5753866bb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744950
Change-Id: I348161b5db4874cb2e47bdc560351db4d73ea36d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:22:03 +00:00
Bill Yi
b1e0ae99ce
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 883a2b633e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744004
Change-Id: I896f371b555159556a070588bbdc504a10976fc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:21:49 +00:00
Holly Sun
9fa69928d5
Use launcher namespace instead of settings-ui namespace.
...
Bug: 294858168
Test: manual + unit
Change-Id: I5820ba86686584b7bc4a2ad695e5b5c0cf46b297
2023-09-14 23:06:58 +00:00
Bill Yi
880a595859
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-09-14 22:44:17 +00:00
Bill Yi
eaa3838179
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-09-14 22:44:17 +00:00
Graciela Putri
ae170b7970
Merge "Add accessible sequence for aspect ratio options" into udc-qpr-dev am: 7cf5bb509e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24742814
Change-Id: I1f559828d5ab7ce517b231df8bd0f7e92541b677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 22:32:52 +00:00
Graciela Putri
7cf5bb509e
Merge "Add accessible sequence for aspect ratio options" into udc-qpr-dev
2023-09-14 21:25:52 +00:00
Graciela Wissen Putri
7889f55f3d
Remove moreOptions in aspect ratio settings
...
System apps that are not visible in Home/Launcher are already excluded
by default.
Fix: 299924064
Test: Manual
Change-Id: Ia5972f23b1a9dd2f6dda65fb02784fe722e7a63a
2023-09-14 13:23:09 +00:00
Graciela Putri
5faa0d8d2f
Merge "Add aspect ratio title strings for translation" into udc-qpr-dev am: c7757a00d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24733894
Change-Id: Iea368681c3021e23f33ba8ea5e61de4e5618360d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 11:45:48 +00:00
Graciela Putri
c7757a00d3
Merge "Add aspect ratio title strings for translation" into udc-qpr-dev
2023-09-14 11:06:09 +00:00
Graciela Wissen Putri
392a811294
Add accessible sequence for aspect ratio options
...
Fix: 297293566
Test: Manual
Change-Id: I12b61ccd0330b80e027af7a9eb1693b8d94cc262
2023-09-14 10:35:05 +00:00
Graciela Wissen Putri
57816e8cf6
Add aspect ratio title strings for translation
...
For the purpose of translation, we are adding all possible permutations
of aspect ratio titles/labels.
Bug: 300219974
Test: Manual
Change-Id: Id0a63098f773ed7cd5e3bdf043633e7ea4a9202f
2023-09-14 08:45:30 +00:00
Bill Yi
0d72215c72
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: a9dafd684c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745010
Change-Id: Ib3396c59242d2f582af9138cf6085184b910eb5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 02:36:05 +00:00
Bill Yi
69621a6507
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 67f2c30f07
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745010
Change-Id: I29c132ad2c05640318f6175c9baead62becb75dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 02:36:01 +00:00
Bill Yi
3a0e0371be
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 547444fcf9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745008
Change-Id: Ib91f69c00f3175ad5c2233e412dd52248dc0f75d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 02:35:57 +00:00
Bill Yi
93d3c81dd7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f77fcdcc19
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745008
Change-Id: I7ffe65ac35a4f3953b6f2a424c20845a55adac41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 02:35:42 +00:00
Bill Yi
37b524bcb4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 77e9b3e439
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744006
Change-Id: I3a4b81212c98c11bb4026a5da1b6249c457f8758
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 02:35:32 +00:00
Bill Yi
61b3d62e5f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51f5fc71d9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744006
Change-Id: I26489bb2b17f0059a07bb4dbd1efbf3074ec733b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 02:35:18 +00:00
Bill Yi
a9dafd684c
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-09-14 02:07:40 +00:00
Bill Yi
547444fcf9
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-09-14 02:07:40 +00:00
Bill Yi
77e9b3e439
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-09-14 02:07:40 +00:00
Anvesh Renikindi
a73a6376ea
[automerger skipped] Merge "Remove ExperimentalLifecycleComposeApi" into aosp-main-future am: 7bed4aade8
-s ours am: d783537f9f
-s ours am: a5a031f98b
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 f1febf9e9b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24732669
Change-Id: I81a8769871af6ba9f3763c51eff0956449ed4a4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-13 18:43:01 +00:00
Chaohui Wang
78778776b4
[automerger skipped] Remove ExperimentalLifecycleComposeApi am: 5d8fea06b1
-s ours am: 55a2fe7bd2
-s ours am: bc7f3e566d
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 f1febf9e9b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24732669
Change-Id: Iab736130de88e7d267a07685d56f0f783a9b0a46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-13 18:42:55 +00:00
Anvesh Renikindi
a5a031f98b
[automerger skipped] Merge "Remove ExperimentalLifecycleComposeApi" into aosp-main-future am: 7bed4aade8
-s ours am: d783537f9f
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 f1febf9e9b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24732669
Change-Id: I12e36af194476868389e84fa9a07333652eb7d16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-13 18:04:37 +00:00
Chaohui Wang
bc7f3e566d
[automerger skipped] Remove ExperimentalLifecycleComposeApi am: 5d8fea06b1
-s ours am: 55a2fe7bd2
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 f1febf9e9b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24732669
Change-Id: I52060122d94ed44a42d52ee4ed04eea1204acc1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-13 18:04:30 +00:00
Anvesh Renikindi
d783537f9f
[automerger skipped] Merge "Remove ExperimentalLifecycleComposeApi" into aosp-main-future am: 7bed4aade8
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 f1febf9e9b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24732669
Change-Id: Ie235b1f2607bed1091844eec8dbff696b2b38807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-13 17:16:30 +00:00
Chaohui Wang
55a2fe7bd2
[automerger skipped] Remove ExperimentalLifecycleComposeApi am: 5d8fea06b1
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 f1febf9e9b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24732669
Change-Id: I9fd1502569bbd84665220325471551b9661a6a43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-13 17:16:23 +00:00
Randy Pfohl
e66986f9ba
Merge "update navigation mode settings string" into udc-qpr-dev am: fa0371ae8f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24722205
Change-Id: I15e425196150f48d06f8fe83d7b8463be1107fc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-13 17:09:16 +00:00
Alan Huang
b839780f23
Update the Spatial audio strings for tablet.
...
Test: manual build and check on tablet
Bug: 298003807
Change-Id: I242c42103bca633ac0ed0b925a4624c1c8e4fb42
2023-09-14 01:00:49 +08:00
Anvesh Renikindi
7bed4aade8
Merge "Remove ExperimentalLifecycleComposeApi" into aosp-main-future
2023-09-13 16:29:32 +00:00
Randy Pfohl
fa0371ae8f
Merge "update navigation mode settings string" into udc-qpr-dev
2023-09-13 16:27:51 +00:00
Wentao Wang
0d3ae3ed32
Merge "Separate the demo user factory reset option with admin user factory reset option." into udc-qpr-dev am: 38f12abb75
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24677431
Change-Id: I1c3d89346991f82f994a230db385ef2c523b067a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-13 13:01:39 +00:00
Wentao Wang
38f12abb75
Merge "Separate the demo user factory reset option with admin user factory reset option." into udc-qpr-dev
2023-09-13 11:51:21 +00:00