PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,187 Commits 1 Branch 0 Tags
21c5e714c209bf40a1838a395a5be96ef16a7d4c
Commit Graph

102187 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
changbetty
21c5e714c2 [automerger skipped] Support RTL mode in Sim switch dialog am: 562cc5ed45 am: 342fe3487e am: 4b3a17619e -s ours am: 606c1b0aaa -s ours am: ce1ba949c4 -s ours 
am skip reason: Merged-In I89bf58dfd0c0019799b9062eba5f6318dfc9fe1a with SHA-1 59d5b47f6d is already in history

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

Change-Id: Iafd1a971bcdfec0a28aeec11acac37b58c522f19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 16:11:25 +00:00
changbetty
ce1ba949c4 [automerger skipped] Support RTL mode in Sim switch dialog am: 562cc5ed45 am: 342fe3487e am: 4b3a17619e -s ours am: 606c1b0aaa -s ours 
am skip reason: Merged-In I89bf58dfd0c0019799b9062eba5f6318dfc9fe1a with SHA-1 59d5b47f6d is already in history

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

Change-Id: I8e3d2800a8d361ea84fdb332675dde6d083361df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:54:34 +00:00
SongFerng Wang
c52a160183 [automerger skipped] Merge changes Iee650897,Icb00b3fc,I5c6ad4b3,Ief4299e7,I85800227, ... am: 31c40b00e7 am: b9cd3f7ef9 am: 53f68b7f27 -s ours am: 3beb209f1f -s ours 
am skip reason: Merged-In Iee650897b81c96b5febb0413649629b1a1971b18 with SHA-1 bf148dea7c is already in history

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

Change-Id: I3c31ba7a05885cb49e0d54b49df56584dce2c00c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:54:33 +00:00
SongFerngWang
6569a9a89b [automerger skipped] [MEP] renew the sim confirm dialog UI am: ba9d26696b am: 04424bbf69 am: 2eb57839c6 -s ours am: 1b62ca1267 -s ours 
am skip reason: Merged-In Icb00b3fc32066e21d22cbeca1fdf50e5d7dbef20 with SHA-1 4780be49f3 is already in history

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

Change-Id: Id8663e6f927684e8cf3bc7e871ac4392d0a0409d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:54:32 +00:00
SongFerngWang
f3d210804f [automerger skipped] [MEP] renew the default data selection UI am: db2ddb6a92 am: e9d39b468d am: 696f538ff3 -s ours am: e6d9e910d9 -s ours 
am skip reason: Merged-In I5c6ad4b35d38112d5e88330a3fc9638be533bc94 with SHA-1 be8f279f2c is already in history

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

Change-Id: I12a93c2783900da6667bf58e663a2f4984e51576
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:54:30 +00:00
SongFerngWang
da4af1ee3a [automerger skipped] switch SIM refactor to support MEP am: 59a6ecbde2 am: b29d670c71 am: 0453d9de8d -s ours am: a579616596 -s ours 
am skip reason: Merged-In Ief4299e775c0758e4b886d5eff13bd482f8c8ab3 with SHA-1 22ab05b420 is already in history

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

Change-Id: Ib9cb9e2078699e57359a601fe174c3f0f86b17c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:54:29 +00:00
SongFerngWang
91be4ac21c [automerger skipped] switch SIM refactor to support MEP am: 37358798bc am: 483ff27a47 am: 57fbdab22d -s ours am: 7ae4b284b0 -s ours 
am skip reason: Merged-In I8580022793e5c3fc14159f14b406f864353477f8 with SHA-1 1e0e9021ac is already in history

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

Change-Id: Id7c6401bbf737e285a84646f62588603547e0a55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:54:28 +00:00
changbetty
e3a97e411f [automerger skipped] Support RTL mode in Sim switch dialog am: 562cc5ed45 am: 342fe3487e am: 4b3a17619e -s ours am: 606c1b0aaa -s ours 
am skip reason: Merged-In I89bf58dfd0c0019799b9062eba5f6318dfc9fe1a with SHA-1 59d5b47f6d is already in history

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

Change-Id: Ibe0807b0c1c42762ea73e32a78908ed382610fa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:54:26 +00:00
SongFerng Wang
3beb209f1f [automerger skipped] Merge changes Iee650897,Icb00b3fc,I5c6ad4b3,Ief4299e7,I85800227, ... am: 31c40b00e7 am: b9cd3f7ef9 am: 53f68b7f27 -s ours 
am skip reason: Merged-In Iee650897b81c96b5febb0413649629b1a1971b18 with SHA-1 bf148dea7c is already in history

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

Change-Id: I5e4002fcfebbaec866281a1f7f9e1350835e0fb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:39:48 +00:00
SongFerngWang
1b62ca1267 [automerger skipped] [MEP] renew the sim confirm dialog UI am: ba9d26696b am: 04424bbf69 am: 2eb57839c6 -s ours 
am skip reason: Merged-In Icb00b3fc32066e21d22cbeca1fdf50e5d7dbef20 with SHA-1 4780be49f3 is already in history

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

Change-Id: I2b27b25c369eac1630473ed8453685a6aa211349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:39:46 +00:00
SongFerngWang
e6d9e910d9 [automerger skipped] [MEP] renew the default data selection UI am: db2ddb6a92 am: e9d39b468d am: 696f538ff3 -s ours 
am skip reason: Merged-In I5c6ad4b35d38112d5e88330a3fc9638be533bc94 with SHA-1 be8f279f2c is already in history

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

Change-Id: I8e1b4fc8b6de1410a9bf53b4e6267c17b93f1bfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:39:44 +00:00
SongFerngWang
a579616596 [automerger skipped] switch SIM refactor to support MEP am: 59a6ecbde2 am: b29d670c71 am: 0453d9de8d -s ours 
am skip reason: Merged-In Ief4299e775c0758e4b886d5eff13bd482f8c8ab3 with SHA-1 22ab05b420 is already in history

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

Change-Id: Ia7af3453b0573d808f31bcfb022b6de36bbce8e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:39:42 +00:00
SongFerngWang
7ae4b284b0 [automerger skipped] switch SIM refactor to support MEP am: 37358798bc am: 483ff27a47 am: 57fbdab22d -s ours 
am skip reason: Merged-In I8580022793e5c3fc14159f14b406f864353477f8 with SHA-1 1e0e9021ac is already in history

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

Change-Id: I9b0f34bd7dcbaabee0378a3605c6812e2b1872fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:39:41 +00:00
changbetty
606c1b0aaa [automerger skipped] Support RTL mode in Sim switch dialog am: 562cc5ed45 am: 342fe3487e am: 4b3a17619e -s ours 
am skip reason: Merged-In I89bf58dfd0c0019799b9062eba5f6318dfc9fe1a with SHA-1 59d5b47f6d is already in history

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

Change-Id: I4d165b0b13b55959be708904cf08d134f76c77cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:39:38 +00:00
SongFerng Wang
53f68b7f27 Merge changes Iee650897,Icb00b3fc,I5c6ad4b3,Ief4299e7,I85800227, ... am: 31c40b00e7 am: b9cd3f7ef9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043028

Change-Id: Ie9741186e04bab03be7339f94a789675d12c6360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:26:38 +00:00
SongFerngWang
2eb57839c6 [MEP] renew the sim confirm dialog UI am: ba9d26696b am: 04424bbf69 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043027

Change-Id: I3b3b17af236799939a4919c67f123005740e1aa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:26:37 +00:00
SongFerngWang
696f538ff3 [MEP] renew the default data selection UI am: db2ddb6a92 am: e9d39b468d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043026

Change-Id: I0b55a215eaa751232ffe69c7cfc16cf713e3d390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:26:35 +00:00
SongFerngWang
0453d9de8d switch SIM refactor to support MEP am: 59a6ecbde2 am: b29d670c71 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043025

Change-Id: I7592c07952c05765a409b92845379e325697b521
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:26:34 +00:00
SongFerngWang
57fbdab22d switch SIM refactor to support MEP am: 37358798bc am: 483ff27a47 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043024

Change-Id: I6e35330168e2094e5bb7b9cbcf80574fcfe38773
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:26:33 +00:00
changbetty
4b3a17619e Support RTL mode in Sim switch dialog am: 562cc5ed45 am: 342fe3487e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043023

Change-Id: I2c4120d86f9c27bad0f57df881eddbb97ba9c4fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:26:32 +00:00
SongFerng Wang
b9cd3f7ef9 Merge changes Iee650897,Icb00b3fc,I5c6ad4b3,Ief4299e7,I85800227, ... am: 31c40b00e7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043028

Change-Id: I473db94863284e07184f90f6f442d3d405c87e32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:05:46 +00:00
SongFerngWang
04424bbf69 [MEP] renew the sim confirm dialog UI am: ba9d26696b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043027

Change-Id: I8a21b5f42cdd0febc75d2b4fca211bb21d8ea084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:05:45 +00:00
SongFerngWang
e9d39b468d [MEP] renew the default data selection UI am: db2ddb6a92 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043026

Change-Id: I8854b721cc74a33071abaa2ff76a8e3428174c94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:05:44 +00:00
SongFerngWang
b29d670c71 switch SIM refactor to support MEP am: 59a6ecbde2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043025

Change-Id: I5747bf7dec160d081f4cb2c69f60173c9d4dd6e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:05:42 +00:00
SongFerngWang
483ff27a47 switch SIM refactor to support MEP am: 37358798bc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043024

Change-Id: I9ede4062566e48899eb79ff12e5e4cd96b01ddba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:05:41 +00:00
changbetty
342fe3487e Support RTL mode in Sim switch dialog am: 562cc5ed45 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043023

Change-Id: I67e4a9aa874b0a103c5c06863d42826f8f0a3a44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:05:40 +00:00
SongFerng Wang
31c40b00e7 Merge changes Iee650897,Icb00b3fc,I5c6ad4b3,Ief4299e7,I85800227, ... 
* changes:
  [MEP] disable enabled esim profile before set simSlotMapping
  [MEP] renew the sim confirm dialog UI
  [MEP] renew the default data selection UI
  switch SIM refactor to support MEP
  switch SIM refactor to support MEP
  Support RTL mode in Sim switch dialog
 2022-03-27 14:44:48 +00:00
Peter Wang
36c6391fa3 [automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 6879183335 -s ours am: 15b28eb1cf -s ours am: 06fb46cb26 -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 ee1893af6e is already in history

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

Change-Id: I0ec9e57051e24b4b50e06cec9f484fa00d16ee13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 14:16:18 +00:00
Peter Wang
06fb46cb26 [automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 6879183335 -s ours am: 15b28eb1cf -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 ee1893af6e is already in history

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

Change-Id: I54d767eb80a0f219f918de687a2231e9545f7347
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 14:00:51 +00:00
Peter Wang
50f920e80d [automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 6879183335 -s ours am: 15b28eb1cf -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 ee1893af6e is already in history

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

Change-Id: Ie64d82f6e6e4f95ed0a125432d8998b6cd78e173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 14:00:42 +00:00
Peter Wang
15b28eb1cf [automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 6879183335 -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 ee1893af6e is already in history

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

Change-Id: I71bf1df18176933cad1e816722cddc1051d11822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 13:45:39 +00:00
Peter Wang
6879183335 Add a cancel string for ToggleSubscriptionDialog to handle Tamil 
translation

Bug: 185553806
Test: Build
Change-Id: I90149c9e4459747d8cd1c35d00c29f81710eb6f4
Merged-In: I90149c9e4459747d8cd1c35d00c29f81710eb6f4
 2022-03-26 15:12:14 +08:00
Joe Bolinger
9295240071 Merge changes from topic "presubmit-am-7558807516104e4aa3755256c45095b4" into sc-v2-dev-plus-aosp am: 8ff1ef339f am: 6f94d1f784 am: 6b68635d89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17386185

Change-Id: Idf4382d3e711c3641d735dd1396167cbb55953bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 23:10:02 +00:00
Joe Bolinger
50cd9ae3fa Merge changes from topic "presubmit-am-7558807516104e4aa3755256c45095b4" into sc-v2-dev-plus-aosp am: 8ff1ef339f am: 6f94d1f784 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17386185

Change-Id: I54a17d4f14bb00de6a31c75b33932f5c13fe27f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 22:53:34 +00:00
Joe Bolinger
6b68635d89 Merge changes from topic "presubmit-am-7558807516104e4aa3755256c45095b4" into sc-v2-dev-plus-aosp am: 8ff1ef339f am: 6f94d1f784 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17386185

Change-Id: I2bd4b51140edd593b3c2503f070aa3ced3905a25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 22:53:27 +00:00
Joe Bolinger
6f94d1f784 Merge changes from topic "presubmit-am-7558807516104e4aa3755256c45095b4" into sc-v2-dev-plus-aosp am: 8ff1ef339f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17386185

Change-Id: I753ad8af595172167eb8b34dd73a58e95d65d1bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 22:39:18 +00:00
Joe Bolinger
8ff1ef339f Merge changes from topic "presubmit-am-7558807516104e4aa3755256c45095b4" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] Set exported flag to false. 2p: 34704f4108
  Set exported flag to false.
 2022-03-25 22:20:22 +00:00
Joe Bolinger
998dad16f3 Merge "Set exported flag to false." 2022-03-25 22:20:13 +00:00
SongFerng Wang
716d9f1790 [automerger skipped] Merge "Add a cancel string for the dialog to handle Tamil translation" am: 7ba3e20afb -s ours am: 8030d66e0d -s ours am: b88a4a8830 -s ours am: a32f1f6efa -s ours am: 2ad2d6fed0 -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 9ecda98ada is already in history

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

Change-Id: I01859cefc7a744e890780fc8eed095c52810e08f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:22:16 +00:00
Peter Wang
a8ca968d5f [automerger skipped] Add a cancel string for the dialog to handle Tamil translation am: aa042c2d6c -s ours am: 810677e214 -s ours am: 16f75f0c64 -s ours am: 5695d6492e -s ours am: 8306a09319 -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 9ecda98ada is already in history

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

Change-Id: I50a4fe0562f1f24f5e51f6be6678485f6ff395f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:22:15 +00:00
SongFerng Wang
67476195b2 [automerger skipped] Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" am: 02db0438a9 -s ours am: 5dea8d562f -s ours am: 83a12cf22c -s ours am: 86ab18c4d8 -s ours am: acf62bb5e7 -s ours 
am skip reason: Merged-In Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9 with SHA-1 494c68e3cf is already in history. Merged-In was found from reverted change.

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

Change-Id: I11c601b3a4571c2da0179514b5d902a2cc050a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:21:03 +00:00
SongFerng Wang
ddadcc6440 [automerger skipped] Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil" am: 0f77d567b4 -s ours am: 9c1f66d741 -s ours am: 04bd163a85 -s ours am: e3064b5be5 -s ours am: 79174688ee -s ours 
am skip reason: Merged-In Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9 with SHA-1 494c68e3cf is already in history. Merged-In was found from reverted change.

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

Change-Id: I0ad3840a742020eadea6fcb27766d37c052135f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:21:02 +00:00
SongFerng Wang
76c1ced016 [automerger skipped] Merge "Add a cancel string for the dialog to handle Tamil translation" am: 7ba3e20afb -s ours am: 8030d66e0d -s ours am: b88a4a8830 -s ours am: a32f1f6efa -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 9ecda98ada is already in history

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

Change-Id: I262da1897971e3c200c0cc4110c4d9d1f5190db4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:04:24 +00:00
Peter Wang
5c90648ab8 [automerger skipped] Add a cancel string for the dialog to handle Tamil translation am: aa042c2d6c -s ours am: 810677e214 -s ours am: 16f75f0c64 -s ours am: 5695d6492e -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 9ecda98ada is already in history

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

Change-Id: Ie7280e803ea93a1c66ff529f218e5a83bcf587bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:04:23 +00:00
SongFerng Wang
2ad2d6fed0 [automerger skipped] Merge "Add a cancel string for the dialog to handle Tamil translation" am: 7ba3e20afb -s ours am: 8030d66e0d -s ours am: b88a4a8830 -s ours am: a32f1f6efa -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 9ecda98ada is already in history

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

Change-Id: If69de25230519190a6f1f1c6eb0eabe48d6d5319
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:03:41 +00:00
Peter Wang
8306a09319 [automerger skipped] Add a cancel string for the dialog to handle Tamil translation am: aa042c2d6c -s ours am: 810677e214 -s ours am: 16f75f0c64 -s ours am: 5695d6492e -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 9ecda98ada is already in history

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

Change-Id: Ibc7a04b46e28c4a95934099e429dfda1ec89ba1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:03:40 +00:00
SongFerng Wang
2df3b51dfd [automerger skipped] Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" am: 02db0438a9 -s ours am: 5dea8d562f -s ours am: 83a12cf22c -s ours am: 86ab18c4d8 -s ours 
am skip reason: Merged-In Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9 with SHA-1 494c68e3cf is already in history. Merged-In was found from reverted change.

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

Change-Id: Ie9c9057f5928852c7c1ea674524e47decdbb4503
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:03:16 +00:00
SongFerng Wang
86bc97769f [automerger skipped] Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil" am: 0f77d567b4 -s ours am: 9c1f66d741 -s ours am: 04bd163a85 -s ours am: e3064b5be5 -s ours 
am skip reason: Merged-In Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9 with SHA-1 494c68e3cf is already in history. Merged-In was found from reverted change.

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

Change-Id: I6b0d3eb8c0d5e6d872568f7b35eaa55095b39058
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:03:15 +00:00
SongFerng Wang
acf62bb5e7 [automerger skipped] Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" am: 02db0438a9 -s ours am: 5dea8d562f -s ours am: 83a12cf22c -s ours am: 86ab18c4d8 -s ours 
am skip reason: Merged-In Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9 with SHA-1 494c68e3cf is already in history. Merged-In was found from reverted change.

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

Change-Id: Ic7b3375b11c484ac0b3f23255b99d2316d13388b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:02:46 +00:00
SongFerng Wang
79174688ee [automerger skipped] Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil" am: 0f77d567b4 -s ours am: 9c1f66d741 -s ours am: 04bd163a85 -s ours am: e3064b5be5 -s ours 
am skip reason: Merged-In Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9 with SHA-1 494c68e3cf is already in history. Merged-In was found from reverted change.

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

Change-Id: I81bd6a65601f27582bb0388aa77ea40ede390338
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:02:43 +00:00