Commit Graph

138962 Commits

Author SHA1 Message Date
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
Yuchen Dong
64f4619d68 Fix SmartForwardingActivity crash at screen rotation
When SmartForwardingActivity attempts to set the Toolbar to ActionBar
in #onCreate, an llegalStateException is thrown. This is because
SmartForwardingFragment sets the default action bar by window decor to
ActionBar first by updating the title in #onCreatePreferences.
This occurs in cases where SmartForwardingFragment is created in the
process of being SmartForwardingActivity created, such as when rotating
SmartForwardingActivity.

Use getActivity()#setTitle instead of getActionBar()#setTitle.

Test: manual
Bug: 314232525
Change-Id: I041d62605ba666ecce041086854e675d9b19ac45
2024-04-01 16:19:22 +09: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
Android Build Coastguard Worker
561180d25d Merge cherrypicks of ['googleplex-android-review.googlesource.com/26720439'] into 24Q2-release.
Change-Id: I1da88a5445a7c5dc16faf0cbce49f5bb770f141f
2024-03-29 18:58:53 +00:00
Bill Yi
58f3a79835 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import

Bug: 328603775
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4efec2a99127aaacbabf8e52ccfc6739c15ae466)
Merged-In: I4aec59d922f27586556054ad09551347b0502c73
Change-Id: I4aec59d922f27586556054ad09551347b0502c73
2024-03-29 18:50:34 +00: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
Android Build Coastguard Worker
bc5ec2b4e2 Merge cherrypicks of ['googleplex-android-review.googlesource.com/26424687'] into 24Q2-release.
Change-Id: Ia6a9ea09ee3fa07ac349fb15f907ed9b401ac313
2024-03-15 00:04:11 +00:00
David Liu
d469ee1ebf Fix toolbar keyboard navigation and touch.
- toolbar default has touchscreenBlocksFocus enabled which make toolbar not focusable when touch screen present. Explicitly set touchscreenBlocksFocus to false make the toolbar can be focus when keyboard navigation.
- Remove focusableInTouchMode which breaks normal touch control. Read https://android-developers.googleblog.com/2008/12/touch-mode.html for more details.

Fix: 327025582
Fix: 324420544
Test: manual test with keyboard and touch navigation
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9b63fbb772c0d6855f2bc4ddd79e9303102bdcd8)
Merged-In: I6cad869e3a51926405a6f3ae894daa5416050bf8
Change-Id: I6cad869e3a51926405a6f3ae894daa5416050bf8
2024-03-14 23:58:24 +00: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
Android Build Coastguard Worker
bc99244e96 Merge cherrypicks of ['googleplex-android-review.googlesource.com/26385510', 'googleplex-android-review.googlesource.com/26561927'] into 24Q2-release.
Change-Id: I9906d2bd5eb7b4410e363a26f1e9855ae785eea9
2024-03-14 01:01:06 +00:00
Wilson Wu
2ffd023d17 Fix keyboard vibration settings delay
The default settings observer delay is 10s for
background service. It cause the apps get the
settings update delay and lead a unsync behavior.

Update the settings change without delay.

Bug: 327094397
Test: Manual test with bug steps
Test: atest KeyboardVibrationTogglePreferenceControllerTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f2174611b8be192815f16e0ebc42eebfe3bfca0d)
Merged-In: Ib1c23ec9e1442e8397c7a36ffa157594ac64a9b3
Change-Id: Ib1c23ec9e1442e8397c7a36ffa157594ac64a9b3
2024-03-14 00:59:38 +00:00
Vaibhav Devmurari
9d0f23c862 Modify PK Settings page to make it more user friendly
PK Settings page:
    - Show current PK layout selected for the current user profile and current IME language instead of a list of IMEs

PK layout mapping page:
    - Show IME name in header only if multiple active IMEs
    - Show the PK layout selection criteria (Automatic v/s User selected)

Bug: 325925410
Bug: 326195401
Test: manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8754f114ac48cb80c367c11769947553f5c56034)
Merged-In: I93a2e169742a800fa116fa5d55e1a91e5548cebb
Change-Id: I93a2e169742a800fa116fa5d55e1a91e5548cebb
2024-03-14 00:59:27 +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
Android Build Coastguard Worker
889d33f319 Merge cherrypicks of ['googleplex-android-review.googlesource.com/26459632'] into 24Q2-release.
Change-Id: I439d6888ed42174a6dfdf69a9f6d4f6ca8542fe3
2024-03-07 20:58:00 +00:00
Wilson Wu
08308b2ee8 Add fixed amplitude check for keyboard vibration
Make sure the keybaord vibration settings only show
up when fixed amplitude provided to avoid any unsync
behavior with platform.

Bug: 326027376
Test: atest KeyboardVibrationTogglePreferenceControllerTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fd45101eee85da95a3de8d4ce2bfd01824e282c3)
Merged-In: I3b4e06660e3eaa6ce537b72831073f092cba37e2
Change-Id: I3b4e06660e3eaa6ce537b72831073f092cba37e2
2024-03-07 20:54:55 +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
Android Build Coastguard Worker
7147196c42 Snap for 11526283 from a6f283382a to 24Q2-release
Change-Id: I97724f2b3f3a2afab2dc784dad328b9cb963c3e2
2024-03-05 00:49:21 +00:00
Treehugger Robot
a6f283382a Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-03-04 17:25:26 +00:00