Commit Graph

137696 Commits

Author SHA1 Message Date
Pawan Wagh
f224840b37 Merge "Make links in dialog text clickable" into main am: 12ff1e2422
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3072263

Change-Id: Id907c80bdb3f090ea83bd7c74f3df329142b46cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-07 02:29:12 +00:00
Pawan Wagh
12ff1e2422 Merge "Make links in dialog text clickable" into main 2024-05-07 02:13:30 +00:00
Eric Biggers
231766c463 Merge changes I20f2330d,Iaca5b20c into main am: 790e28c431
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3061866

Change-Id: I1216169e50d35d6bd80cd016c55a0db77dc08830
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-06 17:52:05 +00:00
Eric Biggers
790e28c431 Merge changes I20f2330d,Iaca5b20c into main
* changes:
  Remove unused class ShadowKeyStore
  Use KeyProperties.UID_SELF instead of KeyStore.UID_SELF
2024-05-06 17:36:00 +00:00
Kangping Dong
030ebbf23c Merge "fix container designation, it should be system_ext" into main am: 91d5413375
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3074306

Change-Id: Ia19b4a08cb1434b89ebbb6eed89096e1ffb31070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-06 09:09:19 +00:00
Kangping Dong
91d5413375 Merge "fix container designation, it should be system_ext" into main 2024-05-06 08:55:06 +00:00
Dennis Shen
d9ec7f2b34 fix container designation, it should be system_ext
Cherry pick of internal aflag fix ag/27165141

Bug: b/338095619
Merged-In: I8ee2fd5fad529da2026af77f969abbf88e636ac3
Change-Id: Icea56b89944afd85b7760265ea8bfe35e3300f13
2024-05-06 14:35:13 +08:00
Oriol Prieto Gascó
7812cfcee5 Merge "RESTRICT AUTOMERGE Set the container field of aconfig flags" into main am: 14d4df602b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3068647

Change-Id: I90cf0dba57d305ef58f757191600254b0a20a0ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-03 14:26:07 +00:00
Oriol Prieto Gasco
1aaa1f96ca RESTRICT AUTOMERGE am: 0a441b2f06
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3068647

Change-Id: Ia5cc1f4909193ced38a676a7bc84e9795d823bec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-03 14:25:55 +00:00
Oriol Prieto Gascó
14d4df602b Merge "RESTRICT AUTOMERGE Set the container field of aconfig flags" into main 2024-05-03 14:09:48 +00:00
Oriol Prieto Gasco
0a441b2f06 RESTRICT AUTOMERGE
Set the container field of aconfig flags

Test: printflags --format='{package}:{container}:' | grep "::"
Bug: 312769710
Flag: NONE
Change-Id: I4fc69f563ead7206ef48278be4fb4cbcfc9cb1f7
2024-05-03 11:42:26 +00:00
Pawan Wagh
883f1e9dba Merge "Apply OTA from /vendor/boot_otas" into main am: 8c85f8b3c3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3065886

Change-Id: I6bb52915494151ca4cab3508110899f321b239b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 19:54:25 +00:00
Pawan Wagh
8c85f8b3c3 Merge "Apply OTA from /vendor/boot_otas" into main 2024-05-02 19:28:44 +00:00
Pawan Wagh
7d0d858136 Make links in dialog text clickable
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 295035851
Change-Id: I71d4f5cb1e27cd52e6f0c5aaeabc9b3f89520cf1
2024-05-02 18:04:58 +00:00
Pawan Wagh
2c05fc6e52 Merge "Updating strings for 16KB developer option" into main am: ed3a48df6a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3068826

Change-Id: I11d162dcac3ba62aa6b9d3b87473645deacc3242
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 23:44:58 +00:00
Pawan Wagh
ed3a48df6a Merge "Updating strings for 16KB developer option" into main 2024-05-01 23:23:32 +00:00
Pawan Wagh
aaa0a3faf5 Updating strings for 16KB developer option
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 295035851
Change-Id: Ie70b238985b1ccaf3f8893efa6687629d767729e
2024-05-01 21:16:59 +00:00
Pawan Wagh
07f71333bc Merge "Set 16K dev option as checked by default for 16KB page size" into main am: 4c647972fe
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3053444

Change-Id: I17006093b2505056becde9efd2e4ccca3d76b4b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-30 03:47:37 +00:00
Pawan Wagh
4c647972fe Merge "Set 16K dev option as checked by default for 16KB page size" into main 2024-04-30 03:33:54 +00:00
Pawan Wagh
a961dfe289 Apply OTA from /vendor/boot_otas
If BOARD_16K_OTA_MOVE_VENDOR := true is set, OTAs will be present at
/vendor/boot_otas for 16KB developer option. Apply OTA from vendor if
present, otherwise fallback to system OTAs

Test: m, m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 335022191
Change-Id: I534b354c830de2c90fee76502667d5e4ef5a7714
2024-04-29 22:17:46 +00:00
Treehugger Robot
4e01eba72c Merge "Remove redundant call to SetFlagsRule.initAllFlagsToReleaseConfigDefault()" into main am: 4ab7d5bacc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3058523

Change-Id: Id0ba2a35398e129e8855db927ac7dd483edab9af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 12:42:30 +00:00
Treehugger Robot
4ab7d5bacc Merge "Remove redundant call to SetFlagsRule.initAllFlagsToReleaseConfigDefault()" into main 2024-04-26 12:27:51 +00:00
Eric Biggers
f56ead496e Remove unused class ShadowKeyStore
Since the class android.security.KeyStore is going away, remove the
unused test utility class ShadowKeyStore that references it.

(ShadowKeyStore was originally used by a test, but
https://r.android.com/1353609 deleted that test.)

Bug: 326508120
Test: build
Flag: TEST_ONLY
Change-Id: I20f2330dee171a0bfe860a1318dc2f962a80bd19
2024-04-25 19:46:54 +00:00
Eric Biggers
3fd46cc27d Use KeyProperties.UID_SELF instead of KeyStore.UID_SELF
Since the class 'android.security.KeyStore' is going away, the UID_SELF
constant is being moved to a more appropriate location in KeyProperties.
Update code that references this constant to use the new location.  No
change in behavior; the value of the constant remains the same.

Bug: 326508120
Test: build
Flag: NONE mechanical refactoring with no behavior change
Change-Id: Iaca5b20c37b7952df8f26a99b3f7391c5a7f01b6
2024-04-25 19:21:31 +00:00
Jeff DeCew
1d4d5343cc Remove redundant call to SetFlagsRule.initAllFlagsToReleaseConfigDefault()
Change-Id: I1b628f9430cfdd4b1c12deb7e8f4345658f05ca8
Test: atest
Bug: 336802415
Flag: none
2024-04-24 16:56:31 +00:00
Treehugger Robot
90d0111cfd Merge "Tightens Accessibility Settings owners." into main am: 1c7a9269a1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3052422

Change-Id: I09ed68909389eb2fdc9f5f6d97f915a32fa9137b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-23 19:48:49 +00:00
Treehugger Robot
1c7a9269a1 Merge "Tightens Accessibility Settings owners." into main 2024-04-23 19:35:23 +00:00
Anna Bauza
469cc72050 Merge "Integrating new Avatar Picker App in Settings" into main am: cb9cd3fa46
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3051323

Change-Id: I54107dc624b4787281e475e9e7abd469a581461c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-23 12:16:04 +00:00
Anna Bauza
cb9cd3fa46 Merge "Integrating new Avatar Picker App in Settings" into main 2024-04-23 12:10:34 +00:00
Pawan Wagh
c1659eaeee Set 16K dev option as checked by default for 16KB page size
Page agnostic targets use 16KB pages by default. Set the developer
option for 16KB enabled when booted with 16KB page size.

Bug: 303280163
Bug: 295035851
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Change-Id: I01457ce3003ea884c7d1e47aca6b85aab341aa24
2024-04-22 22:22:03 +00:00
Daniel Norman
5c32deeb16 Tightens Accessibility Settings owners.
Per discussion with leads, we'd like to ensure that Settings > Accessibility changes are seen
and approved by the Android Accessibility team. This change prevents default Settings owners
from accidentally approving changes without looping in a11y, while ensuring Settings lead cipson
has approval for emergency changes.

Change-Id: I914067a4d2616c212309b70fb29679f9acfa7643
2024-04-22 16:54:42 +00:00
Anna Bauza
71361dafd3 Integrating new Avatar Picker App in Settings
Bug: 309426522
Test: manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e6c9a08ab7648d884c0d9c3fbbc7f8c74a016624)
Merged-In: Ie5831cec9ebb7a8d5cfabc93300ca2d6cadb944b
Change-Id: Ie5831cec9ebb7a8d5cfabc93300ca2d6cadb944b
2024-04-22 12:15:54 +00:00
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