Commit Graph

110327 Commits

Author SHA1 Message Date
TreeHugger Robot
fa8bb92025 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f4e14e153b -s ours am: 8859d2d131 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifa4320cd538c88a8d1cb2500fe4c0d4efc23e6bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 07:51:13 +00:00
Bill Yi
b829b80845 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a1ec1e30df -s ours am: 46ef926c7d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ied2b758130a2271060c9b3ced513e998d855bef7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 07:51:11 +00:00
TreeHugger Robot
99fe34343d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4cddf997d6 -s ours am: fccca2d569 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I00992b6f3d158974a5077a4e7b163a6acdf673e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 07:51:09 +00:00
Bill Yi
5cde47a835 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ff3434900 -s ours am: ec126d93fe -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6c0cec7637baf7fedae1ca649e0512be6810d845
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 07:50:57 +00:00
TreeHugger Robot
b05c41db59 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 24c7d47de2 -s ours am: 2f4c15f95f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1f4891497f4751e079b1168fd08f4be17c95a2a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 07:50:32 +00:00
Bill Yi
3adffeec9f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 171a00478b -s ours am: ce885622a7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia0ad188ee18eaa488deee5a44995498b7be16b2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 07:50:07 +00:00
TreeHugger Robot
8859d2d131 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f4e14e153b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3c72497e940e6341d2809211f64fa86a3b56bbe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 07:25:53 +00:00
Bill Yi
46ef926c7d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a1ec1e30df -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic6477cc86daa19ec48e92d6222fb3324e2be7a93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 07:25:51 +00:00
TreeHugger Robot
fccca2d569 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4cddf997d6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie4cc6ec27b864db263062e9b809097d4878c754c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 07:25:50 +00:00
Bill Yi
ec126d93fe [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ff3434900 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0f90720eb10a668f7632e3d5186eac99f8e6aee5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 07:25:31 +00:00
TreeHugger Robot
2f4c15f95f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 24c7d47de2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0d06f2f9223c867a1daf8adf359e83822e6bbafe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 07:25:09 +00:00
Bill Yi
ce885622a7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 171a00478b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id928ba7eebb872e2e39e97ec3b6dab94685edd44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 07:24:48 +00:00
TreeHugger Robot
f4e14e153b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-10-12 06:55:58 +00:00
TreeHugger Robot
4cddf997d6 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-10-12 06:55:58 +00:00
TreeHugger Robot
24c7d47de2 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-10-12 06:55:58 +00:00
Tim Peng
f315f0c89f Merge "RESTRICT AUTOMERGE Refactoring settings UI" into tm-qpr-dev am: 67537336a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20034710

Change-Id: I16b44dc7bb298426b37669579fc9b175152d3a34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 06:35:55 +00:00
Hugh Chen
b1fac0fb92 RESTRICT AUTOMERGE Refactoring settings UI am: f891f7ba86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20034710

Change-Id: I2e6bb7660f690b2aa2db5a2ef4c628e406d674c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 06:35:46 +00:00
Tim Peng
67537336a6 Merge "RESTRICT AUTOMERGE Refactoring settings UI" into tm-qpr-dev 2022-10-12 06:01:43 +00:00
Josh Hou
b589be652d Merge "[Panlingual] Separate the app locale information by profiles" into tm-qpr-dev am: 9c2e35244d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20064275

Change-Id: I1bfd03028218d068c239a087ca1bd1a5e01286b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 05:34:03 +00:00
Josh Hou
9c2e35244d Merge "[Panlingual] Separate the app locale information by profiles" into tm-qpr-dev 2022-10-12 05:03:52 +00:00
Xin Li
2b11f79bab [automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937" into stage-aosp-master am: 5ebaa600a1 -s ours
am skip reason: Merged-In I9ebe26c6a8058798ea654523ad1405a8447268b8 with SHA-1 6ecbe4c18e is already in history

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

Change-Id: I8af8de0926f04686ccd5648f6a2c1453d2087166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 17:58:17 +00:00
Xin Li
6c1c71059c [automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: 302b01f8e2 -s ours
am skip reason: Merged-In I9ebe26c6a8058798ea654523ad1405a8447268b8 with SHA-1 6ecbe4c18e is already in history

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

Change-Id: Idaef5eec13477eaf80685f9c97234d529d458d9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 17:55:37 +00:00
Xin Li
5ebaa600a1 Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937" into stage-aosp-master 2022-10-11 17:39:16 +00:00
Treehugger Robot
332183ee4d Merge "Add fallback summary text if there is no matching screen timeout value" am: 007c215c3e am: 44431c73e7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2239486

Change-Id: I39f0b958a99e4109b454a2edc66c0dee1c03a7ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 06:56:21 +00:00
Treehugger Robot
44431c73e7 Merge "Add fallback summary text if there is no matching screen timeout value" am: 007c215c3e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2239486

Change-Id: I2a5103f40ff538d327f1db9d1062de044683b615
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 06:27:16 +00:00
Treehugger Robot
007c215c3e Merge "Add fallback summary text if there is no matching screen timeout value" 2022-10-11 05:51:12 +00:00
Hugh Chen
f891f7ba86 RESTRICT AUTOMERGE Refactoring settings UI
Bug: 248174653
Test: build & boot pass
Change-Id: I124a65941349d3338145865cae2c8354678897fa
2022-10-11 04:30:09 +00:00
TreeHugger Robot
8565fcd9a5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 19971433a3 -s ours am: 8b00fad21e -s ours am: d1dd16222b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3650db656bd32153d05504bf0204fc45ce1095b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:24:35 +00:00
Bill Yi
efe0eb20b4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 177fea7707 -s ours am: 3f4d598606 -s ours am: 27d2c1d387 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaddb9179e35a0a80b4370626f8fa4cdbf7936f40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:24:33 +00:00
TreeHugger Robot
aea49f9352 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: afe5f1ac18 -s ours am: eac07869ff -s ours am: 4c021c6b06 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9ec7640944322633e646311cf6b0d7ec1101977e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:24:26 +00:00
Bill Yi
cc0d0ce6db [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4ba8745b10 -s ours am: cbf161d09b -s ours am: 272b07dd04 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id793292188ec215170a6a3ebd916d29a08f9fb38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:24:14 +00:00
Bill Yi
2e6ec07996 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 467155435c -s ours am: 18560c1147 -s ours am: d7cf3b29e3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0dc69afc2aee859cb2002749262878e173d6d8ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:23:54 +00:00
TreeHugger Robot
d1dd16222b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 19971433a3 -s ours am: 8b00fad21e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I65af0311cdccfe8f05fcf9be872f149f016f66b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:08:15 +00:00
Bill Yi
27d2c1d387 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 177fea7707 -s ours am: 3f4d598606 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8ccd673e056f7af62f3f5e41850de5b74d0029aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:08:11 +00:00
TreeHugger Robot
4c021c6b06 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: afe5f1ac18 -s ours am: eac07869ff -s ours
am skip reason: subject contains skip directive

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

Change-Id: I10728a72771cc0f91ea80b6c45aaf390cc2d5717
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:08:07 +00:00
Bill Yi
272b07dd04 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4ba8745b10 -s ours am: cbf161d09b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I20839438a4f393b2a8f5a7a7e62e9a6776d82d5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:07:52 +00:00
Bill Yi
d7cf3b29e3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 467155435c -s ours am: 18560c1147 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia137801aaf7dba6bb87650ea3a2713101b10002d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:07:35 +00:00
TreeHugger Robot
8b00fad21e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 19971433a3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icd1ebe8d26a339ab3d01f58889bced1c076c08ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 22:55:54 +00:00
Bill Yi
3f4d598606 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 177fea7707 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I99576a09003f7054302d712cc2d2bc00547b7f3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 22:55:49 +00:00
TreeHugger Robot
eac07869ff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: afe5f1ac18 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic7b000cb3eac10b6306ad2264f27aa51857614db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 22:55:44 +00:00
Bill Yi
cbf161d09b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4ba8745b10 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I19aebde57d029ede5dd629754c31ecfffff930ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 22:55:26 +00:00
Bill Yi
18560c1147 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 467155435c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0fce25558bdfc28f03002c457e65d817011c8c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 22:55:14 +00:00
TreeHugger Robot
19971433a3 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-10-10 22:14:13 +00:00
TreeHugger Robot
afe5f1ac18 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-10-10 22:14:13 +00:00
Bill Yi
a1ec1e30df Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3af7cdfeb330c352ea352e08484cf4f8eb9d8890
2022-10-09 20:44:05 -07:00
Bill Yi
177fea7707 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I84d0bcacb71f88a68f961d2d1cf83b8df1bdcdaf
2022-10-09 20:42:21 -07:00
Bill Yi
3ff3434900 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4d08d5d8e1745590996ec0b940bc587bcb92eec2
2022-10-09 20:40:28 -07:00
Bill Yi
4ba8745b10 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I95d0d47182909547a30671ac207bc59a5769db98
2022-10-09 20:34:46 -07:00
Bill Yi
171a00478b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5080ea8ef088ac3455bd258df08e64823f5bf5b5
2022-10-09 20:28:54 -07:00
Bill Yi
467155435c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I30d81e9920cda4cd5d07a1f07456c37b2ac94da3
2022-10-09 20:26:30 -07:00