SongFerng Wang
f93d0c2bc8
Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f
am: 15c33001a2
am: af87b62083
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901
Change-Id: I3ff05011bc5157f82317ab70ba768742bad287a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 07:09:42 +00:00
Automerger Merge Worker
35f2cf8104
Merge "Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f
am: 968da5c582" into tm-d1-dev-plus-aosp
2022-05-27 06:55:47 +00:00
SongFerng Wang
6b3b355975
Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f
am: 15c33001a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901
Change-Id: Id41eb349f1edf18d7f964b99e0887b12edc16620
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 06:55:42 +00:00
SongFerng Wang
af87b62083
Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f
am: 15c33001a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901
Change-Id: I8bbfbd514c1c667134c3d798e477ea6d3e87faa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 06:55:41 +00:00
SongFerng Wang
a3d8337609
Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f
am: 968da5c582
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901
Change-Id: I5cc24a8c9aa23886ed740d08f7adc01c22e0753f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 06:55:41 +00:00
SongFerng Wang
8dd4a64a93
Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f
am: b0cc0e28b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901
Change-Id: I257bc3c80a6104879ba1558b45403e2829e94e81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 06:55:11 +00:00
SongFerng Wang
15c33001a2
Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901
Change-Id: If3afab7ab294f3ce2836f96c12ba1d95dd82fbb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 06:41:11 +00:00
SongFerng Wang
b0cc0e28b3
Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901
Change-Id: I0ab12aafae1ade31f5a2eb0202e0a4ac2d4a3848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 06:40:15 +00:00
SongFerng Wang
968da5c582
Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901
Change-Id: Idbd1cd2b051e08b2a284c98f2343ce6acfe3a2ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 06:39:48 +00:00
Hank Sheng
7aa279a7e8
Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa
am: 349b36bb91
am: aa3a9c683a
am: 58a24a1dde
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898
Change-Id: I90b2c15d71b53f66e8de33c07710c8b72d6472e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 06:27:56 +00:00
Chaohui Wang
774b6a6d69
Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4
am: caabb4fe49
am: bf0d192521
am: a49de8d0e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945
Change-Id: I505e8cf8b44c670a887690e270575a2e5c71286f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 06:27:45 +00:00
SongFerng Wang
2afe0d6f1c
Merge "Settings: Change array resource sim_color_light to an integer array" am: ed0f3c60ec
am: 1ab90f4640
am: fc01fb0302
am: 1e24552f7f
am: d2764c5fc9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2081598
Change-Id: I40887f5a18dbe267ebac6be8dbcadda32c6cbb50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 06:27:15 +00:00
Hank Sheng
ed533aac62
Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa
am: 0c8e9b6510
am: 3e3978ce80
am: 4416e10893
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898
Change-Id: Ic68c2f9fd68452c30c2002e65845259889c1ec52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 06:26:49 +00:00
Chaohui Wang
f383ae38ab
Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4
am: 4bcaccf8d3
am: f9bfc59281
am: d7602563d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945
Change-Id: I2f31a63edd1480a6c2d9dd372c5f745a95283d6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 06:26:25 +00:00
Hank Sheng
1fd45b4563
Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa
am: 349b36bb91
am: 55e4e5d0e3
am: 73f37d3f3a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898
Change-Id: Ice4455e30a69d1ca9d8147932974729949fd7a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 06:25:58 +00:00
Chaohui Wang
7559e9e165
Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4
am: caabb4fe49
am: 6737a44fba
am: 60dbbc5f9d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945
Change-Id: I30882573320020d06b2b1f5d769b091520a68350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 06:25:31 +00:00
SongFerng Wang
fa5407c60f
Merge "Changing the condition since the esim may be removable" into tm-dev
2022-05-27 06:23:16 +00:00
Hank Sheng
58a24a1dde
Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa
am: 349b36bb91
am: aa3a9c683a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898
Change-Id: I50b6600cb5753b4f7bcb5edcc290549f3bc770fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 06:04:56 +00:00
Chaohui Wang
a49de8d0e3
Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4
am: caabb4fe49
am: bf0d192521
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945
Change-Id: I2f7a0a2ee6b1497a77537371bc906d8570fcf640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 06:04:49 +00:00
SongFerng Wang
d2764c5fc9
Merge "Settings: Change array resource sim_color_light to an integer array" am: ed0f3c60ec
am: 1ab90f4640
am: fc01fb0302
am: 1e24552f7f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2081598
Change-Id: If2d30aa57a49ac4e44c9e591239d901865b93d8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 06:04:42 +00:00
Hank Sheng
4416e10893
Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa
am: 0c8e9b6510
am: 3e3978ce80
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898
Change-Id: Ia04d47880b00aa7ec660807064796b34a60f152a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 06:03:53 +00:00
Chaohui Wang
d7602563d7
Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4
am: 4bcaccf8d3
am: f9bfc59281
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945
Change-Id: Idb6e33583b8f6de96887a3a0fef489b91570c17f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 06:03:32 +00:00
Hank Sheng
73f37d3f3a
Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa
am: 349b36bb91
am: 55e4e5d0e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898
Change-Id: I41379defe421d7b41dee13b88a2b67bca951f6d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 06:03:25 +00:00
Chaohui Wang
60dbbc5f9d
Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4
am: caabb4fe49
am: 6737a44fba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945
Change-Id: Ib28e234c5b048342bd40a1c5c29cc301de540b2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 06:03:17 +00:00
Hank Sheng
aa3a9c683a
Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa
am: 349b36bb91
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898
Change-Id: Icfff8b1937f72b2e58b697ebed4a939581c6672b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 05:50:28 +00:00
Chaohui Wang
bf0d192521
Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4
am: caabb4fe49
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945
Change-Id: If119cd32eb67b3b2868b568cee9887e0c6f5dd5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 05:49:57 +00:00
Hank Sheng
55e4e5d0e3
Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa
am: 349b36bb91
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898
Change-Id: Ifcef39885b565fbbdc950fe43c6b26d57e2bdcfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 05:48:57 +00:00
SongFerng Wang
1e24552f7f
Merge "Settings: Change array resource sim_color_light to an integer array" am: ed0f3c60ec
am: 1ab90f4640
am: fc01fb0302
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2081598
Change-Id: I0bfe1fbd118a1b7cb66eca0efee0f220277b3131
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 05:48:48 +00:00
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
6737a44fba
Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4
am: caabb4fe49
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945
Change-Id: I97d75ae94ed28e05698b516ef7e43d6c638c2b7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 05:48:18 +00:00
Hank Sheng
148c202c0f
Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa
am: 912366df5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898
Change-Id: Icb65e65fff87c810ffed9b003ab42acf3d773b52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 05:48:12 +00:00
Hank Sheng
349b36bb91
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: Id2d1766f508dd02f8412131c25f12f82d92a3833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 05:48:03 +00:00
SongFerng Wang
fc01fb0302
Merge "Settings: Change array resource sim_color_light to an integer array" am: ed0f3c60ec
am: 1ab90f4640
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2081598
Change-Id: Id9745becd41d7b74946bc57d07402e7c503dd9cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 05:48:01 +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
Chaohui Wang
dd2e6e88c6
Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4
am: 0580fb0d67
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945
Change-Id: Id82a3df97f16a5e10baf96cf636888a57405e1d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 05:47:28 +00:00
Hank Sheng
912366df5a
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: I8574008d24b8fb522fe975565ef1f14023306cd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 05:47:06 +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
SongFerng Wang
1ab90f4640
Merge "Settings: Change array resource sim_color_light to an integer array" am: ed0f3c60ec
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2081598
Change-Id: I308ab424ad1acf881c0106de1007393e7bf0bff1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 05:32:46 +00:00
Chaohui Wang
caabb4fe49
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: I348919ec56e2f4ba3a28db987b205cddeb44463a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 05:26:26 +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
0580fb0d67
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: Ie0f17561fa78044cf1dedf24f49d4b7123c4b068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 05:24:53 +00:00
SongFerng Wang
ed0f3c60ec
Merge "Settings: Change array resource sim_color_light to an integer array"
2022-05-27 05:12:32 +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
changbetty
012527b81c
Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT
...
Bug: 214338905
Test: Manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=QrCameraTest
Change-Id: I1ca3e9e0b2cdc9fd3f32da8c5329c0e887ee3427
Merged-In: I1ca3e9e0b2cdc9fd3f32da8c5329c0e887ee3427
2022-05-27 04:05:44 +00:00
Chaohui Wang
c2dacf1b75
Fix flicker for AppDataUsage when zero usage
...
When the page is entered from the AppInfoDashboardFragment, there is no
way to know whether the cycle data is available before finished the
async loading. If it's zero usage, the cycle spinner will be removed,
which cause a flicker.
Temporarily disable the preference list's animator before initial
page updates can solve this issue.
This also fix another flicker on this page when the background data is
off.
Fix: 233963355
Test: manual visual test
Change-Id: I795ed95e15bb3216fa17adfd4f57faf5fd92fa00
2022-05-27 10:21:17 +08:00
Bill Yi
ff457d8594
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib80c2408db28e4aa45a04109220fc2419fa82a5b
2022-05-26 18:27:20 -07:00
Amy Hsu
9f2615641f
Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: eca20b0820
am: 2897d2fa42
am: f120b2ef67
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603826
Change-Id: I5897829d9d3304a059e1396c3360a0a8c2be7f8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 01:16:45 +00:00
Amy Hsu
e7c009fa8e
Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: eca20b0820
am: 7af580d08b
am: bfaf38ccb9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603826
Change-Id: Ic4fc275bc7bf813a88fb6562fe0600b08c60f345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 01:16:25 +00:00
Amy Hsu
f120b2ef67
Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: eca20b0820
am: 2897d2fa42
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603826
Change-Id: I8835f94dceded1d6f17131264e8555fe7bf684f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 00:53:41 +00:00