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
Bill Yi
4fcb08305a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3fa9ddd1fa5829250d7c4fe695278c383c5c91ea
2022-05-26 18:23:46 -07:00
Bill Yi
691a40febf
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0bd127ef78f1a645fa229cf1c55e26039ff2e58b
2022-05-26 18:20:56 -07:00
Bill Yi
a57110676f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie7180d50bbb0647e8901d834cda9df4379873017
2022-05-26 18:17:25 -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
Amy Hsu
bfaf38ccb9
Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: eca20b0820
am: 7af580d08b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603826
Change-Id: I8baddc41e02614de807e48614c06d6d862cf6dea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 00:53:24 +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
7af580d08b
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: I74384b25ead713af83acc06434d57ae3214739fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 00:39:16 +00:00
Amy Hsu
eca20b0820
Merge "[ScreenResolutionController] UI string update" into tm-d1-dev
2022-05-27 00:17:19 +00:00
Lin Yuan
fcae147f58
Fix: policy enforcement for location wifi scanning
...
Make DISALLOW_CONFIG_LOCATION effectively disallow wifi scanning and
bluetooth scanning settings for location services.
screenshots: http://shortn/_EUOdqrOcnS , http://shortn/_j320QDm1Zo
Bug: 228315522
Bug: 228315529
Test: atest SettingsRoboTests, on device
Change-Id: I78291579a79e915a27ebdd051b3caf3fc04efc41
2022-05-26 19:38:07 -04:00
Tom Hsu
2a8ee8005b
Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3
am: 90875efc90
am: 1db2f02c9e
am: 7b0a3f2080
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834
Change-Id: Id20940ae94c871e13066769b96c25161e54f422d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-26 17:14:49 +00:00
Tom Hsu
ac755c2ee0
Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3
am: 806582197e
am: 448ca95a7a
am: 8feed45265
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834
Change-Id: I994fae4155c101c1fab7c5d7a8a3d29abcc6b17c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-26 17:14:40 +00:00
Tom Hsu
05774d7d17
Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3
am: 806582197e
am: 019d251814
am: c421f73232
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834
Change-Id: I128d5a757c37f225ee7b3a4362b2ec9beea65fc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-26 17:12:55 +00:00
Tom Hsu
7b0a3f2080
Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3
am: 90875efc90
am: 1db2f02c9e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834
Change-Id: Icd797bfb567df5c5be7627ccdfaf6c1928cd8c45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-26 16:40:57 +00:00
Tom Hsu
8feed45265
Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3
am: 806582197e
am: 448ca95a7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834
Change-Id: I59a3c4f57061b1395e24be2057747db67a59b5a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-26 16:39:35 +00:00
Tom Hsu
c421f73232
Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3
am: 806582197e
am: 019d251814
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834
Change-Id: I73a3179f80439761e4af8e1b637d7d9b4341e55d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-26 16:39:20 +00:00
Tom Hsu
c6b8c119d9
Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3
am: b7643967fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834
Change-Id: I2ea2d9841210c250215b521639f200d8a46692b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-26 16:18:37 +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