Commit Graph

47949 Commits

Author SHA1 Message Date
SongFerng Wang
d99deafd0e Merge "Unregister MobileNetworkRepository during onPause()" into udc-dev am: 803fe08dc5 am: ac73ff9de6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22508562

Change-Id: I97eda2e821bb29103d8c1a8fa532fd7fed051b3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 14:07:06 +00:00
TreeHugger Robot
210c11be5f Merge "Fix b/276423111: Keep unchanged perferences in the app list instead of clear all." into udc-dev am: 56c16c247f am: f731e8a685
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22472426

Change-Id: I726d9773827a7cce9528d2a0a95cb4e8ce1bd08c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 14:06:21 +00:00
SongFerng Wang
803fe08dc5 Merge "Unregister MobileNetworkRepository during onPause()" into udc-dev 2023-04-06 13:24:36 +00:00
TreeHugger Robot
56c16c247f Merge "Fix b/276423111: Keep unchanged perferences in the app list instead of clear all." into udc-dev 2023-04-06 13:05:52 +00:00
Zaiyue Xue
c616a65144 Fix b/276423111: Keep unchanged perferences in the app list instead of clear all.
Bug: 276423111
Bug: 269203672
Fix: 276423111
Fix: 269203672
Test: manual
Change-Id: Ie2cb668ae4c46f5c40eed555510be034be45d713
2023-04-06 19:54:40 +08:00
SongFerngWang
fd531d6a07 Unregister MobileNetworkRepository during onPause()
- Move MobileNetworkRepository unregistration from onDestory() to onPause() for corresponding to its registration by onResume.

Bug: 275456375
Test: built pass and verified in bug
Change-Id: I4cd2f23501485d4f3cfcf867cdb8d81e0385794a
2023-04-06 11:50:04 +00:00
TreeHugger Robot
f4da7e1cf5 Merge "settings(nfc): Remove reference to APM setting in NFC page" into udc-dev am: 7a1d2177d8 am: c01148716b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339508

Change-Id: I8c2af9d23fe6f71f620653f5d7d08a7940596e6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 11:37:55 +00:00
TreeHugger Robot
7a1d2177d8 Merge "settings(nfc): Remove reference to APM setting in NFC page" into udc-dev 2023-04-06 10:49:32 +00:00
TreeHugger Robot
5f2a7887dc Merge "[BiometricsV2] Fix 2nd touch not work for enroll" into udc-dev am: b29aa72fae am: f567072a69
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339271

Change-Id: Id1d58bddc0fc017fbea27d1af894645664010add
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 07:53:44 +00:00
Daniel Huang
80dba035d9 Merge "Handling multiple profiles for PK layout selection" into udc-dev am: 5f3e365c41 am: 9bbc2099ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22371401

Change-Id: I37e316d9cc483a33bb915449a27315bb3726dd9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 07:53:25 +00:00
TreeHugger Robot
b29aa72fae Merge "[BiometricsV2] Fix 2nd touch not work for enroll" into udc-dev 2023-04-06 07:31:30 +00:00
Milton Wu
4140b84881 [BiometricsV2] Fix 2nd touch not work for enroll
Use MessageDisplayController only when enroll reason is ENROLL_ENROLL
and R.bool.enrollment_message_display_controller_flag is true.
And always allocate a new MessageDisplayController for each new enroll
to avoid the possibility of events being ignored by
MessageDisplayController.

Bug: 275510856
Test: atest FingerprintEnrollProgressViewModelTest
Test: manually test sfps/udfps enrollment for biometricsV2
Change-Id: Ifc8b91916a3d76bed68dc523a90dc6ba422e3923
2023-04-06 13:18:41 +08:00
TreeHugger Robot
c1cdb4ae69 Merge "Do isAvailable() checks when accessing AirplaneEnabler." into udc-dev am: b232ba29e6 am: e4c7e5b424
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21725541

Change-Id: Ib543f8bce09153d65c0b21861a42c58b4d100385
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 01:07:07 +00:00
danielwbhuang
2659074d02 Handling multiple profiles for PK layout selection
1. Use new @hide IMM#getEnabledInputMethodSubtypeListAsUser()
2. Use ProfileSelectFragment

Demo: https://screencast.googleplex.com/cast/NjMzNTA2NTA2NDczNDcyMHwxNTUyMjQ1ZS03YQ

Bug: 275106096
Test: manual
Change-Id: I51cfd16fc7162e2b24782017b9366b0aad36f915
2023-04-06 00:50:54 +00:00
TreeHugger Robot
b232ba29e6 Merge "Do isAvailable() checks when accessing AirplaneEnabler." into udc-dev 2023-04-06 00:01:47 +00:00
Ben Lin
72534295d3 Do isAvailable() checks when accessing AirplaneEnabler.
This instance is only initialized if isAvailable() returns true in the
first place, so we should check for it everytime we try to access it, or
else we will result in a NPE.

Bug: 271223463
Test: atest AirplaneModePreferenceControllerTest
Change-Id: I43d35b91c86517201c8ec4f458f8c0328a9fb768
2023-04-05 22:34:16 +00:00
Brian Lee
bd0b938ea6 Add RemoteLockscreenValidationFragment to help retain remote lockscreen am: 2eb8ed2488 am: 95178742b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22390454

Change-Id: Ib733e78ec419e9b4f36b7c8a49a0ffa37104025e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 22:15:02 +00:00
Brian Lee
2eb8ed2488 Add RemoteLockscreenValidationFragment to help retain remote lockscreen
validation state.

Currently, if ConfirmDeviceCredentialBaseFragment is ever re-created due
to orientation change, screen getting turned off, etc., relevant state
gets lost. This led to the old ConfirmDeviceCredentialBaseFragment
handling results which led to issues such as lockscreen not getting set.
By addiing a retained RemoteLockscreenValidationFragment,
we're able to update the new ConfirmDeviceCredentialBaseFragment
that will handle results. We can also retain other important state like
the device credential guess to be set after successful validation.

Some smaller changes include:
* If the activity is finished for any reason other than "Back" getting
  pressed, RESULT_FIRST_USER is returned instead of RESULT_CANCELED.
* CheckBox, "Forgot [LSKF]?" button, and EditText/LockPatternView
  gets disabled during validation.
* The above also stay disabled if ConfirmDeviceCredentialBaseFragment
  gets re-created and remote lockscreen validation is still in progress.

Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=com.android.settings.password
Test: Manual
Bug: 274983372
Bug: 274991889
Bug: 274792310
Bug: 270395807

Change-Id: Ib6d47430e233a43e6985ab83abae45713c49771f
2023-04-05 16:35:25 +00:00
Lucas Dupin
24489fc790 Merge "Add contrast setting in dev options" into udc-dev am: 222a89acc1 am: ef4ca344b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425568

Change-Id: I7ec23652c8ddbe56f20b6d6ede2dbda87883c3be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 03:19:18 +00:00
Lucas Dupin
222a89acc1 Merge "Add contrast setting in dev options" into udc-dev 2023-04-05 02:08:14 +00:00
Dmitry Dementyev
772e53bd2f Merge "Return GK_PW_HANDLE after remote LSKF verification." into udc-dev am: cd7123e071 am: 822c670619
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21993732

Change-Id: Ib8e49dd5635fc3a34df3a2d2ec6109b91781d05d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 19:39:16 +00:00
Dmitry Dementyev
cd7123e071 Merge "Return GK_PW_HANDLE after remote LSKF verification." into udc-dev 2023-04-04 18:37:36 +00:00
Vania Januar
7f905b5b45 Merge "Use the correct SettingsEnum for the USI device details page." into udc-dev am: fccd16131b am: f162fec481
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252123

Change-Id: Ib8e78db4cbef1ee5de38cfcc1bd6f945b5fa1d7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 14:37:02 +00:00
Vania Januar
fccd16131b Merge "Use the correct SettingsEnum for the USI device details page." into udc-dev 2023-04-04 13:24:36 +00:00
TreeHugger Robot
4c0a765528 Merge "Fix App battery usage crash" into udc-dev am: d25bd214ae am: 7232cf4cc5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22414534

Change-Id: Id32990d545c33ec89cf604d56ec2d7d732993f15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 05:30:36 +00:00
TreeHugger Robot
d25bd214ae Merge "Fix App battery usage crash" into udc-dev 2023-04-04 04:47:31 +00:00
Hao Dong
2e31d34f69 Merge "Show a dialog preventing fingerprint enrollment in split mode." into udc-dev am: 5a2ba07f63 am: 70f4d50b2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22361082

Change-Id: Icf2d8ff26f0c6e242271ddd494a69177b9342cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 22:54:47 +00:00
Hao Dong
005f214d54 Merge "Show Class 3 consent screen in enrollment with strong face." into udc-dev am: 637ae9d983 am: fc1fe263fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22078930

Change-Id: I6a0ac3df96141e23621f5c6d3f814c6f07fafd64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 22:52:33 +00:00
Hao Dong
5a2ba07f63 Merge "Show a dialog preventing fingerprint enrollment in split mode." into udc-dev 2023-04-03 21:14:37 +00:00
Hao Dong
637ae9d983 Merge "Show Class 3 consent screen in enrollment with strong face." into udc-dev 2023-04-03 21:06:40 +00:00
Hao Dong
ee8252b56b Show a dialog preventing fingerprint enrollment in split mode.
Test: atest CombinedBiometricProfileSettingsTest
Test: atest FingerprintSettingsFragmentTest
Test: manaul test- go to split screen mode and try to enroll
fingerprint
Bug: 246247132

Change-Id: I12357d197f2ceda8c1f1f582cdecb20fd18e30f7
2023-04-03 18:02:22 +00:00
Chaohui Wang
ecd8ffb08b Fix App battery usage crash
userContext.getApplicationContext() returns null, which cause crash.

Use context instead to fix.

userContext was used to support multiple profiles, since the app's user
id is also passed to getAppBatteryUsageData(), userContext is not need.

Fix: 269545838
Fix: 275957358
Test: Manually check the battery usage is still correct if an app is
      installed on two profiles
Change-Id: I41a80e4c6edc338affb6eec0cf12da3c438cd7fd
2023-04-04 00:15:29 +09:00
Candice Lo
b8206c85c9 Merge "Announce scaled value for font scaling seekbar in Talkback" into udc-dev am: 470dbd6884 am: c96e19f819
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347809

Change-Id: I66795c6f016a705acdd20526b443e50f8f89cac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-01 02:57:51 +00:00
Candice Lo
470dbd6884 Merge "Announce scaled value for font scaling seekbar in Talkback" into udc-dev 2023-03-31 23:17:48 +00:00
Chris Antol
436a5dbe01 Merge "Enable hover states for SeekBarPreference" into udc-dev am: ca08af3ff6 am: 4b37ad1a3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22361715

Change-Id: I03f6dba51f168cc0a19e48c8770aceb6ecaf6212
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 23:09:47 +00:00
TreeHugger Robot
8248c8506f Merge "Moves lock screen shortcuts summary loading to the background." into udc-dev am: 8ae1abecc1 am: 7f278b5527
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22260969

Change-Id: I15550a1d82e80e11c313711851951c94329c25aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 22:56:42 +00:00
SongFerng Wang
6e7d0bda86 Merge "UI add more log" into udc-dev am: 378c2cf87b am: b61e930c61
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22371396

Change-Id: I7a0434a1b71160b7b9dbe57d1769801caae8405a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 22:46:23 +00:00
Marcelo Arteiro
cf9332fd49 Merge "Automated Token Alignment Android/Material" into udc-dev am: 0102eb84ec am: a8525d4212
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21989405

Change-Id: Iae62ee4328d26922d1bedd2475c49aba2b45d0bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 21:54:18 +00:00
Chris Antol
ca08af3ff6 Merge "Enable hover states for SeekBarPreference" into udc-dev 2023-03-31 20:57:16 +00:00
Hao Dong
322df0454f Show Class 3 consent screen in enrollment with strong face.
Test: atest FaceEnrollIntroductionTest
Bug: 271903097
Change-Id: I1959a82862790ff918571145b3651d164aa118b6
2023-03-31 20:11:44 +00:00
Aurélien Pomini
649c5082c6 Add contrast setting in dev options
See the attached video from b/266071578#comment2 to see how the setting
looks like.

Bug: 266071578
Test: atest ContrastDialogTest
Test: atest ContrastDialogControllerTest
Change-Id: Id9fc31a0562059814d4e342ea8095adc5b53d5f3
2023-03-31 19:35:08 +00:00
TreeHugger Robot
8ae1abecc1 Merge "Moves lock screen shortcuts summary loading to the background." into udc-dev 2023-03-31 18:48:29 +00:00
Candice Lo
d2c53a2085 Announce scaled value for font scaling seekbar in Talkback
1. Keeping state descriptions for the seekbar as an array in the
   PreviewSizeSeekBarController when we would like to customize the
   state description.
2. Setting the scaled value to be the state description for the font
   scaling seekbar when there is a progress change to the seekbar.

Bug: 269212483
Test: manually - attach videos to the bug
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PreviewSizeSeekBarControllerTest
Change-Id: I8e9e3681a0174f454cac871ebf62d785962c7165
2023-03-31 17:38:14 +00:00
SongFerng Wang
378c2cf87b Merge "UI add more log" into udc-dev 2023-03-31 14:12:17 +00:00
Marcelo Arteiro
0102eb84ec Merge "Automated Token Alignment Android/Material" into udc-dev 2023-03-31 13:18:38 +00:00
TreeHugger Robot
5e435b5a30 Merge "Improve dialog and system dialog UI" into udc-dev am: 34947069f6 am: 8c4f3123b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22379143

Change-Id: I92b2b31758601eb9a2cffac020ccc992469f0ede
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 12:42:02 +00:00
TreeHugger Robot
34947069f6 Merge "Improve dialog and system dialog UI" into udc-dev 2023-03-31 11:43:07 +00:00
Treehugger Robot
6684c9b6fc Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a am: 7871a9e9bd am: 06bca85c6a am: 486691ad26 am: e1bcb16bfb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935

Change-Id: I83ed2f2a8790d7245e81f365fe6aeebbde604522
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 11:00:57 +00:00
Wilson Wu
7dc217f8f6 Merge "Fix wrong user in personal profile" into udc-dev am: ce7ad1f8a0 am: 4d91298836
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22307474

Change-Id: I6d5913765e265161918fc77b28b0da07ff128981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 10:59:57 +00:00
Marcelo Arteiro
c5631b45b2 Automated Token Alignment Android/Material
Resubmiting reverted CL Ia1f84669090e04b3a2aaac82bb5971032d74a125.
Reson: Bug was found in another CL (in this topic)

Test: Treehugger
Bug: 268682423

Change-Id: I0fead8915b2bb6281e29b32f7426c35b0138b10e
2023-03-31 10:53:24 +00:00