Jason Chiu
e04dfaa29e
Filter out the duplicate click event on menu page
...
Whenever the highlighted item is clicked, Settings shouldn't start the
second-layer page again even if the user goes to its child page.
Ex. When the user goes to the Tethering page, clicking on the menu
entry "Network & Internet" should not switch to the page.
Exception: in the deep link case, allow the first click event on the
highlighted item to launch the second-layer page when the page is not
the same as the one on the right pane.
Fix: 215267159
Test: manual, robotest
Change-Id: I2315e0069facc4867cb157752b1a3144716b7d17
2022-05-20 15:01:31 +00:00
TreeHugger Robot
776ef7ce34
Merge "Revert "Show previous query upon configuration change"" into tm-dev am: fea570f524
am: fdc8f75278
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486386
Change-Id: Ia21139be9cd0e37e0a696093fb5f64cd1de6b6b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 13:04:22 +00:00
TreeHugger Robot
a0470d433c
Merge "Show mobile data icon with carrier Wi-Fi level in Settings" into tm-dev am: f16c90f91d
am: 6ecbc57e0e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18467044
Change-Id: I312ac7cf4c49497d81575e97b550616b477904e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 13:03:46 +00:00
Chaohui Wang
5e09274023
Merge "Add the jank detection to Settings toggles" into tm-dev am: a47f9bb17f
am: 246764009c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18212942
Change-Id: I02be06beac469a4bbc4a01f86ccfb2b2aa7ec144
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 13:01:37 +00:00
TreeHugger Robot
4bc2f2df60
Merge "Fix the work profile's deep link problem" into tm-dev am: 2b9dd10fa5
am: 972bb9ddef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482928
Change-Id: I6ad70c3bf85b08a93c15c9192ad21e62b75b2a4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:59:29 +00:00
SongFerngWang
d46f1f8afe
The settings crash when it add the RTL mark on MEP message am: 7de5f99847
am: eae57aee2e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482929
Change-Id: I7d902cab024759e0b680a24f65521cdecb6d214c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:58:53 +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
fdc8f75278
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: I0c2fc9f385694c894bd8a142415401b439ce29c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:52:25 +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
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
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
6ecbc57e0e
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: I4144fc6534d35c05b1982d4add96cbe19f9e5339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:27:29 +00:00
Chaohui Wang
246764009c
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: I172dc10ef716db79989b471b5b3bd7367264c723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:26:58 +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
972bb9ddef
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: I942abafecee807034f3ffbc2788859ac161f9e34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:25:30 +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
SongFerngWang
eae57aee2e
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: I9ce0d687102086bb310759d3d0f3e170b9231f49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:24:32 +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
Hank Sheng
9a0675cdc9
Apply the glifv3 theme when the theme string in intentExtra is glifv4.
...
Create the short-term solution for the issue in settings page.
The issue is because when we set to use glifv4 theme, the theme util in settings do not have that version(glifv4) info in their util so that they will roll back to the glif v1 theme.
Current solution is rollback to the glifv3 first.
screenshot:
https://hsv.googleplex.com/5599282846498816
https://hsv.googleplex.com/5354235030929408
Bug: 233032365
Bug: 233036258
Change-Id: I7cdd25d34eee6dd8593c550ac803de5852ad870c
2022-05-20 09:13:12 +00:00
Chaohui Wang
d30d1a74e1
Fix Conversation page flickers when back
...
In this page, there are 3 items flickery when back from conversation
page,
- The summary under priority conversations
- The summary under non-priority conversations
- The clear all button under recent conversations
This is because there is no key on these 3 preferences, when preference
screen updated in onResume(), preference screen thought these 3 are new
items, shows an animation for them. Add keys to them to fix.
Bug: 215073227
Fix: 232341970
Test: visual check
Change-Id: I24691cfa89a624c1741786499b47ede87d518d1a
2022-05-20 16:25:00 +08: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
SongFerng Wang
50ca1ab7fd
Merge "[LE unicast] Disable the "phone calls" when LE is enabled" am: 27b4578002
am: d28816fcc3
am: db328a03fb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2100870
Change-Id: Ic231c276f1f7726e35599bcdcfad4fcfd71ac3bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 02:35:33 +00:00
Calvin Pan
9d6cf4255d
Merge "Avoid getting app locale config for each app" into tm-dev
2022-05-20 01:52:46 +00:00
SongFerng Wang
db328a03fb
Merge "[LE unicast] Disable the "phone calls" when LE is enabled" am: 27b4578002
am: d28816fcc3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2100870
Change-Id: I82cf7c07333fced96063ce0653d37c7b9e6f346b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 00:49:21 +00:00
SongFerng Wang
d28816fcc3
Merge "[LE unicast] Disable the "phone calls" when LE is enabled" am: 27b4578002
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2100870
Change-Id: I4b1e2ca82609c4c37f74839ff1e404c428cdec8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 00:18:52 +00:00
SongFerng Wang
27b4578002
Merge "[LE unicast] Disable the "phone calls" when LE is enabled"
2022-05-19 23:56:08 +00:00
Bonian Chen
4b03edd4cc
Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev am: 08b7f53383
am: 1cdd01268a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426347
Change-Id: I5b880b2c38485830253a04b5b84902db1c8a5cea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 11:25:08 +00:00
Bonian Chen
cbc5f8a756
Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev am: 08b7f53383
am: 2034695af7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426347
Change-Id: Ie96d1ab046c988058dca50e0bfa8107d5babce8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 11:24:54 +00:00
Automerger Merge Worker
85f5fa0c01
Merge "Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e
am: 8bd1ac8ad2" into tm-d1-dev-plus-aosp
2022-05-19 11:24:36 +00:00
Bonian Chen
ec2b35fe87
Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e
am: 7e7ef59813
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157
Change-Id: I4aff0efcc0bd667d952f23695d6c7db7dac85ce1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 11:24:32 +00:00
Bonian Chen
fd79110356
Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e
am: 8bd1ac8ad2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157
Change-Id: I2d2ea978b37da3ca0a2737ff5f267c5026132ed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 11:24:31 +00:00
Bonian Chen
2034695af7
Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev am: 08b7f53383
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426347
Change-Id: Id5e3b9d471b378a65c195179cac6da4b38e3723c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 11:08:34 +00:00
Bonian Chen
7e7ef59813
Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157
Change-Id: Ie45deeea978e1a87b4d34e930bfd068a05f43ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 11:08:27 +00:00
Bonian Chen
1cdd01268a
Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev am: 08b7f53383
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426347
Change-Id: I7fd11293633fd718210bf59a83c5db28a12852f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 11:07:08 +00:00
Bonian Chen
8bd1ac8ad2
Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157
Change-Id: I390e0565a2ebfea00ad464117a63eec193fc6282
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 11:06:42 +00:00
Bonian Chen
08b7f53383
Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev
2022-05-19 10:28:21 +00:00