Angela Wang
3c71a5ff22
Merge changes from topic "ha-new-pairing" into main
...
* changes:
New hearing device pairing page (2/2): MFi devices
New hearing device pairing page (1/2)
2024-01-16 09:41:37 +00:00
Yiyi Shen
3cdd111ed3
[Audiosharing] Add toggle to improve sharing compatibility.
...
Test: manual
Bug: 305620450
Bug: 292538935
Change-Id: I8df92323c606cc3375a0f985d46c11caa12c6cfe
2024-01-16 17:20:05 +08:00
YK Hung
76a783b50c
Merge "Fix lost field foregroundServiceUsageTime in convertUtil" into main
2024-01-16 08:55:38 +00:00
YK Hung
b8e1f96d3e
Merge "Fix crash while dumpping database." into main
2024-01-16 08:39:31 +00:00
Fan Wu
bbe421145e
Merge "Fix test failure caused by ag/25891007" into main
2024-01-16 08:01:48 +00:00
YK Hung
b5eac9b47b
Merge "Clean up the legacy anomaly detection mechanism in the Settings" into main
2024-01-16 07:54:57 +00:00
Yiyi Shen
a05c1e5283
Merge "[Audiosharing] Always show broadcast name when BT is on." into main
2024-01-16 07:51:05 +00:00
mxyyiyi
2c7ca9f2e7
Fix crash while dumpping database.
...
Bug: 319905857
Test: manual
Change-Id: If531f1d7416b21d481fc19834e7538567dec7c0c
2024-01-16 15:46:34 +08:00
ykhung
9ccd8d8da2
Clean up the legacy anomaly detection mechanism in the Settings
...
Clean up the legacy anomaly detection mechanism in the Settings, which is implemented in the 2017-2018. The will be replaced by the new anomaly detection mechanism.
Bug: n/a
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I12ee6c8b3cbdb5073e4d46f18b90f8de228be8a8
2024-01-16 15:05:29 +08:00
mxyyiyi
90da4049f2
Fix lost field foregroundServiceUsageTime in convertUtil
...
- from batteryDiffEntry to batteryUsageDiff
Bug: 320358970
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge.batteryusage.*"
Change-Id: Ibc5ee2f14ede066bef3fb1c832ef54941fc59ebf
2024-01-16 15:02:21 +08:00
Fan Wu
133152906a
Fix test failure caused by ag/25891007
...
Bug: quick fix
Test: atest
Change-Id: I593df098ca8d873d61ea887489d0cf6391a46ca0
2024-01-16 06:56:21 +00:00
Yiyi Shen
162533362a
[Audiosharing] Always show broadcast name when BT is on.
...
Also group the broadcast name to Stream settings category.
Test: manual
Bug: 305620450
Change-Id: I12bba9d5199d6770f86dad1089b47c3767285573
2024-01-16 14:54:10 +08:00
YK Hung
fe684cb602
Merge "Clean up the legacy anomaly detection mechanism in the Settings" into main
2024-01-16 04:11:48 +00:00
ykhung
5bf510bf0d
Clean up the legacy anomaly detection mechanism in the Settings
...
Clean up the legacy anomaly detection mechanism in the Settings, which is implemented in the 2017-2018. The will be replaced by the new anomaly detection mechanism.
Bug: n/a
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: Id5b5f4987c205c45698b6aa25aeb9604479e79c6
2024-01-16 04:06:29 +00:00
Angela Wang
5cb00f6602
New hearing device pairing page (2/2): MFi devices
...
Some of the hearing aids support both ASHA + MFi, however, they only
advertise MFi service uuid in advertisement packets.
We can filter the devices with MFi uuid while scanning and then connect
gatt to discover the remote services before pairing to make sure if the
devices are compatible with Android or not. Only devices that support
ASHA/HAP will be shown.
Bug: 307890347
Test: atest HearingDevicePairingFragmentTest
Change-Id: Ie1f4eedddd4c43fad0fcbcd35f436dea5ab06925
2024-01-16 03:55:54 +00:00
Angela Wang
3e9f1ff659
New hearing device pairing page (1/2)
...
Rewrite a new hearing device pairing page with update UI for "See more
devices".
Bug: 307473972
Test: atest HearingDevicePairingFragmentTest
Test: flip the flag com.android.settings.flags.new_hearing_device_pairing_page && atest HearingAidPairingDialogFragmentTest AddDevicePreferenceControllerTest
Change-Id: Ic60601905e3d0d7d7c5b1ef9733652118a211f1d
2024-01-16 03:49:34 +00:00
Chaohui Wang
8a5bf167c1
Merge "Catch IllegalStateException when get carrier config" into main
2024-01-16 03:37:13 +00:00
Wu Ahan
a9913cb74c
Add SfpsRestToUnlockFeature to FingerprintFeatureProvider
...
Bug: 296179618
Test: manually
Test: SettingsUnitTests
Change-Id: I452610e2c2b36f56dc4ade1cea1a15fdc088211f
2024-01-16 02:15:33 +00:00
YK Hung
5d0121e044
Merge "[Reskin] Replace string for chargin on hold" into main
2024-01-15 15:09:59 +00:00
pajacechen
f45427bd59
[Reskin] Replace string for chargin on hold
...
- replace the string for charging on hold in settings main page and
battery status in battery settings page
Bug: 315748218
Test: Manual Test
Flag: NA
Change-Id: I130d377912e150d593f6480e2bbdf43048b6916e
2024-01-15 19:20:21 +08:00
chelseahao
5d0bd7555d
[Audiosharing] Handle sync, add source via qrcode.
...
Bug: 305620450
Test: manual
Change-Id: I32c14607035d8f37f44186175657c42307780e7b
2024-01-15 10:27:25 +00:00
Treehugger Robot
f1c141906a
Merge "Update the setOverrideDeadline in the legacy AnomalyDetectionJobService" into main
2024-01-15 10:05:03 +00:00
ykhung
22273161fd
Update the setOverrideDeadline in the legacy AnomalyDetectionJobService
...
Update the setOverrideDeadline based on the suggestion in the b/319721625, and remove the legacy anomaly detection mechanism from the main entry BroadcastReceiver
Fix: 319721625
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge.batterytip"
Change-Id: I1276bfc95d9cf36a60e28612ebb8a295fd58083b
2024-01-15 09:23:18 +00:00
Fan Wu
4d005993f6
Update ShadowParcel to extend from org.robolectric library
...
Bug: 319052511
Test: atest SettingsRoboTest:com.android.settings.development
Change-Id: I751df93cfc9970279e9fd9872f988dff58f989d6
2024-01-15 16:58:19 +08:00
Yiyi Shen
d80dbba739
Merge "[Audiosharing] Support play test sound" into main
2024-01-15 08:56:08 +00:00
Charlotte Lu
89b966fff5
Merge "When apn is read only, hide the save button." into main
2024-01-15 08:54:51 +00:00
Chaohui Wang
9a6a0865de
Catch IllegalStateException when get carrier config
...
Fix: 319149441
Test: manual - on System Update page
Test: unit test
Change-Id: I484a036b2ce086531b20e1a5ca7e541934bc4c07
2024-01-15 16:52:06 +08:00
Charlotte Lu
f8bc0841bc
When apn is read only, hide the save button.
...
Test: Visual Test
Fix: 320200491
Change-Id: I8280fdaa3643a982137936473d827b8502a6e023
2024-01-15 15:39:49 +08:00
Hyunho Shin
4130a95c5d
Merge "Add the condtions to show the pSIM conversion menu" into main
2024-01-15 05:12:40 +00:00
Fan Wu
f08c87d002
Fix LinkifySummaryPreferenceTest
...
The spy annotation will trigger the non-existing API.
Bug: 313563183
Test: atest SettingsRoboTests:com.android.settings.widget
Change-Id: Iec4448b45e5408846962dc49c65ccc64feb5d2ad
2024-01-15 03:12:25 +00:00
Treehugger Robot
f81b9cd75a
Merge "Fix text color contrast issue on Caption size and style screen" into main
2024-01-13 05:13:20 +00:00
Hyunho
3d2c417236
Add the condtions to show the pSIM conversion menu
...
if the value of carrier config and current SIM's carrier is matched, then the pSIM conversion menu will show
Bug: b/319527964
Test: manual test (b/319527964#comment3)
Change-Id: I82025447f43c0151ba58edd77c6f8b7e8aff660d
2024-01-13 03:48:07 +00:00
Chun-Ku Lin
0552c18287
Fix text color contrast issue on Caption size and style screen
...
Use the same textAppearance as the one defined in
preset_picker_item.xml, which is used by the Edge type dialog on the
same screen and doesn't have text color contrast issue.
Bug: 319742556
Flag: EXEMPT (simple bug fix)
Test: Manually by using Accessibility Scanner
Change-Id: If078ce1daf8ba0b3cb6ffef860ff39e995d7446a
2024-01-12 23:32:52 +00:00
Hakjun Choi
6a29eb7b15
Merge "Filter out satellite plmn when in SAT mode" into main
2024-01-12 22:11:48 +00:00
Pawan Wagh
2d284d98bb
Merge changes from topic "16k_dev_ui" into main am: 052a1658e4
am: 7b96c4e57b
am: 2d70fb39af
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2775987
Change-Id: I003f73b3e398f536e6afaaf93e2adb9da11fa7ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 21:34:02 +00:00
Pawan Wagh
7516944287
Show progress bar till the applyPayload returns am: 9be05afc88
am: 0aebae8d79
am: 7dcfe67cae
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2766345
Change-Id: I4433a73f30d21629558b18716e7972acc4e46d5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 21:33:55 +00:00
Pawan Wagh
8a1cebc72a
Call update engine to apply payload am: 008842edeb
am: d2110a76a7
am: ba35fbc238
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2756951
Change-Id: I4efedc488fdf5f73ead41781ebf3d4eb33f0b78b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 21:33:49 +00:00
Pawan Wagh
7e2249a7dd
Developer option for booting with 16K pages am: 8996ca9768
am: acd2de2533
am: 8e5eff37a9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2705817
Change-Id: Icaca8a91a01be73cdda9d61e2a2fbb6c82534a47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 21:33:41 +00:00
Bill Yi
8ed3172ea5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acdbb25cd7
-s ours am: aa1f04042b
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25869875
Change-Id: Ic4989b70be4924c251e6670e13457cbeab1758a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 21:25:48 +00:00
Pawan Wagh
2d70fb39af
Merge changes from topic "16k_dev_ui" into main am: 052a1658e4
am: 7b96c4e57b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2775987
Change-Id: I0dd9f6b90752512b0b74a9d2222d188665fb1e4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 21:25:10 +00:00
Pawan Wagh
7dcfe67cae
Show progress bar till the applyPayload returns am: 9be05afc88
am: 0aebae8d79
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2766345
Change-Id: Ibaf92a15e52ad5e7f1834210196c94d521ad90d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 21:25:06 +00:00
Pawan Wagh
ba35fbc238
Call update engine to apply payload am: 008842edeb
am: d2110a76a7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2756951
Change-Id: I2e0013a3f62fa945005f6ceaf2ff3ca184c2ba8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 21:25:02 +00:00
Pawan Wagh
8e5eff37a9
Developer option for booting with 16K pages am: 8996ca9768
am: acd2de2533
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2705817
Change-Id: I8882b9feb7b34567de5f8a65d8932dac42446529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 21:24:56 +00:00
Bill Yi
e84b7a4306
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9a5a8054b8
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25869874
Change-Id: I3ecccec7f15bf0dffbac919f1b2d76b0b0cc62bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 20:23:00 +00:00
Treehugger Robot
50e4741b60
Merge "Add auto lock preference inside private space settings" into main
2024-01-12 20:17:59 +00:00
Bill Yi
aa1f04042b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acdbb25cd7
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25869875
Change-Id: Iabc4018006534088dafb0c09a955f5226cb39e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 20:12:51 +00:00
Bill Yi
4df36e6583
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-01-12 20:12:50 +00:00
Pawan Wagh
7b96c4e57b
Merge changes from topic "16k_dev_ui" into main am: 052a1658e4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2775987
Change-Id: I2d074f6bd19c6957659b018af8736c076b95047b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 19:51:17 +00:00
Pawan Wagh
0aebae8d79
Show progress bar till the applyPayload returns am: 9be05afc88
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2766345
Change-Id: I713b313d751c063cea3835c7396859f40a61645d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 19:51:13 +00:00
Pawan Wagh
d2110a76a7
Call update engine to apply payload am: 008842edeb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2756951
Change-Id: I21c7ec553c2a9276df3f9b352ad3f106f816a3bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 19:51:09 +00:00