Commit Graph

129704 Commits

Author SHA1 Message Date
Treehugger Robot
202b3b147b Merge "Settings: remove multiple users search when multi-user not supported" into main am: 5a9826b844
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2827270

Change-Id: I5a9b318d5ce194fc7b4623a1d68085dd43b4a4da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 09:57:05 +00:00
Treehugger Robot
5a9826b844 Merge "Settings: remove multiple users search when multi-user not supported" into main 2023-11-15 09:28:00 +00:00
Howard Chen
8524cc8afd Merge "Disable factory reset in DSU mode" into main am: 8136e6d397
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2814174

Change-Id: I1020e5af5af7f91446d3afd290b643429163eb12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 08:35:33 +00:00
Howard Chen
8136e6d397 Merge "Disable factory reset in DSU mode" into main 2023-11-15 08:07:44 +00:00
Hansen Kurli
6d96b61bfa Merge changes I7a017026,I76a5c940 into main am: 520d7c6758
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2819338

Change-Id: I8341c0f82c7ca00dba4cf2590d37d25f9d1072ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 07:09:08 +00:00
Hansen Kurli
520d7c6758 Merge changes I7a017026,I76a5c940 into main
* changes:
  Remove the code of legacy VPN from Settings
  Remove legacy vpn types from R.array.vpn_types.
2023-11-15 06:35:47 +00:00
lucaslin
755662f72e Remove the code of legacy VPN from Settings
IKEv2 VPN options are now functional, so removing the code of
legacy VPN. (i.e. PPTP, L2TP/IPSec PSK, L2TP/IPSec RSA,
IPSec Xauth PSK, IPSec Xauth RSA, IPSec Hybrid RSA)

Bug: 161776767
Test: Build pass, m
Test: Flash and manual test
Test: atest SettingsUnitTests:com.android.settings.vpn2
Change-Id: I7a017026adec2452254c78ef5e0ebf61ce1a9ecf
2023-11-14 16:01:16 +08:00
Hansen Kurli
e554d06665 Remove legacy vpn types from R.array.vpn_types.
Remove the legacy vpn types from R.array.vpn_types.
Since the array of vpn types are now all allowed, the case of
using mAllowedTypes is no longer needed and removed.

Since R.array.vpn_types no longer match the constants in
VpnProfile, a conversion is needed from the VpnProfile constants
to the selected type position and vice versa.

Bug: 161776767
Test: m
Test: Flash and manual test setup VPNs
Change-Id: I76a5c940acf08c6d6adfe6ff270f39808abf88ab
2023-11-14 16:00:59 +08:00
SongFerng Wang
919149ceee Merge "Add a config to hide "Enable wireless display" menu" into main am: 6a04355cb3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2647051

Change-Id: I7aea20dab1bc3cede5a0d13475d9c3933d656b5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14 05:23:18 +00:00
SongFerng Wang
6a04355cb3 Merge "Add a config to hide "Enable wireless display" menu" into main 2023-11-14 04:52:43 +00:00
hoffc
f336657508 Settings: remove multiple users search when multi-user not supported
When multi-user feature not supported in framework, SettingsIntelligence should not build the index of multiple users for searching.

Return empty list when multi-user feature not supported during building search index.

Change-Id: Id2fb8f2066784d63bbfd5c396da88b04306a3563
Bug: 310108420
2023-11-13 14:36:32 +08:00
Hansen Kurli
3a33f7178f Merge "Catch UnsupportedOperationException of startLegacyVpn" into main am: 485e8800ed
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2822270

Change-Id: I84a308d94aed266f5125977cd7a385c315a72047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 06:05:58 +00:00
Hansen Kurli
485e8800ed Merge "Catch UnsupportedOperationException of startLegacyVpn" into main 2023-11-13 05:27:07 +00:00
Bruno Kremp
0d0736c46c Add a config to hide "Enable wireless display" menu
Add config_show_wifi_display_enable_menu to control whether to
display "Enable wireless display" menu at Settings->
Connection preference->Cast.

If persist.debug.wfd.enable is 1, "Enable wireless display" menu will be
shown at Settings->Connection preference->Cast. Add a config to hide the
menu when needed.

setHasOptionsMenu is invoked in onActivityCreated of the parent class of
WifiDisplaySettings. No need to invoke it in onCreate.

Co-authored-by: Jingqiu Zhao <jingqiu.zhao@sony.com>

Test: manual test
Bug: 289532978
Change-Id: I146fb8188e783fed98d9fe56050e384bc4cca052
2023-11-10 10:43:40 +01:00
Hansen Kurli
eea7c3c8d5 Catch UnsupportedOperationException of startLegacyVpn
startLegacyVpn may throw UnsupportedOperationException. Instead
of crashing Settings, catch the exception and show a Toast.

Bug: 161776767
Test: Manual test, connect legacy vpn profile and observe Toast.
Change-Id: I5947f2043aa68478f659b34531202f225eab4568
2023-11-08 20:39:00 +08:00
SongFerng Wang
4362f09737 Merge "Fix the burst callback issue on the repository" into main am: a23320eedd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2780887

Change-Id: Ia0f4f76a704973e123cfe5e4c2d571bbea0c861f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 09:41:19 +00:00
SongFerng Wang
a23320eedd Merge "Fix the burst callback issue on the repository" into main 2023-11-07 09:11:06 +00:00
Treehugger Robot
3521df9dca Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main am: 85ca373e75
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2810325

Change-Id: I0ac76dbfb034e1a9856b231aa59b3ec0197914d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 04:48:36 +00:00
Treehugger Robot
85ca373e75 Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main 2023-11-07 04:08:35 +00:00
t
784e52c9be Disable factory reset in DSU mode
Bug: 302317901
Test: build
Change-Id: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
2023-11-02 08:08:19 +00:00
Mengjun Leng
1871b8155f Fix the burst callback issue on the repository
Prevents the callback when no sub entities changed to reduce
UI jank, besides, makes both variables mAvailableSubInfoEntityList
and mActiveSubInfoEntityList thread-safe.

Test: Manual
Bug: 279387799

Change-Id: I04f2a780de54e7528be6aeaf62bc8162e499aa97
2023-11-02 07:18:54 +05:30
Roshan Pius
ad01bf88a7 settings(payments): Use newly exposed formal API for CardEmulation.getServices()
Bug: 307352220
Test: Compiles
Merged-In: Iaaa37a8e55d755f8abcbaa26c31bf7962e166e96
Change-Id: Iaaa37a8e55d755f8abcbaa26c31bf7962e166e96
2023-10-31 18:19:37 +00:00
Treehugger Robot
ff03ce88ff Merge "settings(nfc): Remove NFC beam settings" into main am: e8df63f148
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2808364

Change-Id: Ic8c0f7ceec443aca5172cd38ede765781640dc0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 21:03:30 +00:00
Treehugger Robot
e8df63f148 Merge "settings(nfc): Remove NFC beam settings" into main 2023-10-30 20:26:18 +00:00
Roshan Pius
ad565c49dc settings(nfc): Remove NFC beam settings
This API was already deprecated and not supported for a few years. The
API was completely removed in Android U (see b/236980291).

Bug: 307352220
Test: Verified NFC settings works correctly
Merged-In: I40974a26d170cf3eeec18e6a07a21f6c420eca9e
Change-Id: I40974a26d170cf3eeec18e6a07a21f6c420eca9e
2023-10-30 19:42:47 +00:00
Cassie Wang
16e99c187f Merge "Add a config to show the Vpn options menu." into main am: 5abd3420c4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2685406

Change-Id: Ib8a236bd666204b48faac0189fbcc1acfcb3e8ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 06:13:58 +00:00
Cassie Wang
5abd3420c4 Merge "Add a config to show the Vpn options menu." into main 2023-10-23 05:53:32 +00:00
Treehugger Robot
ad49e33f01 Merge "Only allow clearing of Euicc Data by owner or demo user" into main am: f1cbe74e08
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2264402

Change-Id: Iaf9eed774382c735bed78f43451b89b61b4e275e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 09:08:47 +00:00
Treehugger Robot
f1cbe74e08 Merge "Only allow clearing of Euicc Data by owner or demo user" into main 2023-10-20 08:33:27 +00:00
Edward Savage-Jones
922fc6067d Only allow clearing of Euicc Data by owner or demo user
Secondary users should not be able to erase downloaded SIMs
is a similar way that they are not be able to factory reset
the device.

Bug: 303488763
Test: On a device with FEATURE_TELEPHONY_EUICC enabled,
      create secondary user, enter Settings->System->Reset Options
      there should be no option to 'Erase downloaded SIMs'
Change-Id: I4f5326732822bc322ab13a00937f94232ca69228
2023-10-20 08:20:01 +02:00
Xin Li
7b262e34b7 Merge "Merge 10952656" into aosp-main-future 2023-10-19 17:58:36 +00:00
Eric Biggers
3eb12fab5e Merge "Unlock non-secure users automatically (2/2)" into main am: fcaf0aceeb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2661955

Change-Id: If4352c5ae76251422fefa6f0aef7838c34a85266
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 00:05:20 +00:00
Eric Biggers
fcaf0aceeb Merge "Unlock non-secure users automatically (2/2)" into main 2023-10-18 23:50:43 +00:00
Xin Li
596efc7e94 Merge 10952656
Merged-In: Ib02ae9caef06a46938947806dac8aabb1fa12d94
Change-Id: Ib1f728fef6241ddd7a2ce1522093f4a62a4a9d81
2023-10-18 15:11:48 -07:00
Treehugger Robot
c711d1c39a Merge changes from topic "angle-developer-option-toggle1" into main am: 0481d6a318
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2794056

Change-Id: I3db0eb07ffd56aeb80855f13cca6f07caea2f8af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18 20:39:22 +00:00
Peiyong Lin
a62d014687 [Cherry-pick] Add debug property to safe guard ANGLE developer option UI. am: 3182b0e298
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2794055

Change-Id: Ib6b009eeead559c0299d4f76dd927c5a5fc87d20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18 20:39:19 +00:00
Peiyong Lin
3c924fd848 [Cherry-pick] Add warning on enabling ANGLE. am: d3c75bd9eb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2794036

Change-Id: I8a93c58cf80f113277fc269e42c02e52e9d702c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18 20:39:15 +00:00
Treehugger Robot
0481d6a318 Merge changes from topic "angle-developer-option-toggle1" into main
* changes:
  [Cherry-pick] Allow ANGLE developer option toggle UI enabled if ANGLE is enabled.
  [Cherry-pick] Add debug property to safe guard ANGLE developer option UI.
  [Cherry-pick] Add warning on enabling ANGLE.
2023-10-18 19:50:40 +00:00
Arnab Sen
ae0261e220 Unlock non-secure users automatically (2/2)
...while moving apps or media content from internal storage to
adopted storage and vice-versa.
Currently, for FBE enabled devices, whenever move is triggered for
either app or media content, there is a prompt for user to enter their
lockscreen credentials in order to unlock storage if the user has one.
But if the user does not have a lockscreen credential set and is not
running,the wizard page is stuck. This leads to a bad user experience.

StorageWizardMigrateConfirm & StorageWizardMoveConfirm uses
ChooseLockSettingsHelper to launch the authentication method set by the
user in order to unlock the storage. But, it does not handle the
use-case where user has no authentication set and not running, causing
return to the wizard activities, thus blocking the flow. This CL solves
the issue by, checking if the user is not secure, attempt unlock the
storage otherwise prompt the user to unlock.

Bug: 305978187
Test: manual
Steps
 1. Create multiple users with atleast one user with an authentication
   method setup and one without authentication (apart from system user)
 2. Install same apps for all users and also add some content to the
    media storage.
 3. Format an SD Card as adopted.
 4. Attempt to move content.
 5. Check that the wizard is not stuck and it is prompting the locked
    users to authenticate.
 6. Reboot
 7. After reboot, Go to Settings > All Apps > app_name
    > Storage & Cache
 8. Tap on "Change" under Storage and Select Adopted storage.
 9. Check the same as Step#5

Change-Id: Ib72e9073386457711cc1d2ba745a24cbea91cd8a
2023-10-18 23:26:28 +05:30
Peiyong Lin
34d308924e [Cherry-pick] Allow ANGLE developer option toggle UI enabled if ANGLE is enabled.
Previously the ANGLE developer option toggle UI was disabled by default
and a user would need to use adb command to set the debug property to
true to enable it, and every reboot would reset the debug property to
false again and hence disable the toggle UI again. However, since ANGLE
is still in experiment, we would like to make sure it's not easy to
enable but easy to disable. This patch keeps ANGLE toggle UI enabled
when ANGLE is enabled so that users can easily disable. Once ANGLE is
disabled, if the debug property is not set to true, the toggle UI will
remain disabled.

Bug: b/293503000
Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest
Test: atest SettingsRoboTests:GraphicsDriverEnableAngleAsSystemDriverControllerTest
Change-Id: I2e63431cd0d8cf4712fc278646627fbf34a2b542
Merged-In: I2e63431cd0d8cf4712fc278646627fbf34a2b542
2023-10-17 21:07:48 +00:00
Peiyong Lin
3182b0e298 [Cherry-pick] Add debug property to safe guard ANGLE developer option UI.
Add a debug property to guard ANGLE developer option UI, only when the
debug property is enabled will ANGLE developer option UI be enabled.

Add further clarification in the text to indicate that this is an
experimental feature.

Bug: b/287909344
Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest
Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerTest
Change-Id: Ife31f4b0426f3ce107f86cfbaf3f1aeca567e250
Merged-In: Ife31f4b0426f3ce107f86cfbaf3f1aeca567e250
2023-10-17 21:06:05 +00:00
Peiyong Lin
d3c75bd9eb [Cherry-pick] Add warning on enabling ANGLE.
Enabling ANGLE on incompatible devices may cause some applications to
crash, add a warning.

Bug: b/287909344
Test: atest SettingsRoboTests:GraphicsDriverEnableAngleAsSystemDriverControllerTest
Change-Id: I4f856ee1912a59052a6aaf7dff087ce1b649935e
Merged-In: I4f856ee1912a59052a6aaf7dff087ce1b649935e
2023-10-17 21:02:47 +00:00
Treehugger Robot
72943317d2 Merge "AirplaneModePreferenceController: Fix NPE when toggle is hidden" into main am: 3eea9e53a1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2767862

Change-Id: Id9c81a0d31b4a0452d614b68b6850342a94ab3aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 02:37:41 +00:00
Treehugger Robot
3eea9e53a1 Merge "AirplaneModePreferenceController: Fix NPE when toggle is hidden" into main 2023-10-16 01:52:44 +00:00
Graciela Putri
8319a77527 Merge "Add aspect ratio settings to advanced category children" into udc-qpr-dev am: 6e9666ab53
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956690

Change-Id: Ib02ae9caef06a46938947806dac8aabb1fa12d94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 09:45:46 +00:00
Graciela Putri
6e9666ab53 Merge "Add aspect ratio settings to advanced category children" into udc-qpr-dev 2023-10-12 09:30:41 +00:00
Graciela Putri
94f7219937 Merge "Remove 4:3 aspect ratio option for foldables" into udc-qpr-dev am: 2147c152ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007832

Change-Id: Iab27c31c7512f4f7e48d8b10d410044c4db39aa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 09:28:31 +00:00
Graciela Putri
2147c152ac Merge "Remove 4:3 aspect ratio option for foldables" into udc-qpr-dev 2023-10-12 09:07:50 +00:00
Treehugger Robot
8f4a7e7505 [automerger skipped] Merge "Clean up obsolete aliases for Truth." into main am: 4b0bf8f98d am: b06310a63f am: 409a6b2492 am: 23c571ff2b -s ours
am skip reason: Merged-In I8aab463c74d5e869d949a2b712886a9cc4d15709 with SHA-1 15e17e0119 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776829

Change-Id: Ibf9478072143dfbe6af85271c9c4e5aa5c49626b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 02:16:33 +00:00
Treehugger Robot
23c571ff2b Merge "Clean up obsolete aliases for Truth." into main am: 4b0bf8f98d am: b06310a63f am: 409a6b2492
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776829

Change-Id: I8873863c35e54bc92f5aae982fe159a5e5e46438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 01:43:51 +00:00