Jakub Rotkiewicz
0ea966fa43
Merge "Bluetooth Codec Settings: Assure flag enabled" into main am: 52038eb6f2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3024725
Change-Id: If1709e6ddf9f805ec263833f6f0f5902fa9d7677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-16 07:58:54 +00:00
Jakub Rotkiewicz
52038eb6f2
Merge "Bluetooth Codec Settings: Assure flag enabled" into main
2024-04-16 07:41:41 +00:00
Jakub Rotkiewicz
c923103142
Bluetooth Codec Settings: Assure flag enabled
...
Assure flag a2dpOffloadCodecExtensibilitySettings is enabled before
calling BluetoothA2dp API.
Bug: 331612641
Tag: #feature
Test: atest SettingsRoboTests:com.android.settings.development.bluetooth.AbstractBluetoothListPreferenceController
Test: atest SettingsRoboTests:com.android.settings.development.bluetooth.BluetoothCodecListPreferenceControllerTest
Merged-In: Iac33a6c95a544230e034807b320c80a727ade307
Change-Id: I2b0ed6c7ac91401b958b206817aca55e0aa47170
2024-04-16 06:08:46 +00:00
Matías Hernández
aee6cfe1c2
Merge "Update notification settings OWNERS" into main am: b5d874d9eb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3036696
Change-Id: Iccf37784f85f46ea7c4f8fec2d5ca9331eebbfb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-10 15:47:55 +00:00
Matías Hernández
b5d874d9eb
Merge "Update notification settings OWNERS" into main
2024-04-10 15:28:38 +00:00
Matías Hernández
319fafe2ac
Update notification settings OWNERS
...
Test: N/A
Change-Id: I3d9f4a3c9649f5d9f0097269e4896163c5d6fe2d
2024-04-10 15:07:34 +02:00
Tom Hsu
d4e4ef8317
Merge "Change phone number preference to unselectable" into main am: 3ecb318354
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3031727
Change-Id: I3f4bb191650b08bead3af5c6b218098d033bf209
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-10 09:40:54 +00:00
Tom Hsu
3ecb318354
Merge "Change phone number preference to unselectable" into main
2024-04-10 09:28:55 +00:00
Treehugger Robot
a72f3f4ecc
Merge "Fix SMS and Calls preference summary displays empty." into main am: 3bfb35c71e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3019410
Change-Id: I8abc1df5716862a6296d50c89681cad73bc9c8b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-09 04:12:38 +00:00
Treehugger Robot
3bfb35c71e
Merge "Fix SMS and Calls preference summary displays empty." into main
2024-04-09 03:55:17 +00:00
hoffc
56ab5b2ab1
Change phone number preference to unselectable
...
Phone number preference of sim slot 0 is unselectable, but other phone number preferences are selectable.
Set all phone number preferences to unselectable.
Bug: 333468727
Change-Id: I70272f89bb9f77694e79463105a299f9c9b52eff
2024-04-09 09:50:42 +08:00
Treehugger Robot
158f1d1ca8
Merge "Fix-up starting style&wallpaper from search" into main am: c37f89dff9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2974798
Change-Id: I9b24f56375b9389ade258be1f9d22d550541e4f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-06 02:27:45 +00:00
Treehugger Robot
c37f89dff9
Merge "Fix-up starting style&wallpaper from search" into main
2024-04-06 02:13:17 +00:00
Ellen Arteca
ab574330de
Merge "Show customized message for private space while choosing lock" into main am: 27b7b2fa50
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3011727
Change-Id: I54ac2698f2dbbe918f204d26d040a6d59127b87d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-06 00:51:18 +00:00
Ellen Arteca
27b7b2fa50
Merge "Show customized message for private space while choosing lock" into main
2024-04-06 00:32:09 +00:00
josephpv
e1acfb3db1
Show customized message for private space while choosing lock
...
The change adds private profile checks in addition to the exisiting
managed profile check to show customized message while choosing lock for
private profile in Pattern, PIN and Password screens.
Bug: 311343571
Test: Verify lock screen message for private space
Change-Id: Ic8173ff8c1af23fc593390acaff4c67390f99b9c
Merged-In: Ic8173ff8c1af23fc593390acaff4c67390f99b9c
2024-04-02 23:12:43 +00:00
hoffc
27255b7a7c
Fix SMS and Calls preference summary displays empty.
...
SMS and Calls preference summary set to summary_placeholder in displayPreference's every call. But displayPreference can be called multiple times, so it may result in SMS and Calls preference summary displays empty when refreshSummary is not explicitly called after displayPreference's last call.
Move the summary placeholder setting to layout xml.
Bug: 331874741
Change-Id: I4c6f34dd813fa9a6d7e2c4df2cac279679ee6960
2024-04-01 14:08:28 +08:00
Treehugger Robot
131f4b8d94
Merge "Fix ImpossibleNullComparison errorprone warning" into main am: 1614fc4180
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3011721
Change-Id: I304445a194fed04a6cd3542eb19678d92d06edbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-26 05:20:22 +00:00
Treehugger Robot
1614fc4180
Merge "Fix ImpossibleNullComparison errorprone warning" into main
2024-03-26 04:59:55 +00:00
Cole Faust
448c18e5ff
Fix ImpossibleNullComparison errorprone warning
...
Protobuf fields cannot be null.
Bug: 253827323
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: Ied830dbf9ddde4c43281feb38a01f01d0750fea7
2024-03-25 11:56:24 -07:00
Tom Hsu
bca026c182
Merge "Settings: Fix force close for telephony callback exceeding limitation" into main am: 380a136e50
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2995004
Change-Id: I66c3770935276a233374b1a6ab8bc23d80c64100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-25 07:03:46 +00:00
Tom Hsu
380a136e50
Merge "Settings: Fix force close for telephony callback exceeding limitation" into main
2024-03-25 06:49:08 +00:00
Jakub Rotkiewicz
47177e048f
Merge "Refactor Bluetooth Codec settings to dynamic ListPreference" into main am: b83471f770
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3008119
Change-Id: I4b6950c4e23599ad50d32ec977653374e8596ad9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-22 08:08:33 +00:00
Jakub Rotkiewicz
b83471f770
Merge "Refactor Bluetooth Codec settings to dynamic ListPreference" into main
2024-03-22 07:51:26 +00:00
Jakub Rotkiewicz
de27acef86
Refactor Bluetooth Codec settings to dynamic ListPreference
...
Fetch supported codecs from native and present to user using
ListPreference.
Bug: 305779598
Bug: 311451118
Bug: 323319530
Tag: #feature
Test: atest SettingsRoboTests:com.android.settings.development.bluetooth.AbstractBluetoothListPreferenceController
Test: atest SettingsRoboTests:com.android.settings.development.bluetooth.BluetoothCodecListPreferenceControllerTest
Merged-In: Iedbfd01c0d1b59df8a073f4e9aedca3913e6d45f
Change-Id: I90ed0d83c3250c64789e27707b0b7bff30043335
2024-03-21 11:06:18 +00:00
hoffc
ef2e171b50
Settings: Fix force close for telephony callback exceeding limitation
...
When sub info changed, new telephony callback will be registered but old telephony callback not un-registered. Finally result in force close for registered telephony callback count exceeding its allowed.
No need to re-registered the telephony callback for one sub if registered.
Bug: 328716180
Change-Id: Ia0c3b311b5b5cc77f061d81ec21250abde2fa9f4
2024-03-21 17:32:13 +08:00
Kangping Dong
c19a1094d7
Merge "[Thread] use dedicated flag for Thread settings" into main am: 33722b512a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3002558
Change-Id: Ib9b4e1dde74dd45f93771ead002fa3bd830ca49c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-14 06:00:53 +00:00
Kangping Dong
33722b512a
Merge "[Thread] use dedicated flag for Thread settings" into main
2024-03-14 05:28:50 +00:00
Pawan Wagh
09561aa513
Merge "Show dialog to OEM unlock the device for 16k dev option" into main am: 72fd15a678
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2974373
Change-Id: I3337702190cfd724670477ef12a62a367be8ae1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-14 04:50:29 +00:00
Pawan Wagh
72fd15a678
Merge "Show dialog to OEM unlock the device for 16k dev option" into main
2024-03-14 04:37:31 +00:00
Kangping Dong
08dd96fd8f
[Thread] use dedicated flag for Thread settings
...
a larger THREAD_ENABLED_PLATFORM flag which guards all Thread-related
platform changes is used for the Thread settings change. But we need
more flexible control of the UX release timeline. So use a dedicated
THREAD_SETTINGS_ENABLED flag here.
Bug: 329384658
Change-Id: Ib5b3ae3c71ccc890fc46af982b021858774938f3
2024-03-13 18:28:45 +08:00
Pawan Wagh
1c1366e968
Show dialog to OEM unlock the device for 16k dev option
...
Device should be OEM unlocked before using dev option. Show dialog
to user to perform OEM unlock. This also checks if user has permission
to do OEM unlock and it is allowed by carrier.
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 295035851
Bug: 320705365
Change-Id: I6470bf7d02424a26621ed67f19f2cd14fa9eea50
2024-03-08 21:36:58 +00:00
Pawan Wagh
ae28bee6fc
Merge "Wipe /data with ext4 before 16K OTA" into main am: 2e090585ca
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2973764
Change-Id: Ia1e7de564f6d3d1e81ff4fc26c5cdb0817fcdcba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-08 18:52:07 +00:00
Pawan Wagh
2e090585ca
Merge "Wipe /data with ext4 before 16K OTA" into main
2024-03-08 06:59:49 +00:00
Pawan Wagh
2951b024dc
Wipe /data with ext4 before 16K OTA
...
16K developer option needs /data partition to be ext4. Wipe
the /data and reformat it to ext4 using RecoverySystem.
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Test: adb shell cat /proc/mounts | grep f2fs
Bug: 295035851
Bug: 320700993
Change-Id: I7ca6f3a7e18d6dbe4e9791b3c83d149365941989
2024-03-08 03:12:40 +00:00
Xin Li
fe3023d496
[automerger skipped] Merge "Merge Android 14 QPR2 to AOSP main" into main am: 12e4524868
-s ours
...
am skip reason: Merged-In I309e4d56dc379680d07bf1e28648ca620b824bad with SHA-1 887741ee49
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2990667
Change-Id: I07caaffd876b2cdfcf53b63a76eea24b3f64c30e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-07 09:57:57 +00:00
Xin Li
ac425a05cb
[automerger skipped] Merge Android 14 QPR2 to AOSP main am: a80653d111
-s ours
...
am skip reason: Merged-In I309e4d56dc379680d07bf1e28648ca620b824bad with SHA-1 887741ee49
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2990667
Change-Id: I5c754c832b54501813c71cdb14b719b33029155c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-07 09:54:56 +00:00
Xin Li
12e4524868
Merge "Merge Android 14 QPR2 to AOSP main" into main
2024-03-07 06:41:13 +00:00
Xin Li
a80653d111
Merge Android 14 QPR2 to AOSP main
...
Bug: 319669529
Merged-In: I309e4d56dc379680d07bf1e28648ca620b824bad
Change-Id: Idce3726e1ade60db7b02c9995ecb43cfa1986ff0
2024-03-06 09:30:06 -08:00
Treehugger Robot
887741ee49
Merge "[Thread] fix wrong kotlin argument name" into main am: dee4388b93
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2984352
Change-Id: I309e4d56dc379680d07bf1e28648ca620b824bad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-05 15:22:33 +00:00
Treehugger Robot
dee4388b93
Merge "[Thread] fix wrong kotlin argument name" into main
2024-03-05 14:31:02 +00:00
Harry Cutts
3c1a5bb3c0
Merge "Touchpad: add Framework Input team as owners" into main am: a3a04112fd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2982053
Change-Id: Idf76ff1bf592de800d224052910927285c47c42e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-05 12:05:02 +00:00
Harry Cutts
a3a04112fd
Merge "Touchpad: add Framework Input team as owners" into main
2024-03-05 11:17:46 +00:00
Daniel Norman
af3c4de3c3
Merge "Add Chun-Ku to A11y Settings OWNERS" into main am: 951cd157de
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2985032
Change-Id: I66e884b014a5162ea02312fd31030bde7beb859d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-29 21:43:19 +00:00
Daniel Norman
951cd157de
Merge "Add Chun-Ku to A11y Settings OWNERS" into main
2024-02-29 21:06:34 +00:00
Daniel Norman
b9e38fa9f0
Add Chun-Ku to A11y Settings OWNERS
...
Change-Id: Ia82f9f2196a33518faf2b7f345ad354990f7cf74
Test: n/a
Bug: n/a
2024-02-29 21:04:02 +00:00
Kangping Dong
abd5f23fe9
Merge "[Thread] add Thread toggle in settings" into main am: 522e193947
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2909326
Change-Id: I8640f2cf4a90203972a5db703ebb3e027224c746
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-29 17:43:51 +00:00
Kangping Dong
e5c4c6e677
[Thread] fix wrong kotlin argument name
...
Fixes build warning:
```
the corresponding parameter in the supertype 'LifecycleEventObserver' is named 'source'. This may cause problems when calling this function with named arguments.
override fun onStateChanged(lifecycleOwner: LifecycleOwner, event: Lifecycle.Event) {
```
Bug: 327098435
Change-Id: I9c50ab508cd39bf2eda02c423deeef9ca5342f4f
2024-03-01 00:49:03 +08:00
Kangping Dong
522e193947
Merge "[Thread] add Thread toggle in settings" into main
2024-02-29 16:45:34 +00:00
Kangping Dong
5fc01ddd6e
[Thread] add Thread toggle in settings
...
Allows a user to disable or enable Thread network / radio from
settings.
In this commit, a toggle is added to Settings > Connected devices >
Connection preferences to control Thread state. See the screenshots
below:
1. Thread is on: https://screenshot.googleplex.com/7FqqbzRX6rGwvSb
2. Thread is off: https://screenshot.googleplex.com/AmfRAhzuukULAAG
3. Thread is disabled by airplane mode: https://screenshot.googleplex.com/7zcesyomrveCqFE
4. Thread is searchable: https://screenshot.googleplex.com/9yFL2jeSuEhJwrS
Requirements:
1. the in-take bug: b/327098435
2. See the screenshot above
3. Test with `atest SettingsUnitTests` and manual tests
4. +2 from Yuwen
5. Flagged by "com.android.net.thread.platform.flags.Flags.thread_enabled_platform"
6. It doesn't need B&R, no preferences are added (the state is in
Android framework (mainline module))
7. Confirmed searchable
8. Code written in Kotlin
Bug: 296990038
Bug: 319077562
Test: atest SettingsUnitTests
Change-Id: Ifa2264b8e59a5112290fd0224cb75ad228732077
2024-02-29 18:05:49 +08:00