Hank Sheng
|
3e3978ce80
|
Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa am: 0c8e9b6510
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898
Change-Id: I4f7589d5d38f61098468d37ad242b73f8af796c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 05:48:36 +00:00 |
|
Chaohui Wang
|
f9bfc59281
|
Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4 am: 4bcaccf8d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945
Change-Id: I1333dc9c30937b37a397138e69147e1b88286fd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 05:48:01 +00:00 |
|
Hank Sheng
|
0c8e9b6510
|
Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898
Change-Id: Id4abc52bcccaec23a580f757b345c7d763ed1a3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 05:46:43 +00:00 |
|
Hank Sheng
|
3dfcc708aa
|
Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev
|
2022-05-27 05:32:47 +00:00 |
|
Chaohui Wang
|
4bcaccf8d3
|
Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945
Change-Id: Ic1dcc095cf52be3495a4d4863d27fed25157c068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 05:24:54 +00:00 |
|
Chaohui Wang
|
bc2e0f5fc4
|
Merge "Fix unable to toggle off Pause app activity" into tm-dev
|
2022-05-27 04:59:46 +00:00 |
|
Amy Hsu
|
2897d2fa42
|
Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: eca20b0820
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603826
Change-Id: Id18e737daee4dd59b79662ac1b23ca114e0af275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 00:39:20 +00:00 |
|
Amy Hsu
|
eca20b0820
|
Merge "[ScreenResolutionController] UI string update" into tm-d1-dev
|
2022-05-27 00:17:19 +00:00 |
|
Tom Hsu
|
1db2f02c9e
|
Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 90875efc90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834
Change-Id: I045ded0a1212e4baf53f4fd5577d072e70798387
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-26 16:08:58 +00:00 |
|
Tom Hsu
|
448ca95a7a
|
Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 806582197e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834
Change-Id: I5c427bb1620b6f31657524c944c0ab01fc33452a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-26 16:07:39 +00:00 |
|
Tom Hsu
|
806582197e
|
Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834
Change-Id: I56919305722783a24bd68c0e378cc1d272a6f2aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-26 15:41:44 +00:00 |
|
Tom Hsu
|
90875efc90
|
Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834
Change-Id: I3c6ddf5ca206114fa677a06a7086fa0eb75b0752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-26 15:40:10 +00:00 |
|
Tom Hsu
|
f6ea9c99b3
|
Merge "Fix wrong summary string show on the network page." into tm-dev
|
2022-05-26 15:06:00 +00:00 |
|
tom hsu
|
d793e9512d
|
Fix wrong summary string show on the network page.
Bug: 206742805
Test: local test, see b/206742805#4
Change-Id: I4fa9468e4f3b7d3671e383d3203b67636daa416c
|
2022-05-26 17:41:13 +08: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 |
|
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: b91e43c526 -s ours am: 6096b86e1a -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543 -s ours am: c99eb87613 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f4cb74b97a -s ours am: f344101fdb -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb -s ours am: 9b4e0f0e67 -s ours
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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 |
|