Commit Graph

124422 Commits

Author SHA1 Message Date
Automerger Merge Worker
294c5a72bd Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c am: c4649b3ede -s ours" into udc-dev-plus-aosp am: 5e3e804b39 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8436defb2dbb3ca43c8461b8d02f51d71693da21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 02:44:00 +00:00
Bill Yi
4d378ddc21 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c am: c4649b3ede -s ours am: 27bc142960 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If582596e076b37f138b6d635327f93e0ff635101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 02:43:57 +00:00
Fangqiu Su
0f1ca5b569 Merge "Update uiautomator references in packages/apps/Settings/tests/unit" am: 233c708436 am: a176782c18 am: 5ed8e6bc0e am: 6b6044bedb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558510

Change-Id: If1833c5dfb653dd2ef40ee62e04ad9e306865b98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 02:41:54 +00:00
Treehugger Robot
b687c3a6cd Merge changes from topic "tc_change_23042206_47" into udc-dev am: ef196f7f3e am: 8b449fadde
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22794712

Change-Id: I209ba5c63bb902b6dfce9dffe4a63b5294cd7489
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 02:38:06 +00:00
Bill Yi
b309f2e56a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c am: c4649b3ede -s ours am: 17062daad3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie205872d85766da26eb8c851bbd8f772563f5c8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 02:37:42 +00:00
Treehugger Robot
ed9f22b78a Merge changes from topic "tc_change_23042206_47" into udc-dev am: ef196f7f3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22794712

Change-Id: I968e42bdcd64a2325105458eedf106e389bde932
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 02:21:06 +00:00
Bill Yi
0a2936d879 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c am: c4649b3ede -s ours
am skip reason: subject contains skip directive

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

Change-Id: I46369b2d98f829b295f9164f8a7069a7ce71a799
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 02:20:45 +00:00
Treehugger Robot
26adf38f78 Merge changes from topic "tc_change_23042206_47" into udc-dev am: ef196f7f3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22794712

Change-Id: Ided95afc058f53d9753dea764c947cb473380ac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 01:59:00 +00:00
Automerger Merge Worker
5e3e804b39 Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c am: c4649b3ede -s ours" into udc-dev-plus-aosp 2023-04-25 01:58:05 +00:00
Treehugger Robot
8b449fadde Merge changes from topic "tc_change_23042206_47" into udc-dev am: ef196f7f3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22794712

Change-Id: Id57aada77bbc1ce4ee7d84256bfcb915f9af33d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 01:56:47 +00:00
Bill Yi
27bc142960 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c am: c4649b3ede -s ours
am skip reason: subject contains skip directive

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

Change-Id: I046aa9989a367373ce08cd7da6251c7160c93640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 01:55:41 +00:00
Fangqiu Su
6b6044bedb Merge "Update uiautomator references in packages/apps/Settings/tests/unit" am: 233c708436 am: a176782c18 am: 5ed8e6bc0e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558510

Change-Id: Ic9bd09f06a4cf29e220b9516846ead6b0e2e634e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 01:55:20 +00:00
Bill Yi
17062daad3 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c am: c4649b3ede -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1763d407c3b0072264da6f75641aa6c0798dbab9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 01:55:07 +00:00
Chaohui Wang
cf47befb50 Merge "Fix EID dialog related issues" into udc-dev am: 56f2c894d8 am: 5fba57460c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22789357

Change-Id: I11a266a7000eea7ecc37e215dadfc46fb3710249
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 01:40:40 +00:00
Treehugger Robot
ef196f7f3e Merge changes from topic "tc_change_23042206_47" into udc-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c
  Import translations. DO NOT MERGE ANYWHERE
2023-04-25 01:26:27 +00:00
Treehugger Robot
c55501f7c7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 646e95241d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic3f7058db327485df5c868928e4432ddee24728e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 01:18:28 +00:00
Bill Yi
9a68370305 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d4b01e8c9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I50e67b0274381606cbd63fde1d2cd1ece4568e9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 01:18:12 +00:00
Treehugger Robot
d704607b35 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 103dfefdad -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4f6df8b433437086b9fd763301054a6ec9e76e1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 01:17:58 +00:00
Bill Yi
cacff81257 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c43541f1c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I06b797760dc58a9987bdcab19ea9a4674913b16c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 01:16:32 +00:00
Treehugger Robot
3d3dcbab25 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-04-25 01:16:30 +00:00
Treehugger Robot
1ca7987d8e Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-04-25 01:16:30 +00:00
Treehugger Robot
3f8ee137f2 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-04-25 01:16:30 +00:00
Treehugger Robot
9baf7e3fca [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 29ba678514 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3a71119fd44db4ccc23c66361820e0a5c876939f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 01:16:29 +00:00
Bill Yi
1920f8aa93 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4f92177ec1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3f59c629429a0c350c533662b8ec4a1371b270a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 01:14:55 +00:00
Fangqiu Su
5ed8e6bc0e Merge "Update uiautomator references in packages/apps/Settings/tests/unit" am: 233c708436 am: a176782c18
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558510

Change-Id: I2eaa42894698dd627630aba0480046e81fb31b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 01:11:31 +00:00
Chaohui Wang
5075ba7c38 Merge "Fix EID dialog related issues" into udc-dev am: 56f2c894d8 am: 34a3c229a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22789357

Change-Id: I04184413dac0fecd1da0a4561adadf10553eed10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 01:10:29 +00:00
Chaohui Wang
6ec804e4eb Merge "Fix EID dialog related issues" into udc-dev am: 56f2c894d8 am: 7823686740
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22789357

Change-Id: Ia99c1c7b338ced65dcc89d022057cd6ca10b29db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 01:09:27 +00:00
Treehugger Robot
646e95241d Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-25 01:09:25 +00:00
Treehugger Robot
103dfefdad Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-25 01:09:25 +00:00
Treehugger Robot
29ba678514 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-25 01:09:25 +00:00
Chaohui Wang
34a3c229a0 Merge "Fix EID dialog related issues" into udc-dev am: 56f2c894d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22789357

Change-Id: Iac821365230ebabd0ad4648ea43860bf3f8f262d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 00:34:15 +00:00
Bill Yi
92afd34258 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eb6de672dc -s ours am: ae326b5f83 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2c90792285d969859704d27cf1d966669470c291
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 00:32:04 +00:00
Bill Yi
e0e2df5e16 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51a04e12bf -s ours am: fc348ab76d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia77c2241e36df3c10d9f1bc7f69ff733b6e79e60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 00:32:01 +00:00
Bill Yi
a90458fe71 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ae1b6f1e35 -s ours am: 733d6f5579 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7167079b6ec5fd7a478d6868230838d4ab236113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 00:31:59 +00:00
Bill Yi
eb791b09dd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71c7b5f54c -s ours am: f477d02f91 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic3957e1b6ca27cc5ee38feb3b07186cc2d938cf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 00:31:55 +00:00
Bill Yi
fe774bfa67 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ef269038ef -s ours am: e676a561d8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9f1a6944219b7a4dc4d93ed65327d26ea3561a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 00:31:44 +00:00
Chaohui Wang
7823686740 Merge "Fix EID dialog related issues" into udc-dev am: 56f2c894d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22789357

Change-Id: Iefc5bc85dc359433dcb6957cfee81eda843ee6d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 00:31:24 +00:00
Bill Yi
41fa42fc6a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c646d4394 -s ours am: f537b87b7a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I89f56cdb8f4fd87153f7e9e26ddc51aa3f03d7f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 00:30:31 +00:00
Fangqiu Su
a176782c18 Merge "Update uiautomator references in packages/apps/Settings/tests/unit" am: 233c708436
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558510

Change-Id: Ifef3769deeed83ef20214e9ade0b2f3f9000ccfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 00:27:13 +00:00
Chaohui Wang
5fba57460c Merge "Fix EID dialog related issues" into udc-dev am: 56f2c894d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22789357

Change-Id: I89ef02b853287ce35d1feb7bd0c6abeccdfdbc61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 00:24:45 +00:00
Chaohui Wang
56f2c894d8 Merge "Fix EID dialog related issues" into udc-dev 2023-04-24 23:46:42 +00:00
Fangqiu Su
233c708436 Merge "Update uiautomator references in packages/apps/Settings/tests/unit" 2023-04-24 23:46:23 +00:00
Bill Yi
496cdfbfe9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eb6de672dc -s ours am: f9392111bb -s ours am: f61d20ef0f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idce7c7ac8e6815730ff2ef1ab4f6c0d82ecee9c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 23:20:58 +00:00
Bill Yi
f0107b1649 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51a04e12bf -s ours am: 19a53a5241 -s ours am: 230ca0100e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8a1fe4d6cea107734c9a9efd4bf13a98b8820cb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 23:20:56 +00:00
Bill Yi
48545a79e1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ae1b6f1e35 -s ours am: bcafcba421 -s ours am: d7d5e57707 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic6036ec4a4f290f174d5acbbfcdb45c94c4f2495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 23:20:54 +00:00
Bill Yi
3f1a462345 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71c7b5f54c -s ours am: f0911b2572 -s ours am: df3b739286 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia5d9cc7112757ffc6cb4e71224c05e1f3861a0e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 23:20:39 +00:00
Bill Yi
0f89de4ef5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ef269038ef -s ours am: ec6a532d98 -s ours am: 06b07322cd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib8a3a91c6d2e187ff259adbeb4331f04fe39fa69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 23:20:09 +00:00
Bill Yi
e682ff125f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c646d4394 -s ours am: 7218d10694 -s ours am: 0ae129b16b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icc544bd8d119cb71a0cba90f3f76712b843d6f44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 23:18:06 +00:00
Bill Yi
6298900b0d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eb6de672dc -s ours am: 18386aec12 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icab1b982d80d1a2cb8eec0c2cdc7e4e302de43bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:56:41 +00:00
Bill Yi
c0ae45e1b9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51a04e12bf -s ours am: 4944f6452d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2f51432d9fc1aa75e8c901d7b90f672882d05294
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:56:22 +00:00