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
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
4c592c3baf
Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e am: 562977ee66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100
Change-Id: I4f7e7a14f83f2e18880978472aa71ac02ae37dae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 09:21: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
Bill Yi
9be6f3ac1c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aaa6d1154 -s ours am: 72642fa03d -s ours am: fb624c7eb4 -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: Ibde279f87e103be53d608c2a114b0ad10a8961b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 01:47:40 +00:00
Bill Yi
72d01bba8f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aaa6d1154 -s ours am: 72642fa03d -s ours am: 8e72e0eff1 -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: I4eb18bd9e45d24f23e1a50e45b74f0daf66667b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 01:37:26 +00:00
Bill Yi
fb624c7eb4
[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: I97435123dbc86b7aa1e8f590786e85c2d5ed8476
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 01:37:10 +00:00
Bill Yi
e7804305be
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: daacf9d045 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18423219
Change-Id: Ic671f54fd9be8f81e060a8f80924c6730c500bfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 01:30:31 +00:00
Bill Yi
163282414d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66baefeaed -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18423219
Change-Id: Ic8947c54e73fbe56967ae9f1db2102ca8c182704
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 01:29:59 +00: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
Bill Yi
daacf9d045
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-05-19 00:41:39 +00:00
Kate Montgomery
2dc9ab9f81
Merge "Flag off stickiness of show/hide system setting." into tm-dev am: d79959bd7d am: 499e8848bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18399916
Change-Id: I1f54e8636ef86efba28ce75fc2bdd3782378b107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 22:47:27 +00: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
TreeHugger Robot
b4f8df82a1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c41e921e1c -s ours am: 1f16b93bfb -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: I744e6853aeb0800b0351dc563bc5427f1df9fc14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 22:43:03 +00:00
Bill Yi
d81baee6ee
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff3c01f123 -s ours am: ccf14d5a76 -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: I92e241fc512cb5dd9fea6079e361b3306908033f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 22:42:52 +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
TreeHugger Robot
f29047c284
Merge "Update Spatial audio settings page" into tm-dev am: 6993aa86eb am: d9fa9f7ba1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18456662
Change-Id: I89847faca839a8da8f9f38a4d1ef4c1908987b38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 22:41:11 +00:00
TreeHugger Robot
4dfa092886
Merge "Guard against the NPE in setPreferenceIcon()" into tm-dev am: cce3381ed4 am: 33622a034e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447101
Change-Id: I41a5656ba554ccedbd32f858ad57625a694a66d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 22:41:04 +00:00
TreeHugger Robot
c6451d4def
Merge "Fix incorrect battery icon showing on the recent apps" into tm-dev am: 1cf78b8b83 am: d2631c30f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447091
Change-Id: I721523de9b9c9db60971d010fc9510cbc5f455a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 22:40:57 +00:00
Bill Yi
d84e849f2d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6890a9fd64 -s ours am: 06e4b3d06e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18446092
Change-Id: I7b682c99f6652ae99dd872c0eaf5e5f27163b3a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 22:40:36 +00:00
Arc Wang
c443587bc2
[automerger skipped] Center apps Preference title when there is no summary am: 3cb8171f4f am: 75eac09a00 -s ours
...
am skip reason: Merged-In I6fceba243e2ccac9ea180b940b571da07e1ba805 with SHA-1 3cb8171f4f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426345
Change-Id: I3825c5f8d7e186542a468f75440e0cd3d52f9e86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 22:40:30 +00:00
Chaohui Wang
012573573e
Fix flicker in Location page when location is off am: f9ebeadb33 am: 01431d5ffe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402153
Change-Id: Ica3337a8de89069cfe695db63f4afe46b61f1860
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 22:40:22 +00:00
Hugh Chen
710bc7d66e
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc am: c2bb599eeb -s ours am: 8ddd1d70b2 -s ours am: 22ce749aa6 -s ours am: 8ce854af29 -s ours am: 136af4e593 -s ours am: 40ed71c895 -s ours am: c4899bf019 -s ours am: d217f66380 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330693
Change-Id: I34aeeb75b2251ad3ac79d21e79041e2d4ce41812
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 22:40:15 +00:00
Hugh Chen
825c6dfa45
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: c44b6fed73 am: d925f52768 -s ours am: 8d4a4b690f -s ours am: f13ceb8aea -s ours am: ddc8e16cd6 -s ours am: 0e568376a3 -s ours am: 978ba3a85d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330692
Change-Id: Ie4e9ed77b7ae59753ae3510d4f2bcfcd74590d66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 22:40:07 +00:00
Hugh Chen
cedf84a84c
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 9399a699d7 -s ours am: 1e636ad03e -s ours am: dc1023e587 -s ours am: 3d0db8d34f -s ours am: e5d54e867c -s ours am: 1b0e924968 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330691
Change-Id: Iffb22c39733e9382e1ee7e7f0be2d667b222368b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 22:39:58 +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
2e39615795
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c41e921e1c -s ours am: 9db1451fc5 -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: Ib1d6bad93d911bd99aa14604cd6080fd1fa5772f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 22:35:34 +00:00