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
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
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
d3f6a2192f
[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: Ic04a2921b42cbf5292bdbb9d500257ac9f99ea52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:07:32 +00:00
Bill Yi
a34af9b081
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb
-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: Ie822ccdbcab2f1bf46980f59847bf3d2e9320250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:07:22 +00:00
Bill Yi
6096b86e1a
[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: I909d66a4cb1412a9e924996fab95e63727a3acb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:06:43 +00:00
Bill Yi
c99eb87613
[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: I734c6876008c4eb19d6e7867b3bfe9ec5c56c4cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:06:26 +00:00
Bill Yi
f344101fdb
[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: I611a79eded17b14ff32f4e80df239a70e6eb0f86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:06:13 +00:00
Bill Yi
9b4e0f0e67
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb
-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: I5c7cec9a49b35cd390c817a66221921095cdbdc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:05:54 +00:00
Bill Yi
b91e43c526
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-25 18:43:37 +00:00
Bill Yi
f4cb74b97a
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-25 18:43:37 +00:00
Automerger Merge Worker
98f79c7d38
Merge "Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec524
am: 0d415d7cc6" into tm-d1-dev-plus-aosp am: 5c1527a95d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475672
Change-Id: I71a38b0e296574911e16d72059677a3aee177a4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 15:22:39 +00:00
Chaohui Wang
bf6378efd2
Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec524
am: 6c2ffc2220
am: 19847e69e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475672
Change-Id: I264b1d83695329767f6738c7f2cb4ce28c197d2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 15:22:29 +00:00
Chaohui Wang
a64429b8e8
Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec524
am: 6c2ffc2220
am: 447f77c07d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475672
Change-Id: Id2ae29ea35605664ecd672efe67252ecf3848924
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 15:22:16 +00:00
Automerger Merge Worker
5c1527a95d
Merge "Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec524
am: 0d415d7cc6" into tm-d1-dev-plus-aosp
2022-05-25 15:06:55 +00:00
Chaohui Wang
658fe24a7e
Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec524
am: 0d415d7cc6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475672
Change-Id: I2f3f42147c3bab3b43f412f972f983ba978158fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 15:06:50 +00:00
Chaohui Wang
447f77c07d
Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec524
am: 6c2ffc2220
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475672
Change-Id: I572044e99da299f73635c6a6008b376bfdca2fed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 15:06:49 +00:00
Chaohui Wang
19847e69e3
Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec524
am: 6c2ffc2220
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475672
Change-Id: I5f042630f55ff9f7697f976007b6c402fd7093bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 15:06:49 +00:00
Chaohui Wang
6c2ffc2220
Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec524
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475672
Change-Id: Ic7dfd8258e5c2d0475d8365a3a4d740dc0f5baf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 14:49:37 +00:00
Chaohui Wang
0d415d7cc6
Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec524
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475672
Change-Id: Icdfbe0d9c4dae5cc561c65c01b01414611fa9783
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 14:48:03 +00:00
Chaohui Wang
7dc1aec524
Merge "Fix Conversation page flickers" into tm-dev
2022-05-25 14:28:43 +00:00
Chaohui Wang
2b99ec0e01
Merge "Fix SeekBarPreference selectable test" into tm-dev am: 02314870c7
am: 1484d1a472
am: f80dea5100
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18578961
Change-Id: I911993a05f0240d1d2eb4bb3301b821d92349e8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 11:52:59 +00:00
Chaohui Wang
1ef0a195ba
Merge "Fix SeekBarPreference selectable test" into tm-dev am: 02314870c7
am: 39bd94e1e5
am: 4b8e64c294
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18578961
Change-Id: I879dcf863993c0eb28b06a7205457ec8842011be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 11:52:52 +00:00
Chaohui Wang
be86a0934d
Merge "Fix SeekBarPreference selectable test" into tm-dev am: 02314870c7
am: 1484d1a472
am: afe4e239ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18578961
Change-Id: Ic2ca28fd2a3d2b0fdd26fc3f39ae00c52e8083c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 11:52:29 +00:00
Chaohui Wang
f80dea5100
Merge "Fix SeekBarPreference selectable test" into tm-dev am: 02314870c7
am: 1484d1a472
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18578961
Change-Id: I7021751fd71a049046dd9980d0b3cc50c84cfcde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 11:35:27 +00:00
Chaohui Wang
afe4e239ff
Merge "Fix SeekBarPreference selectable test" into tm-dev am: 02314870c7
am: 1484d1a472
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18578961
Change-Id: Iad5922b6dc3be89883a2f2281bdda29fd16ac776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 11:35:24 +00:00
Chaohui Wang
4b8e64c294
Merge "Fix SeekBarPreference selectable test" into tm-dev am: 02314870c7
am: 39bd94e1e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18578961
Change-Id: Ie8392d6d732af7c1197d3cd5ab76900cca836c80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 11:26:53 +00:00
Chaohui Wang
1484d1a472
Merge "Fix SeekBarPreference selectable test" into tm-dev am: 02314870c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18578961
Change-Id: I51c7156ffdeaecd55464be761cb8d62203e8655d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 11:09:01 +00:00
Chaohui Wang
39bd94e1e5
Merge "Fix SeekBarPreference selectable test" into tm-dev am: 02314870c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18578961
Change-Id: I4c87be62cf59f3fea0c17c3fb6f5564b0cfa75e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 11:07:31 +00:00
Chaohui Wang
02314870c7
Merge "Fix SeekBarPreference selectable test" into tm-dev
2022-05-25 10:50:48 +00:00
Automerger Merge Worker
d4a87480fe
Merge "Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f8135959
am: 1e410610d8" into tm-d1-dev-plus-aosp am: 934a230278
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18591472
Change-Id: I664d73ee0d1672ef8ab9ee6c549cf9f7ce9f5590
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 10:08:37 +00:00
Chaohui Wang
741e3eaeff
Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f8135959
am: 635c506a92
am: 79351944b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18591472
Change-Id: If9af6f0ff170550845b9380b14cd2064f1c885b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 10:08:02 +00:00
Chaohui Wang
6c4476b59f
Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f8135959
am: 635c506a92
am: 52a4269f9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18591472
Change-Id: Ia81eeb1da4efd3ce5460907e3b2084bd9c9f3894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 10:07:30 +00:00
Automerger Merge Worker
934a230278
Merge "Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f8135959
am: 1e410610d8" into tm-d1-dev-plus-aosp
2022-05-25 09:50:04 +00:00
Chaohui Wang
52a4269f9a
Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f8135959
am: 635c506a92
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18591472
Change-Id: Id9e665a5efb61b8baa60dce4c2fcaf5703d6897c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 09:49:59 +00:00
Chaohui Wang
79351944b8
Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f8135959
am: 635c506a92
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18591472
Change-Id: I804b3ccb98427f3104086a7b237913aba4011bd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 09:49:59 +00:00
Chaohui Wang
3374e43ff7
Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f8135959
am: 1e410610d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18591472
Change-Id: I4d6613dc32980d8958191cd0aa128716430ca407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 09:49:59 +00:00
Chaohui Wang
635c506a92
Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f8135959
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18591472
Change-Id: Id62102e910aa81346a986551244fb689c74aa0cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 09:32:46 +00:00
Chaohui Wang
1e410610d8
Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f8135959
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18591472
Change-Id: I6a8942f58c25a773719f4db05a6d44b50a491ccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 09:31:14 +00:00
Chaohui Wang
87f8135959
Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev
2022-05-25 09:13:44 +00:00
Chaohui Wang
968f30a470
Fix SeekBarPreference selectable test
...
SeekBarPreference is set to unselectable in change
Ie5d819088dc3c435005ddd00e232b2f6992b234a
Update the test accordingly.
Bug: 230553896
Test: robotest
Change-Id: Ia024b81e3f8e3808b0bb1e48c41a84d0ececaa85
2022-05-25 16:58:08 +08:00
Weng Su
75daa00951
Merge "Refine carrier Wi-Fi functions" into tm-dev am: 750376ec40
am: 676498649e
am: 410f9d3e6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18558087
Change-Id: Ifbdbc474c222d003c4d12624c9e55dbccbce4ac1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 08:47:00 +00:00
Weng Su
1817b58887
Merge "Refine carrier Wi-Fi functions" into tm-dev am: 750376ec40
am: 395c675770
am: 3146d2259d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18558087
Change-Id: I1993f23652ccdc5f5fc11613971799fb1932e790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 08:46:23 +00:00
Weng Su
25a3f4177c
Merge "Refine carrier Wi-Fi functions" into tm-dev am: 750376ec40
am: 676498649e
am: 42b9b5dcb4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18558087
Change-Id: I4b28504100bf37eba2716b8b8c5a356d98c8481d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 08:46:03 +00:00
Weng Su
42b9b5dcb4
Merge "Refine carrier Wi-Fi functions" into tm-dev am: 750376ec40
am: 676498649e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18558087
Change-Id: I1c9d689766db4e15c2076eec53546aa16c3c5e4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 08:30:19 +00:00