Commit Graph

42683 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
07438e359d 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: I57ad7d8c54d8441b2dfa4daa2cf900bdae76914a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 09:20:51 +00:00
Yi-Ling Chuang
d16cf0453e 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: Ic1c953a034827ce7df2bd7b0f464fdb340aebb56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 08:44:38 +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
Kate Montgomery
196d99198d Merge "Flag off stickiness of show/hide system setting." into tm-dev am: d79959bd7d am: c92780ceba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18399916

Change-Id: Ib62a884b76001e15b2f5b5e6b0b5f507a0aefb76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:44:44 +00:00
Kate Montgomery
c92780ceba 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: I01a58ec1e7f17ea67664515cfb610c937aae2d25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:41:11 +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
d9fa9f7ba1 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: Iaea4f2e5c760cffb82b97c35e6dca719a9b418d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:53:31 +00:00
TreeHugger Robot
33622a034e Merge "Guard against the NPE in setPreferenceIcon()" into tm-dev am: cce3381ed4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447101

Change-Id: I6f935808fd9d0e4344016fbcc898d8e1df9daeab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:53:13 +00:00
Arc Wang
75eac09a00 Center apps Preference title when there is no summary am: 3cb8171f4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426345

Change-Id: I6c0ade1ff22d4cd86ad2b850477c838ac87d0bc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:52:29 +00:00
Chaohui Wang
01431d5ffe Fix flicker in Location page when location is off am: f9ebeadb33
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402153

Change-Id: I01d95d9378a22bcb2c9967baf3cb7698ef9f4452
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:51:13 +00:00
Tom Hsu
6a85746757 Merge "[Panlingual] Fix the item clicked is not match target application" into tm-dev am: 45c60f8564
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356600

Change-Id: I1a4398642952106003e6bfd64f4a8d96e1c38c8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:50:14 +00:00
TreeHugger Robot
86720818ed Merge "Update Spatial audio settings page" into tm-dev am: 6993aa86eb am: 3d05ca096b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18456662

Change-Id: Ic1783d17970ad8a2a4d36b41cf3667b76712f951
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:38:51 +00:00
TreeHugger Robot
c62527575c Merge "Guard against the NPE in setPreferenceIcon()" into tm-dev am: cce3381ed4 am: 8d1ebcf00f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447101

Change-Id: I2f4917afc67f53ccc564f04a54894c2adc0bc791
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:38:45 +00:00
Arc Wang
6d64ce7012 Center apps Preference title when there is no summary am: 3cb8171f4f am: 0dc879dbe0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426345

Change-Id: I8df031b6043efe7aacecd1bde3baeb08de101468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:36:51 +00:00
Chaohui Wang
6f3e2dfbc3 Fix flicker in Location page when location is off am: f9ebeadb33 am: 2e7fc47291
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402153

Change-Id: I8aa2b85930042eba3fef5753cbaa0b66909cce6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:36:29 +00:00
Tom Hsu
da1d8acae9 Merge "[Panlingual] Fix the item clicked is not match target application" into tm-dev am: 45c60f8564 am: 434716f02d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356600

Change-Id: I88f8240e762c24ee5e087c9ff09e30805c3b2c6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:34:41 +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
TreeHugger Robot
8d1ebcf00f Merge "Guard against the NPE in setPreferenceIcon()" into tm-dev am: cce3381ed4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447101

Change-Id: I6d960bd4e85173dd967b7dba32c368e4313fc55e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 20:23:12 +00:00