Commit Graph

48103 Commits

Author SHA1 Message Date
Treehugger Robot
9de898e699 Merge "Fix rotate device at face unlock detailed page, device will display redundant face unlock header." into udc-dev am: 9ce2e21857 am: 14a3b919e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22613587

Change-Id: Idaf970f517c332c8fc261667fb1ec4999f2df89f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 18:18:00 +00:00
Treehugger Robot
9ce2e21857 Merge "Fix rotate device at face unlock detailed page, device will display redundant face unlock header." into udc-dev 2023-04-14 17:11:40 +00:00
Treehugger Robot
efa448b267 Merge "Only admin users may change private DNS settings" into tm-qpr-dev am: a5a31037cc am: 0369c601c0 am: 202cff3d64 am: c614afc287
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22414528

Change-Id: Ieb216ee6a87a9dd233618a125237592386738667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 17:01:56 +00:00
Treehugger Robot
202cff3d64 Merge "Only admin users may change private DNS settings" into tm-qpr-dev am: a5a31037cc am: 0369c601c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22414528

Change-Id: Ic449ec3db28b2c68933c851d4b3300ad3932b03a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 15:59:47 +00:00
Treehugger Robot
0369c601c0 Merge "Only admin users may change private DNS settings" into tm-qpr-dev am: a5a31037cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22414528

Change-Id: Ieb88410bf1e820a660f7d650194cd426a6f3eaaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 15:30:04 +00:00
Treehugger Robot
a5a31037cc Merge "Only admin users may change private DNS settings" into tm-qpr-dev 2023-04-14 14:53:48 +00:00
Kweku Adams
942cf5f7a5 Merge "Hide TARE page when disabled." into udc-dev am: 21b9d15cd6 am: aca72e46ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22384966

Change-Id: I58567babaa879f36b37459648376530a822e7d8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 14:16:03 +00:00
Kweku Adams
21b9d15cd6 Merge "Hide TARE page when disabled." into udc-dev 2023-04-14 13:20:06 +00:00
Bill Lin
ff899ca4b8 Merge "Remove onWindowFocusChange solution from FPS enrollment" into udc-dev am: f77643bec7 am: eeef3fd175
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22613586

Change-Id: I6305a980e72021ff87dfc5d327ebd202bcdb9892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 10:30:14 +00:00
Jason Hsu
f7d03652eb Merge "Add ability to handle onActivityResult for AbstractPreferenceController in DashboardFragment" into udc-dev am: 32614f2b52 am: 566f5b5316
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22477522

Change-Id: I798d3c787fbe6d7b47265f22b4e01dfef145205b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 10:30:01 +00:00
Bill Lin
f77643bec7 Merge "Remove onWindowFocusChange solution from FPS enrollment" into udc-dev 2023-04-14 09:45:42 +00:00
Jason Hsu
32614f2b52 Merge "Add ability to handle onActivityResult for AbstractPreferenceController in DashboardFragment" into udc-dev 2023-04-14 09:42:43 +00:00
Vania Januar
cd0176ba92 Merge "[RESTRICT AUTOMERGE] Force enabling Notes role from developer options affects all users." into udc-dev 2023-04-14 09:25:10 +00:00
Vania Januar
11603c5be9 Merge "Force enabling Notes role from developer options affects all users." 2023-04-14 09:24:44 +00:00
Jason Chang
2ca753bd06 Fix rotate device at face unlock detailed page, device will display
redundant face unlock header.

1. Change the FaceSettings theme style to avoid an action bar
appearing.
2. In AndroidManifest.xml to apply configChanges attribute for
handling device orientation.

Bug: 262497152

Test: manually to do reproduced steps:
Pre-Condition:
1. enroll face
2. enable auto rotate

Procedure:
1.go to settings > security > face & fingerprint unlock
2.enter screen lock
3.click face unlock
4.rotate device into landscape mode and then back to portrait mode
5.check the UI

Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings
.biometrics.face.FaceSettingsActivityTest"

Change-Id: I4ee1bb4f061ea2d141043405213ba6e60bacd92f
2023-04-14 07:38:18 +00:00
Treehugger Robot
6065f10f11 Merge "Add dialog for enabling a provider in settings" 2023-04-13 23:24:44 +00:00
Becca Hughes
7d407abf58 Add dialog for enabling a provider in settings
Test: manual
Bug: 277923170
Change-Id: I404444115f178faf5545dec9686096fcdfdf73de
2023-04-13 21:29:04 +00:00
Xiaozhen Lin
60e1a88005 Merge "Destroy activity in onStop()" into udc-dev am: d913003d55 am: 88ed2d9a06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22625076

Change-Id: I39dcaaf463ae1def7131230184b4ccf7224bdd73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 21:26:33 +00:00
Treehugger Robot
b09b6eb551 Merge "Handle corner cases in "Alarms and Reminders" page" into udc-dev am: 3b24bafb80 am: cdda0b8658
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22609703

Change-Id: I0c26bb3a47410bb60981c99c1aec39d0d4a405cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 21:13:47 +00:00
Xiaozhen Lin
d913003d55 Merge "Destroy activity in onStop()" into udc-dev 2023-04-13 20:45:15 +00:00
Treehugger Robot
3b24bafb80 Merge "Handle corner cases in "Alarms and Reminders" page" into udc-dev 2023-04-13 20:10:49 +00:00
Lucas Silva
1196360a26 Merge "Add intent for entering communal settings" into udc-dev am: 07d056f5c6 am: 42f411984a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22597360

Change-Id: I01d239417080c6bb4c983ba2c9641f8d68fe5706
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 18:52:03 +00:00
Lucas Silva
07d056f5c6 Merge "Add intent for entering communal settings" into udc-dev 2023-04-13 18:28:43 +00:00
Xiaozhen Lin
7a89f15fed Destroy activity in onStop()
Pixel Imprint will call onDestroy() whenever its menu is invisible.
(https://source.corp.google.com/tm-dev/packages/apps/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java;l=547?sq=package:tm-dev)
However, Screen lock should have the same behavior as Pixel Imprint but
it doesn't.
onDestroy() for Screen lock should be called whenever we exit the menu
or the menu becomes invisible. Otherwise, the password may be leaked to
RAM unexpectedly in some situations.

Bug: 233373529
Test: manual
Change-Id: Idc0c115fc2061d863f9cab2aed99c04340b827f8
2023-04-13 17:29:48 +00:00
lbill
6193554873 Remove onWindowFocusChange solution from FPS enrollment
Context:
The legacy architecture UdfpsEnrollView was shown by SysUI
which has higher z-order that encounter lots of overlap issue.
Besides, IPC impact the latency of show/hide enroll view in
legacy architecture.
We used to upload ag/19699461 to cancel enrollment due to
above limitation.

With the new architecture ag/20582186 the UdfpsEnrollView
migrate to Settings and controlled by Settings process.

And ag/21149538 config SETTINGS_SHOW_UDFPS_ENROLL_IN_SETTINGS flag
to ture by default.

It's the time to improve the enroll UX by removing cancel
signle when onWindowFocusChanged() invoked.

Bug: 262680438
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Test: manual Security Settings > Enroll fingerprint > enroll
      Swipe Notify Shade , Heads-up, Power menu interrupt should
      not stop the enroll flow.
Change-Id: I60d88d5edd80e6eed70e2fbf288357e949abcae3
2023-04-13 12:58:49 +00:00
Chiachang Wang
ffda4e6a0d Merge "Populate ipsecSecret field in VpnProfile" am: 4c5334809d am: 4770d017dc am: cd33a0fa88 am: e428b25ea0 am: c702ecb6ad
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530499

Change-Id: I7088c510a7f804e3b46d71ff72dea670d1c5e12b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 11:24:56 +00:00
Chiachang Wang
e428b25ea0 Merge "Populate ipsecSecret field in VpnProfile" am: 4c5334809d am: 4770d017dc am: cd33a0fa88
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530499

Change-Id: I24723fadb4e89560ddb96da8149dc6dfa4e6ce6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 10:25:09 +00:00
Vania Januar
32aae36b37 Force enabling Notes role from developer options affects all users.
CP from ag/22598718 due to conflicts in downstream branch.

Bug: 276432652
Test: ForceEnableNotesRolePreferenceControllerTest
Change-Id: Ic0fa7f33dcb6509908008774c725eec386d0608b
2023-04-13 09:57:38 +00:00
Chiachang Wang
cd33a0fa88 Merge "Populate ipsecSecret field in VpnProfile" am: 4c5334809d am: 4770d017dc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530499

Change-Id: I7fb125aacace306aec461e64ae7d448dcec10949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 09:54:49 +00:00
Vania Januar
a1b7888c30 [RESTRICT AUTOMERGE] Force enabling Notes role from developer options affects all users.
Restricting merge due to conflicts; will manually CP this to master.

Bug: 276432652
Test: ForceEnableNotesRolePreferenceControllerTest
Change-Id: Ic0fa7f33dcb6509908008774c725eec386d0608b
2023-04-13 09:53:20 +00:00
Zaiyue Xue
6e606674ec Merge "Support battery usage chart start index label is the detailed last full charge time" into udc-dev am: 4d737d7813 am: 07f3152ad2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22379150

Change-Id: Ic4820b148a0375c765f3bd36343c3017fc2b7960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 09:25:44 +00:00
Milton Wu
9930d325ee Pass Timeout back to upper biometric preference am: 52a46d0a85 am: fa091d4a38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22379152

Change-Id: I0371fa58c1d412538bf499ada83c73146eb0af70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 09:24:59 +00:00
Zaiyue Xue
4d737d7813 Merge "Support battery usage chart start index label is the detailed last full charge time" into udc-dev 2023-04-13 09:06:22 +00:00
Milton Wu
52a46d0a85 Pass Timeout back to upper biometric preference
When FaceSettings or FingerprintSettings are closed because of onStop(),
this information can't been passed back to previous Preference screen,
CombinedBiometricSettings, because handlePreferenceTreeClick() from
AbstractPreferenceController class only can launchActivity() throguh
preference's Context.

In order to recevice the activity result code from FaceSettings or
FingerprintSettings, add handleBiometricPreferenceTreeClick() method in
BiometricStatusPreferenceController. Then CombinedBiometricSettings uses
this method to show FaceSettings or FingerprintSettings through
launchActivityForResult().

Bug: 263057093
Test: atest BiometricNavigationUtilsTest
Test: Manually open camera through double-click power key on different
      pages inside "Face & Fingerprint Unlock"
Change-Id: I99167739766ad5ea5f204b0f0543ba6ad18fac31
2023-04-13 09:02:18 +00:00
Treehugger Robot
a50f75532a Merge "Add Wi-Fi hotspot > Security Settings page" into udc-dev am: be76ebdc5b am: 758b0317ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22552288

Change-Id: Ic5be47e2240a4ece4853a2e772142c0bdeea7f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 08:56:32 +00:00
Elliot Sisteron
47aaf4827b Merge "Redirect to the right combined biometrics in work profile." into udc-dev am: 37dad2b3d4 am: 93ec329d71
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22576586

Change-Id: I03a34d6376da35ba447e052dc714e18ccd6f04f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 08:56:23 +00:00
Chiachang Wang
4c5334809d Merge "Populate ipsecSecret field in VpnProfile" 2023-04-13 08:53:57 +00:00
Zaiyue Xue
bcafd5dfda Support battery usage chart start index label is the detailed last full charge time
https://screenshot.googleplex.com/5dYp7kJpNPMU6Jx.png
https://screenshot.googleplex.com/7ZSbWyCGRFSym6A.png
https://screenshot.googleplex.com/9GsPTa9zd2XttDX.png

Bug: 271214926
Fix: 271214926
Test: manual
Change-Id: Ic869653f66866964f34e111dd2ee8c052313e119
2023-04-13 16:37:35 +08:00
Treehugger Robot
be76ebdc5b Merge "Add Wi-Fi hotspot > Security Settings page" into udc-dev 2023-04-13 08:24:34 +00:00
Elliot Sisteron
37dad2b3d4 Merge "Redirect to the right combined biometrics in work profile." into udc-dev 2023-04-13 07:55:05 +00:00
Treehugger Robot
7c1f28d0e1 Merge "Add a feature flag for SPA metrics" into udc-dev 2023-04-13 07:51:40 +00:00
chiachangwang
02156d600d Populate ipsecSecret field in VpnProfile
This commit fixes IKEv2 RSA VPN could not be an always-on VPN
issue to populate ipsecSecret field from "IPsec user certificate".

Fields ipsecUserCert and ipsecSecret are required for a valid
VpnProfile. The ipsecSecret field in VpnProfile should be
populated from "IPsec user certificate" field. It's the matching
private key.

Bug: 263610164
Bug: 230727391
Test: Verify if IKEv2 RSA VPN can setup successfully and set as
      as always on VPN
Change-Id: I605b35fff9e399ee7b82d8441137984992ab2907
2023-04-13 07:47:53 +00:00
Chaohui Wang
bade118967 Merge "Fix create bluetooth dialog repeatedly" into udc-dev am: 8313b6b0fb am: 3bed84baec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22572958

Change-Id: I3dd368195f69f0affdc14b6f7e259fac737ea3e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 06:54:05 +00:00
Treehugger Robot
f2e19ca33f Merge "Add a feature flag for SPA metrics" 2023-04-13 06:11:15 +00:00
Chaohui Wang
8313b6b0fb Merge "Fix create bluetooth dialog repeatedly" into udc-dev 2023-04-13 06:02:16 +00:00
Treehugger Robot
c2038e6e53 Merge "Fix b/277880435: System battery settings app crash" into udc-dev am: 6ad5b9a5f3 am: 34cefb1478
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22609037

Change-Id: I6eee674f8a1d5f0bb5a5fa265259c67ef2c74037
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 05:21:31 +00:00
SongFerng Wang
e58f81e111 Merge "Fix the IndexOutOfBoundsException" into udc-dev am: 133fe9fbc7 am: 48d04ef4d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573808

Change-Id: I6a592946e72a21eabf764a00834fae37e4a3d4ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 05:03:27 +00:00
Treehugger Robot
6ad5b9a5f3 Merge "Fix b/277880435: System battery settings app crash" into udc-dev 2023-04-13 04:50:59 +00:00
SongFerng Wang
133fe9fbc7 Merge "Fix the IndexOutOfBoundsException" into udc-dev 2023-04-13 04:12:32 +00:00
Varun Shah
582f0e130c Merge "Update the default wellbeing package config." into udc-dev am: 4cf335d53c am: 1d00be1ad5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22532865

Change-Id: If3aaeebba9ebde14a1a7f04a570a515b23b36234
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 03:52:18 +00:00