TreeHugger Robot
02d3965634
Merge "Simplify the duplicate click checker logic" into tm-dev
2022-05-23 10:24:18 +00:00
SongFerngWang
0167a4d8a6
[LE unicast] Disable the "phone calls" when LE is enabled
...
The "phone calls" uses the Headset profile, not HFP profile. The ui
uses the wrong profile. It causes the "phone calls" is always enabled
when LE is enabled.
Bug: 231511825
Test: build pass
Change-Id: Ib507352107c0d825b8c7a9605713bc9083259fbd
Merged-In: Ib507352107c0d825b8c7a9605713bc9083259fbd
2022-05-23 17:34:48 +08:00
Bill Yi
fb1885708b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18544761
Change-Id: Ic47f286fe9cb7e04d88d4686ac49059efe1b2b9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 05:07:31 +00:00
Jason Chiu
5bc2dc4ae9
Simplify the duplicate click checker logic
...
Test: manual
Bug: 215267159
Change-Id: I7724883b351d360525c51d31714b7e31855a6c82
2022-05-23 12:57:19 +08:00
Bill Yi
750cea242e
Import translations. DO NOT MERGE ANYWHERE
...
BUG:233440940
Auto-generated-cl: translation import
Change-Id: Idbd4c9ec8105849b762afae06c780c47185fda65
2022-05-21 09:20:58 -07:00
TreeHugger Robot
b307e7f12f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18522105
Change-Id: I0706a0c6b65f7f5fa47a039a0fbd92c98776c52d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-21 02:18:09 +00:00
Bill Yi
1ec1446d04
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26be41c615
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18522105
Change-Id: Iccc0246524c4712052d763b078bd70d336d7a4a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-21 02:18:01 +00:00
TreeHugger Robot
97a3f54878
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-21 02:12:55 +00:00
Chaohui Wang
e50e40098f
Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674
Change-Id: Id7a9e00ed4fc34263ced3c87de76c5a44be65c6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-21 02:09:02 +00:00
Chaohui Wang
0dc89bc85c
Merge "Fix Conversation page flickers when back" into tm-dev
2022-05-21 01:54:27 +00:00
Edgar Wang
792ff94f89
Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903
Change-Id: I5ef42026d028a1ab167ea743a081df563cb77b39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 23:24:37 +00:00
Edgar Wang
24654a3d61
Merge "Update learn more string of FooterPrefernce" into tm-dev
2022-05-20 23:13:07 +00:00
TreeHugger Robot
70ffa88eaf
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: I3642080e0f9ffd7bd7a164da8b8c26fe2f8507a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 19:03:40 +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
73a78072af
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: I12d7046ca23c20fb0b67324c61172ffeebc8a638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 16:48:04 +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
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
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
db9218dcec
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I87f67daa4c3c8c0f063d64630852b2a19bdb2ffe
2022-05-20 06:51:51 -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
535ccbdbb1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1128d6fb3509e184740b733a019bd7656831b2ae
2022-05-20 06:44:33 -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
50b71c3eaa
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: I6469c6b69b371c1a779160063d4ed1aeb29f40b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:30:02 +00:00
TreeHugger Robot
9a35add550
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: I9667106ce8e8f88b948d2ae8a18bb84fa3159d23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:29:24 +00:00
Chaohui Wang
6e4e6fcdbf
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: I96d96ccd1a25c008443855ba2b5e6fcc80cc0112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:29:01 +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
d017261dd6
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: I88933010aabbbb0210d8833440f3d92ffbb2db37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:26:15 +00:00
SongFerngWang
f88f3aed7b
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: Iddf37afabc69ce843c3f24f4dd563c38fa8a375f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:25:37 +00:00
Calvin Pan
75292dd212
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: I0703139669b9134c779ac60cdbf79a6390619837
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:24:59 +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
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
91ab43caae
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: I75f8f3166166a30bb329920e3799c3fcf840cc14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 11:07:37 +00:00
Bonian Chen
bc36d8bfac
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: I14d4cc287c75cc40a1d872f67e6ee9dc8870f435
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 11:07:22 +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
33cad52af7
Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100
Change-Id: I7eec8329791de225cd9ed236c1aa9f95a93079fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 08:43:21 +00:00
Yi-Ling Chuang
3bf578c73e
Merge "Guard against the NPE in getTransitionType()" into tm-dev
2022-05-19 08:19:50 +00:00
Chaohui Wang
692068d535
Add the jank detection to Settings toggles
...
Add jank detection when click the following preferences,
- SwitchPreference
Single target, detect click in InstrumentedPreferenceFragment
- PrimarySwitchPreference
Two target, only detect click switch in switch's onClick()
- MainSwitchPreference
Single target, detect click in TogglePreferenceController
- SettingsMainSwitchPreference
Single target, detect click in its onSwitchChanged()
Bug: 230285829
Test: manual & robo tests
Change-Id: I97a13e05a601237b16cd2d903ba2fb6ec4a69a74
2022-05-19 12:28:16 +08:00