Commit Graph

108938 Commits

Author SHA1 Message Date
TreeHugger Robot
9701c991ee Merge "Revert "Show previous query upon configuration change"" into tm-dev am: fea570f524 am: 4ffd6caf54 am: 420b448fd1 am: 8329fa64cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486386

Change-Id: I0f7a0d1c0e8e69bf0849fc3105c15018a05d6449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:56:58 +00:00
TreeHugger Robot
00ef8da5f4 Merge "Show mobile data icon with carrier Wi-Fi level in Settings" into tm-dev am: f16c90f91d am: dd1ad333a8 am: 2b09ae4f4e am: facd82dd9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18467044

Change-Id: I897e405bb5874ec8d3f956d9bf312a3e8c924f8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:55:49 +00:00
Calvin Pan
5b62cb1224 Merge "Avoid getting app locale config for each app" into tm-dev am: 9d6cf4255d am: 977c6316a8 am: a33cc3f07a am: b2cfdba385
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18456663

Change-Id: I0b9c57f8afdb9faf5061f8da7c1bd980fb05cf19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:51:24 +00:00
Chaohui Wang
93caad3b02 Merge "Add the jank detection to Settings toggles" into tm-dev am: a47f9bb17f am: ca86110548 am: 29a1747a91 am: f5ca0131eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18212942

Change-Id: I9c3b5851e7217a9fb2a5c296eeb47dcc85e6d0b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:46:12 +00:00
Chaohui Wang
2cf9780748 Merge "Add the jank detection to Settings toggles" into tm-dev am: a47f9bb17f am: ca86110548 am: c41f9a953a am: 0f1658d013
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18212942

Change-Id: I298b0de2dcfe6a914cb74bc9947bd5780a48cca5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:44:18 +00:00
TreeHugger Robot
f36aed9286 Merge "Fix the work profile's deep link problem" into tm-dev am: 2b9dd10fa5 am: 9bfff8cb94 am: bcc628c7f3 am: 4b42121489
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482928

Change-Id: Iea278e869233204caa9fbeeefa9103a05e18eec2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:30:35 +00:00
SongFerngWang
1330edfa78 The settings crash when it add the RTL mark on MEP message am: 7de5f99847 am: ee2536f3f5 am: 118641ebfd am: 1b479fb04c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482929

Change-Id: I92aa0fdafbe5a82d3bb1d60c8abe7e83c11450a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:29:07 +00:00
Calvin Pan
9cbbe3076e Merge "Avoid getting app locale config for each app" into tm-dev am: 9d6cf4255d am: 4d728de8bc am: 2552125764 am: 6156f00c25
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18456663

Change-Id: I06aada123e3dec9e208d7c5ca8f10854ece1df32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:27:57 +00:00
TreeHugger Robot
db44776759 Merge "Fix the work profile's deep link problem" into tm-dev am: 2b9dd10fa5 am: 9bfff8cb94 am: a1c0813203 am: fb834c0eb7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482928

Change-Id: I96805fd3ed1890ccf7c2899229113f2465473828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:25:25 +00:00
SongFerngWang
5031a2b55a The settings crash when it add the RTL mark on MEP message am: 7de5f99847 am: ee2536f3f5 am: 4b1585ebe7 am: 11ea0c10e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482929

Change-Id: I011c909ec2b0d3177b0dab9e22c846662259efab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:25:08 +00:00
Calvin Pan
b2426316b1 Merge "Avoid getting app locale config for each app" into tm-dev am: 9d6cf4255d am: 4d728de8bc am: c452fe1a61 am: db453f1058
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18456663

Change-Id: I338747caf6721db96102f1f5a266dde8f1ebfdd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:24:18 +00:00
SongFerng Wang
9782c4093c Merge "[LE unicast] Disable the "phone calls" when LE is enabled" am: 27b4578002 am: d28816fcc3 am: db328a03fb am: 50ca1ab7fd am: b9973caf84
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2100870

Change-Id: Ie97ebf38b61e71004ed270f485f974c63b6bc7a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:15:07 +00:00
TreeHugger Robot
8329fa64cc Merge "Revert "Show previous query upon configuration change"" into tm-dev am: fea570f524 am: 4ffd6caf54 am: 420b448fd1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486386

Change-Id: I6e4dd7854a850464c619869b13e3ec0712246512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:11:22 +00:00
TreeHugger Robot
facd82dd9f Merge "Show mobile data icon with carrier Wi-Fi level in Settings" into tm-dev am: f16c90f91d am: dd1ad333a8 am: 2b09ae4f4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18467044

Change-Id: I05d8dde18618c2448348c67696c1fe81a49d401d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:11:15 +00:00
Calvin Pan
b2cfdba385 Merge "Avoid getting app locale config for each app" into tm-dev am: 9d6cf4255d am: 977c6316a8 am: a33cc3f07a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18456663

Change-Id: I89a15ab943a1f2537747fe2d2adfd35e78b52ba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:11:04 +00:00
Chaohui Wang
f5ca0131eb Merge "Add the jank detection to Settings toggles" into tm-dev am: a47f9bb17f am: ca86110548 am: 29a1747a91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18212942

Change-Id: I7497ca614617ee14d2e8008cef20682fadc55bd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:07:48 +00:00
Chaohui Wang
0f1658d013 Merge "Add the jank detection to Settings toggles" into tm-dev am: a47f9bb17f am: ca86110548 am: c41f9a953a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18212942

Change-Id: Ic3efbb187a24fba979eb16d6b1445d89a3f60cfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:07:24 +00:00
TreeHugger Robot
4b42121489 Merge "Fix the work profile's deep link problem" into tm-dev am: 2b9dd10fa5 am: 9bfff8cb94 am: bcc628c7f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482928

Change-Id: I600b845a5906a421e1a25b3f0c84db59d0a06cbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:07:02 +00:00
SongFerngWang
1b479fb04c The settings crash when it add the RTL mark on MEP message am: 7de5f99847 am: ee2536f3f5 am: 118641ebfd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482929

Change-Id: I878431a60d8e93b6dad18801c4d8fda7c81398df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:06:55 +00:00
Calvin Pan
6156f00c25 Merge "Avoid getting app locale config for each app" into tm-dev am: 9d6cf4255d am: 4d728de8bc am: 2552125764
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18456663

Change-Id: I570f3feb7b37817f7958a5ea6e723d998db58d74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:04:15 +00:00
TreeHugger Robot
420b448fd1 Merge "Revert "Show previous query upon configuration change"" into tm-dev am: fea570f524 am: 4ffd6caf54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486386

Change-Id: I1735fdce61730866db7122abbb7260cff78e0688
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:56:58 +00:00
TreeHugger Robot
2b09ae4f4e Merge "Show mobile data icon with carrier Wi-Fi level in Settings" into tm-dev am: f16c90f91d am: dd1ad333a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18467044

Change-Id: Ib5725637f0f6aac6f358c1d9126ca879abc50776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:56:35 +00:00
TreeHugger Robot
fb834c0eb7 Merge "Fix the work profile's deep link problem" into tm-dev am: 2b9dd10fa5 am: 9bfff8cb94 am: a1c0813203
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482928

Change-Id: Ica593ef828869f76eb1da304b6e60c38178d36da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:55:34 +00:00
Chaohui Wang
c41f9a953a Merge "Add the jank detection to Settings toggles" into tm-dev am: a47f9bb17f am: ca86110548
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18212942

Change-Id: I940d194f592ab6f9b7ea43e4e078c0914078418c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:55:13 +00:00
TreeHugger Robot
bcc628c7f3 Merge "Fix the work profile's deep link problem" into tm-dev am: 2b9dd10fa5 am: 9bfff8cb94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482928

Change-Id: I74d649bc345175ea286513b65b5de40a525f302c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:54:54 +00:00
SongFerngWang
118641ebfd The settings crash when it add the RTL mark on MEP message am: 7de5f99847 am: ee2536f3f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482929

Change-Id: Ic5805d05bafca101bd5b82b1da9b074a7760fd95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:54:49 +00:00
SongFerngWang
11ea0c10e1 The settings crash when it add the RTL mark on MEP message am: 7de5f99847 am: ee2536f3f5 am: 4b1585ebe7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482929

Change-Id: If32ce25534681d4cbfe71eb96e7129f016cec2f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:54:00 +00:00
Calvin Pan
db453f1058 Merge "Avoid getting app locale config for each app" into tm-dev am: 9d6cf4255d am: 4d728de8bc am: c452fe1a61
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18456663

Change-Id: Ia1fb506b1c64d2b69040ca2132f177b9c77edc5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:52:23 +00:00
Calvin Pan
a33cc3f07a Merge "Avoid getting app locale config for each app" into tm-dev am: 9d6cf4255d am: 977c6316a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18456663

Change-Id: I04f620a356c131ce9920f3c84922a693446ff24a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:50:17 +00:00
TreeHugger Robot
4ffd6caf54 Merge "Revert "Show previous query upon configuration change"" into tm-dev am: fea570f524
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486386

Change-Id: Ib104a1f052c0a7d6dc38bef2ec9f5293686dc1b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:50:17 +00:00
Calvin Pan
2552125764 Merge "Avoid getting app locale config for each app" into tm-dev am: 9d6cf4255d am: 4d728de8bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18456663

Change-Id: Ic52667662f873194ff4000b59144fa30223bbc33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:48:28 +00:00
SongFerng Wang
b9973caf84 Merge "[LE unicast] Disable the "phone calls" when LE is enabled" am: 27b4578002 am: d28816fcc3 am: db328a03fb am: 50ca1ab7fd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2100870

Change-Id: I9958a7a658b20187f163417ac24b989ecca14e8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:45:07 +00:00
Chaohui Wang
29a1747a91 Merge "Add the jank detection to Settings toggles" into tm-dev am: a47f9bb17f am: ca86110548
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18212942

Change-Id: I2df4c39742f1060577c8df98d8c0854e83cc152b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:29:07 +00:00
TreeHugger Robot
a1c0813203 Merge "Fix the work profile's deep link problem" into tm-dev am: 2b9dd10fa5 am: 9bfff8cb94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482928

Change-Id: Ide36d477a254283b8fc3c79b1a3113864ad48f71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:28:54 +00:00
SongFerngWang
4b1585ebe7 The settings crash when it add the RTL mark on MEP message am: 7de5f99847 am: ee2536f3f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482929

Change-Id: Ic5a01ae982ad4ba467ea4ec3ded3db57f244729f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:28:47 +00:00
TreeHugger Robot
fea570f524 Merge "Revert "Show previous query upon configuration change"" into tm-dev 2022-05-20 12:27:55 +00:00
TreeHugger Robot
dd1ad333a8 Merge "Show mobile data icon with carrier Wi-Fi level in Settings" into tm-dev am: f16c90f91d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18467044

Change-Id: I2efe5dca3a5241c247d96f53901f1254e19ce988
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:26:32 +00:00
Chaohui Wang
ca86110548 Merge "Add the jank detection to Settings toggles" into tm-dev am: a47f9bb17f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18212942

Change-Id: Ie35e6b3a663c3cfb5f72650c1c530ce7bb91ca38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:26:18 +00:00
TreeHugger Robot
9bfff8cb94 Merge "Fix the work profile's deep link problem" into tm-dev am: 2b9dd10fa5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482928

Change-Id: Id84dfda0e0d4f7d22801e223038b7c3fc9943be6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:24:44 +00:00
SongFerngWang
ee2536f3f5 The settings crash when it add the RTL mark on MEP message am: 7de5f99847
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482929

Change-Id: I9c2f7b7388b9281a5a90cd11155cbac14b950aef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:24:37 +00:00
Calvin Pan
c452fe1a61 Merge "Avoid getting app locale config for each app" into tm-dev am: 9d6cf4255d am: 4d728de8bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18456663

Change-Id: I3fac504db317f77f42de06ad360e3d128fb3bfc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:24:09 +00:00
Calvin Pan
4d728de8bc Merge "Avoid getting app locale config for each app" into tm-dev am: 9d6cf4255d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18456663

Change-Id: Ifa5695455810d3c54239463a0c6aae447e08b09e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:22:27 +00:00
Calvin Pan
977c6316a8 Merge "Avoid getting app locale config for each app" into tm-dev am: 9d6cf4255d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18456663

Change-Id: Icd0064725e00233e465de006da61b42749298603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:19:26 +00:00
TreeHugger Robot
f16c90f91d Merge "Show mobile data icon with carrier Wi-Fi level in Settings" into tm-dev 2022-05-20 11:21:18 +00:00
Yi-Ling Chuang
e763ca1715 Revert "Show previous query upon configuration change"
This reverts commit d9453bf8c6.

Reason for revert: This introduces a new flicker which doesn't seem good. Will have another solution once all things are ready.

Fixes: 232355879
Change-Id: I0bbc4561ce4fbef36d59de15ae98705a6d81574c
2022-05-20 10:11:20 +00:00
Chaohui Wang
a47f9bb17f Merge "Add the jank detection to Settings toggles" into tm-dev 2022-05-20 09:22:46 +00:00
TreeHugger Robot
2b9dd10fa5 Merge "Fix the work profile's deep link problem" into tm-dev 2022-05-20 08:23:15 +00:00
Weng Su
f8f2d17b66 Show mobile data icon with carrier Wi-Fi level in Settings
- If carrier Wi-Fi is active then use carrier Wi-Fi level instead of
  mobile data level.

- If carrier Wi-Fi level is less than min-level, use min-level instead.

Bug: 222885558
Test: manual test
atest -c SubscriptionsPreferenceControllerTest \
         WifiPickerTrackerHelperTest

Change-Id: I46ba5129357bae47e5e44dcbbb26e6673581fdc8
2022-05-20 16:02:47 +08:00
SongFerngWang
7de5f99847 The settings crash when it add the RTL mark on MEP message
The MEP message string is one line, so it did not need to add more
RTL marks.
hsv: https://hsv.googleplex.com/5694452275347456

Bug: 233082642
Test: manually test and take the hsv.
Change-Id: Iad4d469eb6a74805f3c8d5fe5c7eacea1e7a25d3
2022-05-20 12:15:06 +08:00
Jason Chiu
26588fc2e5 Fix the work profile's deep link problem
- Settings shows the work Homepage while starting the work profile's
  icon, which is not allowed.
- Clicking work apps' App info plays an unsmooth window transition
  animation.

Fix: 233296965
Test: manual, robotest
Change-Id: I3d12f6c59692c4a4cc718ea7022b60be50235abb
2022-05-20 12:05:32 +08:00