Chaohui Wang
3a99f7c370
Fix flicker for AppDataUsagePreference
...
AppDataUsagePreference's title is sometime async loading, which cause
preference height change, which lead to page flicker.
Set a title placeholder before async loading to reduce flicker.
Fix: 187019210
Test: manual visual test
Change-Id: I26df832ab03a04641fd3d6eb678903ff3fe8820a
2022-05-26 17:36:45 +08:00
TreeHugger Robot
2a83136398
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 12a30b9511 -s ours am: 7ab31e744a -s ours am: a60e8c0f03 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397897
Change-Id: Iebe568df9753210598b5f7d2138c0f059c23e129
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-26 08:53:55 +00:00
Bill Yi
4de10215ec
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d941a36042 -s ours am: 900e78b59d -s ours am: 74bc2e20e4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397897
Change-Id: Id069527454707fd5a69cbe211a842238e36c68a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-26 08:53:39 +00:00
Bill Yi
7054b123ef
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c8b7a9fe8 -s ours am: 66ad02c375 -s ours am: 04f012f755 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397896
Change-Id: I68fbfe959ec250271a43fcbbc253b242edfec7b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-26 08:53:25 +00:00
Bill Yi
767f523875
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4cf0235db1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18425266
Change-Id: I3e867df55e5a6e8eddfe63e7cb934d73dcd6f9fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-26 08:50:22 +00:00
TreeHugger Robot
09023f0125
Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec am: 472d540799
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599
Change-Id: I634ef31fab033dd75c78eede976cac7a297b2ab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-26 08:45:21 +00:00
Arc Wang
46cbfd9ca1
Fix Settings crash when setting a null ringtone am: ec3ae8bb17 am: 7b14f3130c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18400413
Change-Id: I371c69d46326485f8219a06d83160a1ba5df1269
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-26 08:45:12 +00:00
TreeHugger Robot
99a9857e7f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 673ba1d114 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18396758
Change-Id: I0f49cfe2ea047ac5ef3f64fac549ae999be3405a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-26 07:54:41 +00:00
Bill Yi
9c7309a89b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3634c0bac5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18396758
Change-Id: I64fe442ad620f62cc2149693262a642e9ab09d7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-26 07:54:26 +00:00
Xupei Li
05301c7d1a
Settings: Change array resource sim_color_light to an integer array
...
* It should be an integer array because its items are all color reference, and I found that the translations of this resource can lead to not show SIM color in languages other than English.
Change-Id: I6264abdfd0a49119e0170ae5c4bec437ad4c9e8f
2022-05-26 07:17:58 +00:00
Hank Sheng
bdda48ebe5
Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4.
...
screen shot:
https://hsv.googleplex.com/5487921525161984
https://hsv.googleplex.com/4853914928152576
https://hsv.googleplex.com/6492643191160832
https://hsv.googleplex.com/5915886260060160
https://hsv.googleplex.com/6321050657751040
https://hsv.googleplex.com/6222016362315776
Bug: 233036258
Bug: 233032365
Change-Id: If2bb4a82912bfdd18dc17ced11adc59eaf474bed
2022-05-26 07:17:36 +00:00
Amy Hsu
ea858a6afc
[ScreenResolutionController] UI string update
...
Bug: b/230626771
Test: Check the string manually
Change-Id: Ic5c8ed146297bf1672e18e078aa8389738584cfb
2022-05-26 11:33:52 +08:00
SongFerngWang
948f512098
Changing the condition since the esim may be removable
...
The condition whether the slot is esim slot should use getIsEuicc
api since the esim may be removable.
Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: I47dc068e57a0faa7f7ce85af7933a48caa2c93e4
2022-05-26 10:54:39 +08:00
Automerger Merge Worker
bbc66f248d
Merge changes from topic "am-b26f2cb44c53490f868637cd5d96ec61" into tm-d1-dev-plus-aosp am: 9c9743a464 am: b81192f261
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095
Change-Id: Id17bb16746c445bc6efacf33756e81e1d46f84a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 20:46:58 +00:00
Bill Yi
a7dd5214db
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours am: 6096b86e1a -s ours am: 2366eddc23 -s ours am: 83f7a4775c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095
Change-Id: If623bc002056e6056df393e2b1905528c787e2b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 20:46:41 +00:00
Automerger Merge Worker
cdec79473f
Merge changes from topic "am-1f81d4e1bbf440c4b1a2b336aefd3506" into tm-qpr-dev-plus-aosp am: 35b5383b73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095
Change-Id: Ia92c4485d8b39cd69eb5818ebf3c6b5a3eafde7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 20:44:00 +00:00
Bill Yi
467fee39c7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours am: 6096b86e1a -s ours am: e75601afb3 -s ours am: 84f44060f6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095
Change-Id: I3fbd9270b609dcc10c73f0260a0d3511b9b51953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 20:43:17 +00:00
Bill Yi
bf00bb238a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours am: 7cbd699752 -s ours am: 39208432c2 -s ours am: bcb0120461 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095
Change-Id: I353ea85ed0a84ced8d79e26d0964c716add2cd7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 20:36:14 +00:00
Bill Yi
bc1ac025e5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543 -s ours am: 142b69b865 -s ours am: 8c834259b1 -s ours am: 8b5d3ce26d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095
Change-Id: I1af31b6fda5fba07fc6ce592ff8663ea751f2a17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 20:36:08 +00:00
Bill Yi
af6197baf3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f4cb74b97a -s ours am: d3f6a2192f -s ours am: 5ad0301bbe -s ours am: 58114edf1c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586094
Change-Id: I47230e05cfd2af7037f15259e723604634b0d721
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 20:35:54 +00:00
Bill Yi
95a0827347
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb -s ours am: a34af9b081 -s ours am: 6ea19fdbb7 -s ours am: c8733029be -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586094
Change-Id: Ideef1e8725541cb1479249b8fdeea5bd4bcbb06b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 20:35:38 +00:00
Automerger Merge Worker
b81192f261
Merge changes from topic "am-b26f2cb44c53490f868637cd5d96ec61" into tm-d1-dev-plus-aosp am: 9c9743a464
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095
Change-Id: Icae4749c2f427be2d2021f6bf91666e3f383fe5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 20:15:03 +00:00
Bill Yi
83f7a4775c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours am: 6096b86e1a -s ours am: 2366eddc23 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095
Change-Id: I8874e336869963ed7df2f809f7b7abcb1d88cd5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 20:14:46 +00:00
Automerger Merge Worker
35b5383b73
Merge changes from topic "am-1f81d4e1bbf440c4b1a2b336aefd3506" into tm-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c5266096b86e1ae75601afb3fdcf407543c99eb8761302cc0fd744f4cb74b97af344101fdb760d7ac4f9cec4bd47cb9b4e0f0e67c43c833edf
2022-05-25 20:13:08 +00:00
Bill Yi
bcb0120461
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours am: 7cbd699752 -s ours am: 39208432c2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095
Change-Id: Id96e98dacec28faa26423f50090a26f5c2d47f0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 20:11:38 +00:00
Bill Yi
8b5d3ce26d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543 -s ours am: 142b69b865 -s ours am: 8c834259b1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095
Change-Id: I4968ce85dee29dfc15e3ce95e83ca9fcf5fa8487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 20:11:29 +00:00
Bill Yi
58114edf1c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f4cb74b97a -s ours am: d3f6a2192f -s ours am: 5ad0301bbe -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586094
Change-Id: Ibdbb8911a9c51f902c73525a7d269693827fb044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 20:11:14 +00:00
Bill Yi
c8733029be
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb -s ours am: a34af9b081 -s ours am: 6ea19fdbb7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586094
Change-Id: I100af5841f318de3facae67f92e75e2807a8b1f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 20:11:01 +00:00
Bill Yi
84f44060f6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours am: 6096b86e1a -s ours am: e75601afb3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095
Change-Id: I046dcbb1bab517744e8f9055a4df8d5c0aeb6b9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 20:10:56 +00:00
Bill Yi
fea99348e5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543 -s ours am: c99eb87613 -s ours am: 02cc0fd744 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095
Change-Id: If0a8ed8542da07c974a802d45d04e1c248cecc94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 20:10:49 +00:00
Bill Yi
b7826379d5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f4cb74b97a -s ours am: f344101fdb -s ours am: 760d7ac4f9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586094
Change-Id: I251762dc4bb76486732eeb235008da638b6a9253
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 20:10:37 +00:00
Bill Yi
53a7d4e8dc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb -s ours am: 9b4e0f0e67 -s ours am: c43c833edf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586094
Change-Id: I995bdf5371d1bb060bacb9cb7710850c2c473903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 20:10:19 +00:00
Automerger Merge Worker
9c9743a464
Merge changes from topic "am-b26f2cb44c53490f868637cd5d96ec61" into tm-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c5266096b86e1afdcf407543c99eb87613f4cb74b97af344101fdbcec4bd47cb9b4e0f0e67
2022-05-25 19:42:31 +00:00
Bill Yi
2366eddc23
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours am: 6096b86e1a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095
Change-Id: Icaa1f51c35fe27d1ed726f0802626fd4b38506be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:41:26 +00:00
Bill Yi
39208432c2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours am: 7cbd699752 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095
Change-Id: Iadc2b45a431c1499cfc943cc857db724a19e7475
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:41:22 +00:00
Bill Yi
76edd87fdc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543 -s ours am: c99eb87613 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095
Change-Id: I8a7f970657f3fef91be916632f5f2f587ddce09f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:41:20 +00:00
Bill Yi
8c834259b1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543 -s ours am: 142b69b865 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095
Change-Id: I5cad8be02796e43c1de7871986d76a689aa44c3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:41:14 +00:00
Bill Yi
ef3cb063fa
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f4cb74b97a -s ours am: f344101fdb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586094
Change-Id: I1ef436fe88994dc48a334df7c7482e1311bc7db3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:41:06 +00:00
Bill Yi
e75601afb3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours am: 6096b86e1a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095
Change-Id: I6044a0d84d82198846a20eb10033f221bc2a2a4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:41:02 +00:00
Bill Yi
5ad0301bbe
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f4cb74b97a -s ours am: d3f6a2192f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586094
Change-Id: I5f68df574588c168b697e0e3b9b241fc97dac49f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:41:01 +00:00
Bill Yi
02cc0fd744
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543 -s ours am: c99eb87613 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095
Change-Id: Id204adb945516f0b2bf9b32eef511d41f39987e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:40:55 +00:00
Bill Yi
acfd4d92c9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb -s ours am: 9b4e0f0e67 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586094
Change-Id: Ib7230fd9451b056a31af46917b357d9d89669625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:40:48 +00:00
Bill Yi
6ea19fdbb7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb -s ours am: a34af9b081 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586094
Change-Id: I08a136382c3273d0039f2df0c52065a6b4ff4ce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:40:42 +00:00
Bill Yi
760d7ac4f9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f4cb74b97a -s ours am: f344101fdb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586094
Change-Id: Ifbe06f18f6da7b3e12066d72f214c64e84ea33ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:40:41 +00:00
Bill Yi
c43c833edf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb -s ours am: 9b4e0f0e67 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586094
Change-Id: I8000753c531331ff9b855f211e5154c8bcd5cb26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:40:24 +00:00
Bill Yi
4a3e1660a7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095
Change-Id: I125cda42ad8ef06d29a068ab174084b978ba5b0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:08:09 +00:00
Bill Yi
7cbd699752
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095
Change-Id: Icac35db797bfdf2230c03a8c08b2bdd978fdb8f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:08:09 +00:00
Bill Yi
35d85132c1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095
Change-Id: I6e2debbface4a6c8701d4d9bba3d9a572e1b063f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:08:01 +00:00
Bill Yi
142b69b865
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095
Change-Id: Ia539c2739edc240bccd6d45523972017bbd3cb40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:07:48 +00:00
Bill Yi
13f2373302
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f4cb74b97a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586094
Change-Id: Ic4ec57d7ca20618c9a6a1e46a3f3822a66e87e7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:07:45 +00:00
