Bill Yi
ea8b3f83b2
[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: Id60653015a9a4344e2428a51390806f449f4ea4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-21 02:17:40 +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
0d6569d199
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: I911dc4f729e7d6eeb0fda8b12f16d8a153cb6bc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-21 02:08:39 +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
eaa0a1cf5c
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: I10a24e8723d555c9bf81ee0efff9dea9d56bf736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 23:24:36 +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
96d31478ab
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: Ife6c05fc69d672a15d1bbbb8e06ba87e2f3a3ef9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 18:58:15 +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
434e728bce
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: I11fd085f1798f2ebaab2b14951716038379e2848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 16:47:41 +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
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
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
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
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
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
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
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
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
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
562977ee66
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: I4d7371583bd16123096f2e1bdeb71680aefa14c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 08:43:03 +00:00
Yi-Ling Chuang
3bf578c73e
Merge "Guard against the NPE in getTransitionType()" into tm-dev
2022-05-19 08:19:50 +00:00
SongFerngWang
5350643e7a
[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
2022-05-19 15:14:01 +08: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
Bill Yi
8e72e0eff1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aaa6d1154
-s ours am: 72642fa03d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18423221
Change-Id: Ib1ce59307919b68c2fc6134223c3b15352038143
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 01:17:20 +00:00
Bill Yi
72642fa03d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aaa6d1154
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18423221
Change-Id: I54834357925f5ceac577f25ac97c56716e996a2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 01:09:30 +00:00
Kate Montgomery
499e8848bc
Merge "Flag off stickiness of show/hide system setting." into tm-dev am: d79959bd7d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18399916
Change-Id: I52df4e0f5faef88f18e0e3cb1ba8bf4572fb2226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 22:36:47 +00:00
TreeHugger Robot
9db1451fc5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c41e921e1c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18425268
Change-Id: I868423dfaa7692cd532435fa7466d79d2877b6bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 22:24:47 +00:00
Bill Yi
c94186ccf4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff3c01f123
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18425268
Change-Id: I49bc5b53380ec7429ac82d324ba52f48586a4bd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 22:24:34 +00:00
TreeHugger Robot
3d05ca096b
Merge "Update Spatial audio settings page" into tm-dev am: 6993aa86eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18456662
Change-Id: I7adb7b5d835d196b1270d6362c6b92c99cc98bbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:23:20 +00:00