Commit Graph

166 Commits

Author SHA1 Message Date
Florian Mayer
fd9c686cd9 Merge "Move bootloader_override property" into udc-dev am: f58ea4671e am: ab14241e64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22234234

Change-Id: I8c841b5198babacd18ca85c581992ff89e3600a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 21:25:50 +00:00
Florian Mayer
f58ea4671e Merge "Move bootloader_override property" into udc-dev 2023-04-07 20:06:25 +00:00
Florian Mayer
1ef1073694 Move bootloader_override property
Bug: 274953227
Change-Id: I391329a14a5dda741103bd0097fee65ea97c866a
2023-04-07 18:32:30 +00:00
Avinash Vadlamudi
a17651940a Merge "[Auto Pin Confirm]: Trigger PIN verification when auto confirm setting is being turned on or off" into udc-dev am: 5e8769bcc5 am: 2d6a86a8e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290364

Change-Id: Ia830bd387c52eb1f50096534ca8ee5bafc0b7fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29 06:18:25 +00:00
Avinash Vadlamudi
a4cf551d25 [Auto Pin Confirm]: Trigger PIN verification when auto confirm setting is being turned on or off
- Fix the logic to set the pin_auto_confirm setting before triggering the password save workflow in ChooseLockPassword

Bug: 275385372
Test: atest AutoPinConfirmPreferenceControllerTest
Test: Manual Test
Change-Id: Id6774bc9afcd6d3161e023dc52911ae3e1f556c9
2023-03-28 15:33:40 +00:00
Bhavuk Jain
1a7bf89f13 Merge "Fixed tests based on return value of PIN length" into udc-dev am: 3635ddb279 am: faac0c0b56
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22287122

Change-Id: I172d01f97f5fcba4c6746afccda9865746104950
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-27 10:27:05 +00:00
Bhavuk Jain
e08f8a466d Fixed tests based on return value of PIN length
This CL aims at fixing the tests in Settings due to the fact that
earlier PIN length was being returned as a long whereas now it's being
returned as an integer now.

Bug: b/267222046
Test: atest AutoPinConfirmPreferenceControllerTest
Change-Id: Iee28557e25a411c2ce6a6245afaafb890b753261
2023-03-27 07:03:46 +00:00
Kweku Adams
7c82ea06a2 Merge "Revert "Remove duplicate strings."" into udc-dev am: 9a087d6c19 am: eaba347a70
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22106646

Change-Id: I903e6289111448ffe71856b1830b914823ff1953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 20:45:56 +00:00
Lifu Tang
caa1b51ef2 Revert "Remove duplicate strings."
Revert submission 19748582-settings_yesno

Reason for revert: Common strings in English could be translated into different strings in other languages.

Reverted changes: /q/submissionid:19748582-settings_yesno

Bug: 272603842
Test: build and open Settings app
Test: atest SettingsRoboTests
Change-Id: Iaad301c5513478fb95e40987ea3ccb4f923d71fa
2023-03-15 22:39:24 +00:00
Andreas Miko
8b71dc930d Merge "Add setting to disable PIN animation and password" into udc-dev 2023-03-01 12:46:04 +00:00
Andreas Miko
9e364dcebf Add setting to disable PIN animation and password
Test: Unit - atest SettingsRoboTests
Test: Manual - Set PIN lock and enabled/disabled the setting to observe animation change during PIN entry
Bug: b/204799468
Change-Id: I587b993ef5515a075442e82ebafae88bebdffc20
2023-02-28 10:30:28 +00:00
Andreas Miko
387b788b19 Add setting to disable PIN animation and password
Test: Unit - atest SettingsRoboTests
Test: Manual - Set PIN lock and enabled/disabled the setting to observe animation change during PIN entry
Bug: b/204799468
Merged-In: I587b993ef5515a075442e82ebafae88bebdffc20
Change-Id: I587b993ef5515a075442e82ebafae88bebdffc20
2023-02-28 10:29:58 +00:00
Florian Mayer
9d99ab422a Disable MTE developer option if device config overrides it
On the backend, the device config would already override the setting by
the UI.

(cherry picked from commit 65116faa29)

Bug: 269523554
Merged-In: Idd249e060a275b58a399349f202fc68b42964eb0
Change-Id: Idd249e060a275b58a399349f202fc68b42964eb0
2023-02-23 17:58:33 +00:00
Florian Mayer
1d86531600 Merge "Disable MTE developer option if device config overrides it" 2023-02-23 17:57:59 +00:00
Avinash Vadlamudi
670f1b2718 Merge "[Auto Pin Confirm]: Fix the usage of LockPatternUtils#isAutoPinConfirmFeatureAvailable method" into udc-dev am: 2a619718ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21537112

Change-Id: I7fcc3676caa7109a4893b438dcaff444bbec13e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 12:06:02 +00:00
Avinash Vadlamudi
e644d26b95 [Auto Pin Confirm]: Fix the usage of LockPatternUtils#isAutoPinConfirmFeatureAvailable method
- The method isAutoPinConfirmFeatureAvailable is changed to static, so refactoring the code to use it properly.

Bug: 270315296
Test: Manual Test
Test: atest AutoPinConfirmPreferenceControllerTest
Test: atest ChooseLockPasswordTest
Change-Id: Idecaeca296b9ae9acdd0c094dcbb736db31b74b3
2023-02-23 05:56:58 +00:00
Eric Biggers
bcee8ce1af Stop calling LockPatternUtils.setVisiblePasswordEnabled()
Since the removal of support for Full Disk Encryption (FDE) in favor of
File Based Encryption (FBE), this method has been a no-op.

Bug: 208476087
Test: atest ShowPasswordPreferenceControllerTest.  Note,
      isAvailable_whenNotVisible_isFalse fails both before and after.
Change-Id: Ifb8fc93757366240cf37e4b9a600c2034302919e
2023-02-18 00:24:40 +00:00
Florian Mayer
65116faa29 Disable MTE developer option if device config overrides it
On the backend, the device config would already override the setting by
the UI.

Bug: 269523554
Change-Id: Idd249e060a275b58a399349f202fc68b42964eb0
2023-02-16 15:37:38 -08:00
TreeHugger Robot
834dda9105 Merge "Add persistent MTE toggle to development options." 2023-02-14 02:40:01 +00:00
Florian Mayer
5b93b73df1 Add persistent MTE toggle to development options.
Bug: 245624194
Change-Id: I83283eb74360ec0eccd6b236b42eb987a580ec2c
2023-02-09 13:26:27 -08:00
Florian Mayer
e3031c98ba Use bootloader_override from boot namespace
Bug: 267234468
Change-Id: I6e6229504a452d8a82f8928a79e10b342478524c
2023-01-31 23:52:03 +00:00
Avinash Vadlamudi
4c8ad8f911 [Auto Pin Confirm]: Changes to allow PIN auto confirm feature to be controllable by the user
- Add SwitchPreference to allow user to control the pin auto confirm feature
- Add Checkbox option during the PIN setup in Security app
- Disable the opt-in checkbox during SUW entry point for PIN setup
- Update SwitchPreference availability appropriately according to current PIN length
- Update the pin_auto_confirm setting appropriately according to state of switchPreference or checkbox state (in PIN setup)
- Update the error-message when PIN Too short to let user know six digit is recommended

Bug: 262926000
Bug: 262936383
Bug: 262934702
Bug: 262935305
Test: Manual Test
Test: atest SettingsRoboTests
Change-Id: Ib9e09bd5ce44652158e77f80e8be19c4dd50f3bf
2023-01-30 14:35:41 +00:00
xinghailu
897fd74731 Cleanup some plurals in Settings
Change <one> to <1> in string res file, and update related java files.
Test: Update, existing test still pass.
bug: 199230342

Change-Id: Idd0ba3c6adc060da21574d98f8ed765fae00cef8
2022-12-22 16:05:13 +08:00
Florian Mayer
8b9d792692 [MTE] allow device policy to control setting
Test: unit tests
Test: TestDPC with COPE and DO
Test: make RunSettingsRoboTests
Bug: 244290023
Change-Id: I0e03d0dbe44ef595d813652f85529c1fe5fd6cec
2022-12-14 00:54:46 +00:00
Florian Mayer
cd68fe78a0 [MTE] support force_on for device_control override
driveby: remove period for force_off message.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=MemtagHelperTest
Bug: 245624194
Change-Id: I1c56af377925fd58c90bb346d9d003249c5e547c
2022-12-03 02:27:29 +00:00
Florian Mayer
2a1f7cb453 [MTE] fix broken test
Bug: 245624194
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MemtagHelperTest
Change-Id: I71ad79270a5f538bf7a447345aa610c514683fec
2022-11-21 11:19:06 -08:00
Florian Mayer
5696dde950 Add MTE Settings.
MTE is a technology to help prevent exploitation of some security bugs.
We want to offer users that want to trade off a slight reduction in
performance for higher security the option to do so from the settings
menu.

Test: make RunSettingsRoboTests
      check UI manually
Bug: 245624194
Change-Id: Ifbb76e124142ae843ce90bd604ae8417d65fcc7b
2022-11-09 18:21:42 -08:00
Bonian Chen
7c3f04aa11 [Settings] configuration for hidding SIM lock UI
Hide SIM lock UI based on configuraion.

Bug: 240515161
Test: test cases and local testing
Change-Id: I870c0b53112db56b7bc80bfd585f6f7b3cf82737
2022-10-21 10:59:11 +00:00
Tsung-Mao Fang
05412c37c7 Make preference unselectable
Because Encrypt phone is not an entry which can launch to next page,
let's make it unselectable now.

Change-Id: I860c76c501fccc488b2e120a4702c652f1bee134
Test: Manual test
Fix: 249193859
2022-09-30 15:15:50 +08:00
TreeHugger Robot
0c57c18276 Merge "Fix Incorrect Trust Agent Count" into tm-qpr-dev am: 9f1dba6017 am: 32c2f9b75f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19669514

Change-Id: I4ca6c2bf0fe35d88d99a1b1e96c074e2734993b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-06 19:46:23 +00:00
Derek Jedral
6fec2be00d Fix Incorrect Trust Agent Count
The total number of trustagents can still be incorrect if the user
enables a trustagent, and then the trust agent component gets disabled,
since the user does not manually toggle the preference themselves. Fixed
by switching back to the original method of using TrustAgentManager, but
also pass a flag that allows us to choose on whether we want to filter
the trustagents based on whether it has an activity (which not all
trustagents are guaranteed to have).

Bug: 240969157
Test: Local test + atest
Change-Id: I5106859f61ddf36c1bf008da18be889ceaf27a8d
2022-08-30 17:43:11 +00:00
Kweku Adams
5949fccc7a Remove duplicate strings.
"Yes" and "no" were redefined many times with no clear benefit, so this
consolidates them into one definition.

Bug: 243843096
Test: Build, install, and open the Settings app
Test: atest SettingsRoboTests
Change-Id: I5f84d09f223efd478461ded93aeac82bf7b128d8
2022-08-26 00:07:08 +00:00
Adam Bookatz
8311f68065 Fix Settings getProfileIdsWithDisabled usage
In two places, Settings uses getProfileIdsWithDisabled intending to
restrict itself to *managed* profiles, but actually allows for any type
of profile.

Since the declared intent is to only deal with managed profiles, we
update the code to only consider managed profiles.

On devices that only have managed profiles (currently almost all
devices), this cl is a no-op.

Bug: 230495929
Bug: 230534572
Bug: 170249807
Test: com.android.settings.UtilsTest
Test: make RunSettingsRoboTests -j
Change-Id: Id04d45839ef61080b00ca2f91525718cb3a85120
2022-04-27 18:34:07 -07:00
Ayush Sharma
f1255b4298 Enable Encryption & Creds UI for Secondary users
Bug: 123211155
Test: Manual,m -j RunSettingsRoboTests
Change-Id: Ic669102c72a5270423f000d5326b48c91901a0ed
2022-03-23 19:00:34 +00:00
Aaron Liu
e0f4e795ce Home Controls: Add Device Controls settings
Add a setting that would not require authorization for device controls.

Fixes: 216102581
Test: manual
Change-Id: I1fd98a2fbc1cea44d0b2c3612dd1616a053af394
2022-02-23 21:13:06 +00:00
Yuri Ufimtsev
78edc210de Merge "Move all the shared Screen Lock details into a reusable utility class" 2022-02-11 17:06:12 +00:00
Yuri Ufimtsev
c10c16bb39 Move all the shared Screen Lock details into a reusable utility class
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.security.ChangeScreenLockPreferenceControllerTest
Test: atest SettingsUnitTests:ScreenLockPreferenceDetailsUtilsTest

Bug: 215515298
Change-Id: I46543d35ce4dc2fee85ad1c55886b272de113768
2022-02-11 10:55:16 +00:00
Derek Jedral
a03b66952e Merge "Fetch active trustagents from LockPatternUtils" 2022-02-10 18:17:44 +00:00
Tsung-Mao Fang
34f0724a63 Ignore all broken tests
Test only should fix these broken tests soon.

Test: Attach ag/16819270 and run pass all tests
Bug: 218799125
Bug: 218798403
Bug: 218798003
Change-Id: I4914adb475802211d9918a416950b01854c9a390
2022-02-10 10:18:42 +00:00
Derek Jedral
c1c39b6717 Fetch active trustagents from LockPatternUtils
LockPatternUtils is what drives the TrustAgentsPreferenceController, and
therefore should be used to determine how many active trust agents there
are. TrustAgentManager filters on whether preferences are displayable in
the advanced settings app, which does not represent if the agent is
actually active.

Test: make RunSettingsRoboTests
Bug: 217217034
Change-Id: I8cae74d322b8e0658aabfe7d4646e9a299af4934
2022-02-09 18:55:36 +00:00
Yuri Ufimtsev
c92720bdb0 Change the default Controller keys for RoboTests
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.security.ManageTrustAgentsPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.security.ScreenPinningPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.security.SimLockPreferenceControllerTest

Bug: 214944423
Bug: 214944992
Bug: 214945259
Change-Id: I9b3bac5fcf57a1c99253c631bc26e6957cad8938
2022-01-19 14:22:16 +00:00
Tsung-Mao Fang
297fcb4031 Ignore broken tests
Test: Run tests
Bug: 214943221
Bug: 214944418
Bug: 214944992
Bug: 214944423
Bug: 214945263
Bug: 214945259
Change-Id: I958c003a15866a03b7d0c24210ae2c99f4ee2c47
2022-01-17 22:01:50 +08:00
Eric Biggers
6552bdd0ef Rename crypt_keeper_* strings that are still used
Some strings used in the Settings UI have "crypt_keeper" in their names,
but they aren't specific to FDE, which is no longer supported.  They are
still used to report the encrypted status of the device on devices that
use FBE, or the unencrypted status of the device on devices that don't
have encryption enabled at all.  Rename these strings appropriately.

Test: On Cuttlefish with and without encryption enabled, tested visiting
      the "Encryption & credentials" settings.
Bug: 208476087
Change-Id: Ic63910c870837f5b37e4407ba5b3c7629e925c17
2022-01-11 18:53:51 -08:00
Eric Biggers
36609c18d1 Remove CryptKeeperSettings
FDE support has been removed in favor of FBE, so remove the FDE settings
from the "Encryption & credentials" page of the Settings app.

For now I didn't change the way the page appears on devices that don't
use FDE; as before, it still lists "Encrypt phone", followed by either
"Encrypted" or "Phone not encrypted" with no changeable settings.  Note
that the strings used for this have "crypt_keeper" in their names but
aren't specific to FDE; the next CL will rename them.

Test: On Cuttlefish with and without encryption enabled, tested visiting
      the "Encryption & credentials" settings.
Bug: 208476087
Change-Id: I3ce9894291ea1f1886f21980a86a92bfce38038a
2022-01-11 18:53:51 -08:00
Yuri Ufimtsev
cdc2677cd1 Refactor some Preference Controllers to use BasePreferenceController
Test: atest SettingsUnitTests
Change-Id: Ic93f29d6c35cb1a43937fa7bf2f1e2d489cdd09f
2022-01-10 13:25:13 +00:00
“Ayush
41873bd7a4 Remove refs of isSeparateProfileChallengeAllowed
Remove this API usage as this API is being removed from DPMS.

Bug: 189502721
Test: N/A
Change-Id: I395a48cd78c8fb93bfd54c94794de5a680ba6f5d
2021-08-03 21:21:16 +00:00
Beth Thibodeau
647b3ef070 Remove lockdown toggle
This button will be on by default now, so remove the switch

Bug: 185618694
Test: build
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: Iecbeb590a5b750ec2fcf9c31fece5814241200b1
2021-07-14 19:39:30 -04:00
Jan Tomljanovic
c6667337ca Enable controllers to use a custom key.
Test: atest SettingsUnitTests
Test: m -j45 RunSettingsRoboTests
Bug: 191763369
Change-Id: I48eea95613600580c80c8850f0a3fd543a7e0a43
2021-06-25 15:35:53 +01:00
Edgar Wang
cdff5c6ceb Revert "Apply SettingsLib SeekBarPreference to Settings"
Revert submission 13422386-seekbar-sc-dev

Reason for revert: build broken in SettingsGoogle
Reverted Changes:
I0c2d0d5fb:Apply SettingsLib SeekBarPreference to SettingsGoo...
I1844bb3b0:Apply SettingsLib SeekBarPreference to a11y vibrat...
Ia3e4adec8:Apply SettingsLib SeekBarPreference to a11y vibrat...
Iadee57e9d:Apply SettingsLib SeekBarPreference to a11y vibrat...
I219878716:Apply SettingsLib SeekBarPreference to Settings
I959f5672c:Create SettingsLibSeekBarPreference
I92545a69c:Apply SettingsLib SeekBarPreference to a11y vibrat...

Change-Id: Ie6c3b0dc072e044796abdb33fca305f9f9d47c4d
Bug: 176818438
2021-06-08 09:47:51 +00:00
Edgar Wang
d6b5bbb5cb Apply SettingsLib SeekBarPreference to Settings
Bug: 176818438
Test: robotest

Change-Id: I219878716457ce4bb7cad251bccf5d50d93030a5
2021-06-07 18:09:19 +00:00