Commit Graph

111720 Commits

Author SHA1 Message Date
TreeHugger Robot
ad194052a8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f08bf7780a -s ours am: d360cd6895 -s ours am: 096942d9ab -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia75ae2eb2d9b81584e71d3843079f7b1ab1935c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 12:28:24 +00:00
Bill Yi
6875cf37d6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2714015bac -s ours am: f1ccac59de -s ours am: 28b04115ee -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5bbeb4060cfd29782c9bf73de7ea4c3037fcb3a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 12:28:18 +00:00
TreeHugger Robot
096942d9ab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f08bf7780a -s ours am: d360cd6895 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idd7b333ecc505d491261e0916e994b9ec759cd9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 12:08:58 +00:00
Bill Yi
28b04115ee [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2714015bac -s ours am: f1ccac59de -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6821a13cff8548a35afa61b86eb9fe328c50dc91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 12:08:49 +00:00
TreeHugger Robot
d360cd6895 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f08bf7780a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iee8fd197446401293b649fb866fca45375b14892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 11:46:03 +00:00
Bill Yi
f1ccac59de [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2714015bac -s ours
am skip reason: subject contains skip directive

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

Change-Id: I07e7a8739655acb12d360200de06e1579aa3355e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 11:45:57 +00:00
TreeHugger Robot
f08bf7780a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-23 11:24:26 +00:00
Bonian Chen
b807ec5412 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: 31b8174c10 am: 2cb39cf969 am: b27361686a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: I780cdd40664a2e81562fd0d15d24cad03cab4793
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 05:19:00 +00:00
Bonian Chen
43f9752246 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: 31b8174c10 am: fef8aab672 am: 91c1a023e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: I814c623796b76ee6766e845ad3bceea9c71dbb9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 05:18:52 +00:00
Bonian Chen
a337d6ad37 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: b88828b155 am: 4e2c3689e3 am: 0805e9efbf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: I9305bf7ee97701521cd40071f4925eea406e9468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 05:18:33 +00:00
Bonian Chen
b27361686a Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: 31b8174c10 am: 2cb39cf969
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: Iaf9d3e3d082f576fb58d54de59154cc79ac6a917
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 05:08:24 +00:00
Bonian Chen
91c1a023e3 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: 31b8174c10 am: fef8aab672
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: Ieab524093fcf79f22ea57b6fd1989eb6b5351f04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 05:01:18 +00:00
Bonian Chen
0805e9efbf Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: b88828b155 am: 4e2c3689e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: I321210e16c994d86824d952d04e7bb9a98e462d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 05:00:56 +00:00
Bonian Chen
fef8aab672 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: 31b8174c10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: I7526d262d7abb17eaae0a7ea597d8ca56a34953f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 04:52:13 +00:00
Bonian Chen
2cb39cf969 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: 31b8174c10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: Id817b88d0210b620c398b2598a954ec544548833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 04:52:11 +00:00
Bonian Chen
4e2c3689e3 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: b88828b155
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: Ib3003b99cc802e9ade9e0602de83fbc685ece742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 04:43:51 +00:00
Bonian Chen
e6b9bef981 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: 734d1692ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: Ib8200b2cfd17fae9cef99c8671a1566136df1762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 04:43:03 +00:00
Bonian Chen
31b8174c10 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: I7484149765a66e9c9beeeac1bb9dd596670a6ba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 04:27:06 +00:00
Bonian Chen
734d1692ff Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: I19c92b5cf7e6463efb5a9aa822cc520855732907
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 04:26:02 +00:00
Bonian Chen
b88828b155 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: I5bd96bac8e7313ec76a461a0d4e453da90ba9072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 04:25:38 +00:00
Bonian Chen
c5fc5db0e7 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev 2022-06-23 04:08:21 +00:00
Automerger Merge Worker
50e4577787 Merge "Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd am: 071719856d" into tm-d1-dev-plus-aosp am: 0ab3bc967d am: 899697ea05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542

Change-Id: Iabca800074844f0d70026a485151bfe5014b9880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 23:40:44 +00:00
Salud Lemus
db1478f101 Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd am: 7e3c6913d3 am: 26bdfebe0b am: a060b7ab4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542

Change-Id: I926dac8b780e1db455a26d858c9c2f57e545b32f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 23:40:29 +00:00
Salud Lemus
e3fa4ae94c Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd am: 7e3c6913d3 am: fd1d882d8d am: 416595f2dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542

Change-Id: Ide73320e9c30cbd7972b82c42590863d91f98976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 23:40:18 +00:00
Automerger Merge Worker
899697ea05 Merge "Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd am: 071719856d" into tm-d1-dev-plus-aosp am: 0ab3bc967d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542

Change-Id: I2f2d0a5514a42a6f2074d9c77106c72a4ab63e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 23:23:38 +00:00
Salud Lemus
a060b7ab4f Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd am: 7e3c6913d3 am: 26bdfebe0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542

Change-Id: I0973a4d1f6e74b788392db96c5c95d88e79bb23e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 23:23:28 +00:00
Salud Lemus
416595f2dc Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd am: 7e3c6913d3 am: fd1d882d8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542

Change-Id: Ic2101cf866cd697b2dfc3fbb15d9d8ffaf7b4c06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 23:22:54 +00:00
Salud Lemus
fd1d882d8d Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd am: 7e3c6913d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542

Change-Id: I926409fc54b474b2e8a079767d9eb0dc58056fee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 23:08:03 +00:00
Automerger Merge Worker
0ab3bc967d Merge "Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd am: 071719856d" into tm-d1-dev-plus-aosp 2022-06-22 23:08:01 +00:00
Salud Lemus
26bdfebe0b Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd am: 7e3c6913d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542

Change-Id: I744f612059441079a6e5604de624536e3361e087
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 23:07:58 +00:00
Salud Lemus
77c8fc99fb Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd am: 071719856d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542

Change-Id: I9580fef4e972960b820154fabe8351028d549825
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 23:07:57 +00:00
Salud Lemus
d94e7fa411 Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd am: 86b967bcb8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542

Change-Id: I630067e486b9924b1ade9226bb1537249ec6378e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 23:07:20 +00:00
Salud Lemus
7e3c6913d3 Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542

Change-Id: I6237d72f20faa1961a5e7005244c8f0962bf891f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 22:49:19 +00:00
Salud Lemus
86b967bcb8 Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542

Change-Id: If1b6b8a739d597a4acebf6324eb952d339ae9072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 22:48:17 +00:00
Salud Lemus
071719856d Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542

Change-Id: I48ec660d0ac6aecd3a28368a3b2035dbfb6fe297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 22:47:52 +00:00
Salud Lemus
bb149294dd Merge "Fix title used for financed device info in Settings" into tm-dev 2022-06-22 22:33:18 +00:00
Automerger Merge Worker
ac681478ed Merge "Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 am: e941740b35" into tm-d1-dev-plus-aosp am: 0366a838e7 am: d0167dc315
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: I0c763c3ea1d5a3516f3763765888fd44660f9f5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 20:20:23 +00:00
Bonian Chen
fb6cc01734 Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 am: e9cdc176a6 am: a40112328c am: 16e47a83d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: Id581c368a343c5657ef325f2af06eaf09609d997
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 20:19:34 +00:00
Bonian Chen
47439fa4c9 Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 am: e941740b35 am: 67556fac04 am: c1bd6bc6e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: I1cc6513a2e86295b9547b03796e826c430a19cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 20:19:20 +00:00
Automerger Merge Worker
d0167dc315 Merge "Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 am: e941740b35" into tm-d1-dev-plus-aosp am: 0366a838e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: I96326d86cb4f19ef34ceb016b83ced02e2416ff2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 19:59:44 +00:00
Bonian Chen
16e47a83d1 Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 am: e9cdc176a6 am: a40112328c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: If1e5a7d0dbef973e634d214e99708b7797131feb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 19:59:34 +00:00
Bonian Chen
c1bd6bc6e3 Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 am: e941740b35 am: 67556fac04
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: I3aa2ebcdd16ff73296fbda1ce44441ba43bb4f39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 19:59:10 +00:00
Automerger Merge Worker
0366a838e7 Merge "Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 am: e941740b35" into tm-d1-dev-plus-aosp 2022-06-22 19:43:48 +00:00
Bonian Chen
fd99fa9354 Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 am: e941740b35
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: Ie72ff5a356830d2f5f60b306e39ffef6d29d0c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 19:43:41 +00:00
Bonian Chen
a40112328c Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 am: e9cdc176a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: I80200d5694abf84b7f540db8142b5f0f525cde49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 19:43:40 +00:00
Bonian Chen
67556fac04 Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 am: e941740b35
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: I8564a7c35b201d4a5022d9dcf2545a097822c4bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 19:43:37 +00:00
Bonian Chen
6656965314 Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 am: d1e0f81da1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: I5d1266fc05ca1c7ab3fae2f11980e1a18d8d506b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 19:42:58 +00:00
Bonian Chen
e941740b35 Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: I8c39ef8a089394c52b5a80ea98fa77f2ab0f2ab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 19:25:48 +00:00
Bonian Chen
d1e0f81da1 Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: I0913549f6c94ddb994092377f2be48d3e7641d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 19:24:43 +00:00
Bonian Chen
e9cdc176a6 Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: I8391c6e89654e3595a496de6da4485f27834bfda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 19:24:20 +00:00