Commit Graph

105453 Commits

Author SHA1 Message Date
Edgar Wang
24654a3d61 Merge "Update learn more string of FooterPrefernce" into tm-dev 2022-05-20 23:13:07 +00:00
TreeHugger Robot
12cc3aeae0 Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575 am: f36d767679
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285

Change-Id: I468f2cce8f5d67055addc01ef4749b1cf98b5896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 19:33:43 +00:00
TreeHugger Robot
f36d767679 Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285

Change-Id: I2a4e530320564961901f96af333e47dd019aa226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 19:14:12 +00:00
Bill Yi
26be41c615 Import translations. DO NOT MERGE ANYWHERE
BUG:233360920

Auto-generated-cl: translation import
Change-Id: I264f7b7815e65b65892d9bdf62b7748ac392efaf
2022-05-20 18:28:22 +00:00
TreeHugger Robot
baa2c48575 Merge "Filter out the duplicate click event on menu page" into tm-dev 2022-05-20 18:18:58 +00:00
Hank Sheng
9fb34ae376 Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b am: 37c36d0c63
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029

Change-Id: I4aa2af07a568f4a67e47d52959f74004f4c8990c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 17:06:48 +00:00
Hank Sheng
37c36d0c63 Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029

Change-Id: I155d06cf2e6c0adf93426d35075b8ebeb71b84be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 16:49:13 +00:00
Hank Sheng
841964c02b Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev 2022-05-20 16:27:56 +00:00
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
Bill Yi
0c0b16955b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7f6bcb27ceabafc988752c5f988519bc1217f121
2022-05-20 07:21:29 -07:00
Bill Yi
7bc13fac28 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7122327ee7fa89fb0ebcefd7bb1df553453800ad
2022-05-20 07:17:38 -07:00
Bill Yi
2599aa711e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iac2041901a72661f75755807569eb2b401f44122
2022-05-20 07:13:37 -07:00
Bill Yi
70a7ba0f71 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ice7a5337a3736a6fba30fd25ea1adfcdcad9dc75
2022-05-20 07:02:12 -07:00
Bill Yi
62a52eccea Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I48ccada3cf5274ed77cd40d9cd17f42f9f3f77a0
2022-05-20 07:00:37 -07:00
Bill Yi
02b1b0b3db Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5225112c421e18ecd774e1b0a3d1f3d96dbdef87
2022-05-20 06:59:08 -07:00
Bill Yi
f9b665e302 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6bab2e5fd4e3902f5a2858f9cec57685e975460d
2022-05-20 06:57:34 -07:00
Bill Yi
0fc6315b65 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I70f0d00ed8fe7c13e0065a1a5f435a7a361a6b93
2022-05-20 06:48:09 -07:00
Bill Yi
ca3a25c900 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id69c2a43ac584d2e7f6cf9a5889884f7e5707127
2022-05-20 06:43:01 -07:00
TreeHugger Robot
6a2136b93a 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: I0c4ea8367b14a7ac81867587cddb97a1152f61ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:05:57 +00:00
TreeHugger Robot
7a8d582874 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: I4848c74965cff5d2b192d3ae90027fcdfbff818e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:05:39 +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
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
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
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
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
Alan Huang
dceda96854 [VolumePanel] Add Hearable control slice in VolumePanel
Bug: 229048602
Test: make -j64 RunSettingsRoboTests
Change-Id: Ia799a805594803a9a014eef76bb3db5a50a13524
2022-05-20 09:02:10 +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
Android Build Coastguard Worker
a1a6faef77 Snap for 8618453 from d84a2b10f8 to tm-qpr1-release
Change-Id: I274dece855f90b5bc872d513ba5d20e66f1875eb
2022-05-20 03:10:23 +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
Bonian Chen
d84a2b10f8 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: I9a2e943ebe76959b4ba9f6cace61429876ff8c3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 11:24:56 +00:00
Bonian Chen
cb9e5a8076 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: I158f6542124f5260ddf64eddd589de654ff086b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 11:24:44 +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
08b7f53383 Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev 2022-05-19 10:28:21 +00:00
Bonian Chen
fccca65c0e Merge "[Settings] Stop network mode query when changing config" into tm-dev 2022-05-19 10:27:07 +00:00
Yi-Ling Chuang
e8aaf2ba6f Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e am: d16cf0453e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100

Change-Id: I8a7b1e0af688bfaaab35374bb7c1db1f881863ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 09:20:48 +00:00