Treehugger Robot
1fd937f8ba
Merge "[Catalyst] Vibration and haptics main switch migration" into main
2024-11-28 23:20:02 +00:00
Matthew DeVore
9e3f075c3a
Merge "Show built-in display if topology is visible" into main
2024-11-28 14:24:16 +00:00
jinjeong
2e7db438ab
New System API to launch SIM Preference in Setting
...
Bug: b/381319469
Test: Manual
FLAG: com.android.internal.telephony.flags.action_sim_preference_settings
Change-Id: I91815464a2462820de4f3db1bd59e6987910089d
2024-11-28 12:22:53 +00:00
Lais Andrade
08a7f6a5e7
[Catalyst] Vibration and haptics main switch migration
...
- Migrate "Use Vibration & haptics" main toggle in
vibration settings screen.
- Add screen for VibrationScreen dashboard fragment
NO_IFTTT=introducing preference metadata files, no change in preference
controllers required.
Bug: 368360218
Flag: com.android.settings.flags.catalyst_vibration_intensity_screen
Test: VibrationIntensityScreenTest
VibrationScreenTest
VibrationMainSwitchPreferenceTest
Change-Id: I1dee7fdd59e093bd2dd12204554fe5198e7b76b4
2024-11-28 12:18:16 +00:00
Treehugger Robot
808dc46b06
Merge "Disabled Settings preference in case Satellite's conditions." into main
2024-11-28 12:04:23 +00:00
Harry Cutts
c3dac34127
Merge "Add a11y setting for disabling touchpad system gestures" into main
2024-11-28 11:51:48 +00:00
tomhsu
9ca8709173
Disabled Settings preference in case Satellite's conditions.
...
Conditions
- Satellite session started
- Current subscription for Satellite is carrier based.
Target preference UI in android settings
- preferred network type
- Automatically select network
Flag: com.android.settings.flags.satellite_oem_settings_ux_migration
Fix: b/378409439
Fix: b/378409428
Test: atest pass
Test: Manual test pass
Change-Id: I7aa04b818c8866bf5c891c28372a249c964b066f
2024-11-28 10:37:35 +00:00
Jason Chiu
a25868453c
Update OWNERS for Android Settings
...
Fix: 381373363
Test: N/A
Change-Id: I97f7667dd104b9d8b0f6db72f05444e77458975a
2024-11-28 09:15:16 +00:00
Tom Hsu
01043fdf93
Merge "Fix crash due to no SatelliteManager" into main
2024-11-28 06:19:44 +00:00
tomhsu
55de3bf24b
Fix crash due to no SatelliteManager
...
Flag: EXEMPT bug fix
fix: 381212236
Test: make pass
Change-Id: Ic10ad27c1e84ac29c5c1ccf81c073d6f216ed32e
2024-11-28 04:32:26 +00:00
Tom Hsu
95ac81f485
Merge "Modification for Satellite API change." into main
2024-11-28 04:10:50 +00:00
tomhsu
ad74d1f1fb
Modification for Satellite API change.
...
Input parameter changed from List to Int[]
Flag: com.android.settings.flags.satellite_oem_settings_ux_migration
Fix: b/378410271
Test: atest pass
Test: make pass
Change-Id: I1df1354fa5ceea960d41d33ab34da0a415d5fc82
2024-11-28 04:07:53 +00:00
Wilson Wu
409e5f5697
[Settings] Fix inconsistent ringtone keyword search
...
The settings keyword search result is based on xml.
Hide the phone ringtone preference if the device
support ringtone vibration.
Flag: EXEMPT bugfix
Bug: 379006466
Test: atest PhoneRingtonePreferenceControllerTest
Change-Id: I42d2518c524ab26525445f766e14049c59a8d6ee
2024-11-28 03:42:01 +00:00
Hung-Yeh Lee
281731db2f
Merge "Update resolution name for screen resolution page" into main
2024-11-28 03:28:41 +00:00
tomhsu
22370a8a4a
Make Satellite messageing dynamically change wording by network type
...
Flag: com.android.settings.flags.satellite_oem_settings_ux_migration
Fix: b/378410271
Test: atest pass
Change-Id: I6d2d2ba656a6e2eb26ae103f8af84a1ce5fd49c8
2024-11-28 03:14:40 +00:00
Treehugger Robot
8b4f683af3
[automerger skipped] Merge "Revert "Turn off voice access in 16KB mode"" into main am: 262b9d9b41
am: deec945b4d
-s ours
...
am skip reason: Merged-In Id2c4584835766e9620234233b6594c0dd59b68e9 with SHA-1 cc66323613
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3320718
Change-Id: I46ec0bdd2e459245c751b8bfd57a6e5a24c062fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-28 02:41:10 +00:00
Treehugger Robot
deec945b4d
Merge "Revert "Turn off voice access in 16KB mode"" into main am: 262b9d9b41
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3320718
Change-Id: I806211fb1462e737206e0f2aef762809eaf907f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-28 02:17:10 +00:00
Treehugger Robot
262b9d9b41
Merge "Revert "Turn off voice access in 16KB mode"" into main
2024-11-28 01:35:31 +00:00
Pawan Wagh
5da1293494
Revert "Turn off voice access in 16KB mode"
...
This reverts commit 6de4093876
.
Test: m Settigns
Bug: 335443194
Bug: 340231742
Change-Id: I6b3ab5ba9626dd17c1e6383d8b390fb7c91c9efc
Merged-In: Id2c4584835766e9620234233b6594c0dd59b68e9
2024-11-27 22:32:48 +00:00
Pawan Wagh
cc66323613
Revert "Turn off voice access in 16KB mode"
...
This reverts commit 6de4093876
.
Reason for revert: b/335443194 is fixed now
Change-Id: Id2c4584835766e9620234233b6594c0dd59b68e9
2024-11-27 22:32:08 +00:00
Bill Yi
d86526930f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I79c450b7a53a62f32ae0ae44e47cea9266d40e79
2024-11-27 13:23:14 -08:00
Bill Yi
4871bb17f6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iba35cb7d087b0c2ebb9dd6f00ebccc4fd0bd6558
2024-11-27 13:21:01 -08:00
Evan Chen
79e1918413
Merge "Add deviceId in AssociaitonInfo" into main
2024-11-27 21:06:08 +00:00
Xin Li
b6cfdb21a8
Merge ab/AP4A.241205.013 into aosp-main-future
...
Bug: 370570306
Merged-In: I0d4c48ef6debfa82597db48a4320b0500f330b1b
Change-Id: Ia46be767cd3e134c3f1b37411a72c4e0be28ecee
2024-11-27 12:53:11 -08:00
Aishwarya Mallampati
3e82e6840e
Merge "Convert hidden SatelliteManager APIs to System APIs." into main
2024-11-27 19:33:51 +00:00
Matthew DeVore
4a3af3a735
Show built-in display if topology is visible
...
The topology in the External Displays list will include the built-in
display. For consistency, also show the built-in display along with the
connected displays, so there is a 1:1 correspondence between blocks in
the topology pane and display preference items.
Test: launch external display fragment with zero or one external display, verify built-in display item appears and opens Display settings if tapped
Flag: com.android.settings.flags.display_topology_pane_in_display_list
Bug: b/352648432
Change-Id: Id067034f6af5d0d6fe32f4a8091bc77d1ed75698
2024-11-27 17:50:54 +00:00
Harry Cutts
b253005342
Add a11y setting for disabling touchpad system gestures
...
Screenshots:
* The new setting: http://shortn/_9JL6nMS3cR
* The disabled "Learn touchpad gestures" button and accompanying footer
when the setting is off: http://shortn/_FTcNTQAGYj
Test: disable the setting, check three- and four-finger swipes on the
touchpad stop working; re-enable, check they work again
Test: check the toggle and heading both hide correctly when flag is off
or no touchpad is connected
Test: check the "Learn touchpad gestures" button is disabled with an
explanation when gestures are disabled
Bug: 353947750
Bug: 374965372
Flag: com.android.hardware.input.touchpad_system_gesture_disable
Change-Id: Ie7a6ea4e9ddd34710d07f78ab96598207aac4228
2024-11-27 16:10:54 +00:00
Treehugger Robot
aa34351180
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 7fb8f02f4e
-s ours am: ed4e2b8fc0
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3378198
Change-Id: Idc04055c2c7a301684e4f8bc2ac289f002b2739d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 16:08:36 +00:00
Bill Yi
c2dae62abf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf48d5b7e5
-s ours am: 509dca3230
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3378198
Change-Id: I3918876175c5561c139ff6225b6daaf482bef723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 16:08:32 +00:00
Treehugger Robot
49d0bded17
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 6ab2e734bd
-s ours am: df0f56a8ba
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3378197
Change-Id: I2ef6af6b38ec98392192b73d75dca61916b53fa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 16:08:27 +00:00
Bill Yi
3e3c8df295
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5892f6b9cf
-s ours am: 707f62a539
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3378197
Change-Id: I8144a916095cefbebe26e032673bde8bf815d57b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 16:08:24 +00:00
Treehugger Robot
e199a9e131
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 9bb494666f
-s ours am: 8c5e7cf31b
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3377798
Change-Id: I770b82d92a407c2852c97f0d28ad55388d4de89a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 16:08:15 +00:00
Bill Yi
437f820a37
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f76efce0bf
-s ours am: 1e3c0162cb
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3377798
Change-Id: I452e88d257b7b8c66d8721929a5aca81843e939c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 16:08:03 +00:00
Yiyi Shen
df58c45702
Merge "[Audiosharing] Fix add the secondary buds to audio sharing" into main
2024-11-27 11:08:28 +00:00
Treehugger Robot
ed4e2b8fc0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 7fb8f02f4e
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3378198
Change-Id: I5595a4c81cb5fe774cf988e3f93a314f9dcfac7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 10:56:49 +00:00
Bill Yi
509dca3230
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf48d5b7e5
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3378198
Change-Id: I0b7996dbdc864d14de0394caeb2db72db91f5ea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 10:56:44 +00:00
Treehugger Robot
df0f56a8ba
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 6ab2e734bd
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3378197
Change-Id: I7b613e588c8f201b477b9f432ffecd45a0803cca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 10:56:40 +00:00
Bill Yi
707f62a539
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5892f6b9cf
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3378197
Change-Id: Ie7782d76d64a5328885623a27758673efaebe683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 10:56:37 +00:00
Treehugger Robot
8c5e7cf31b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 9bb494666f
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3377798
Change-Id: I0addb62b8b0203f7dd9a15fc45ef5d7c37435d79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 10:56:31 +00:00
Bill Yi
1e3c0162cb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f76efce0bf
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3377798
Change-Id: Id56e72a5be3a8140c3a333acf3af83175b690349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 10:56:09 +00:00
Azhara Assanova
76b535473d
Merge "[AAPM] Update ActionDisabledByAdminDialog and ExternalSourcesDetails strings" into main
2024-11-27 10:45:34 +00:00
Pawan Wagh
d0ffb9cea6
Merge "Add AppInfo setting for page size appcompat" into main
2024-11-27 10:25:02 +00:00
Yiyi Shen
6eabebec54
[Audiosharing] Fix add the secondary buds to audio sharing
...
onBroadcastMetadataChanged will trigger multiple times between adding
sinks to audio sharing. Avoid clean up device candidate list in
onBroadcastMetadataChanged
Test: manual
Bug: 381166680
Flag: com.android.settingslib.flags.enable_le_audio_sharing
Change-Id: I66693028478303b07879f5e53e60e2128aa9b114
2024-11-27 17:19:23 +08:00
Pawan Wagh
57ca4d313e
Add AppInfo setting for page size appcompat
...
Adding preference which set the page size app compat
for given app.
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Flag: page_size_app_compat_setting
Bug: 371049373
Change-Id: I91d014594e99e174f55010ca57aa19edc2071255
2024-11-27 05:48:12 +00:00
Treehugger Robot
13d90e8024
Merge "Expose the regional preferences page" into main
2024-11-27 03:45:39 +00:00
Zaiyue Xue
54cc16fd91
Merge changes from topics "battery_header_bar0", "battery_header_bar06", "battery_header_bar1" into main
...
* changes:
[PixelCare] Catalyst migration for battery header
Remove BatteryHeaderPreferenceController usage in PowerUsageSummary.
Split battery header text to a separated preference
2024-11-27 02:17:04 +00:00
Treehugger Robot
7fb8f02f4e
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-11-26 22:41:29 +00:00
Treehugger Robot
6ab2e734bd
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-11-26 22:41:29 +00:00
Treehugger Robot
9bb494666f
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-11-26 22:41:29 +00:00
Aishwarya Mallampati
25277a0e8f
Convert hidden SatelliteManager APIs to System APIs.
...
Convert hidden CarrierRoamingNtnModeListener in TelephonyCallback to
System API as well.
Bug: 373955860
Test: Manually tested SMS/MMS/DATA/CALL
Test: 380124630
FLAG: com.android.internal.telephony.flags.satellite_system_apis
Change-Id: I3260f84a4603866b468b187624acf97bf02f31ee
2024-11-26 22:09:52 +00:00