Bill Yi
f5782293d1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 43599d0404
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567293
Change-Id: I8e2e8305a86e9f5c59062b6d7f39e169e5548d6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 17:53:04 +00:00
Bill Yi
ea747f6325
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 12fc7f8479
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567293
Change-Id: If7c8d182ec0ecb39ffc9b725d91c98ed157cbc47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 17:52:41 +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
Tetiana Meronyk
672cb31782
Merge "Align multiple admin related strings with UX design" into udc-dev am: d280e9e110
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22617660
Change-Id: If186294c620facbc450b3024ceae382a6af1358a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 17:19:06 +00:00
Bill Yi
bfb5780a19
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-04-13 17:18:38 +00:00
Bill Yi
10284d973a
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-04-13 17:18:38 +00:00
Bill Yi
43599d0404
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-04-13 17:18:38 +00:00
Tetiana Meronyk
d280e9e110
Merge "Align multiple admin related strings with UX design" into udc-dev
2023-04-13 17:08:31 +00:00
Fabián Kozynski
68270077e3
Update strings for device controls settings
...
Test: Manual, check Settings
Fixes: 234757968
Change-Id: I5fcb8c2a5826271fc9bf1cfff50006c3f738e46c
2023-04-13 12:58:30 -04:00
Tetiana Meronyk
b4227c18fb
Align multiple admin related strings with UX design
...
Bug: 266558832
Test: manual visual
Change-Id: I69d2d12b24d64f058ed8ed59c6d979c9c37b74cb
2023-04-13 14:47:25 +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
c702ecb6ad
Merge "Populate ipsecSecret field in VpnProfile" am: 4c5334809d
am: 4770d017dc
am: cd33a0fa88
am: e428b25ea0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530499
Change-Id: I581c148c5ee67a7a7b5ec1d064a6e6958a664c23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 10:57:11 +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
Weng Su
e23b9deccb
String updates for hotspot speed & compatibility settings
...
Bug: 270561425
Test: manual test
atest -c WifiTetherSettingsTest \
WifiHotspotSpeedSettingsTest
atest -c WifiTetherViewModelTest \
WifiHotspotSpeedViewModelTest
Change-Id: I6e2fa716a4fa0d87e62a1399a0c380e77ea40f10
2023-04-13 10:04:14 +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
Chiachang Wang
4770d017dc
Merge "Populate ipsecSecret field in VpnProfile" am: 4c5334809d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530499
Change-Id: I0094a812955100bf9fae19dfae028ae33167caa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 09:25:49 +00:00
Zaiyue Xue
045b856557
Merge "Support battery usage chart start index label is the detailed last full charge time" into udc-dev am: 4d737d7813
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22379150
Change-Id: I4ecddfeb0a1a13bff8c84cf755d6209404f33e48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 09:12:25 +00:00
Milton Wu
a4c27fac3f
Pass Timeout back to upper biometric preference am: 52a46d0a85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22379152
Change-Id: I19bc33b58f8b036f7b52b2820e7154d3e8955379
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 09:12:13 +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
973a08ebbb
Merge "Fix settings crashed" into udc-dev am: 2c427629d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22613581
Change-Id: I8bebb153af17308777bce99dcfb0abd0ea5327a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 08:57:28 +00:00
Chiachang Wang
4c5334809d
Merge "Populate ipsecSecret field in VpnProfile"
2023-04-13 08:53:57 +00:00
Treehugger Robot
2c427629d8
Merge "Fix settings crashed" into udc-dev
2023-04-13 08:43:45 +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
c28e629e66
Merge "Add Wi-Fi hotspot > Security Settings page" into udc-dev am: be76ebdc5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22552288
Change-Id: I6b4b377e1606e0472bff9e2d5003cb329f017e6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 08:29:48 +00:00
Elliot Sisteron
ea8f9dd7ac
Merge "Redirect to the right combined biometrics in work profile." into udc-dev am: 37dad2b3d4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22576586
Change-Id: Ibfd09de2b6e94543b34ad81b6266df0f877a095c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 08:27:42 +00:00
Treehugger Robot
5411732f9f
Merge "Add a feature flag for SPA metrics" into udc-dev am: 7c1f28d0e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22550303
Change-Id: I77846494531b695f957b09993a8f61b2604ff07a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 08:27:32 +00: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
Mill Chen
3d0eb72b40
Fix settings crashed
...
Settings keeps crashed when entering the search page since a footer
preference used a system service that isn't found during the indexing
time. Marking a footer preference unsearchable to fix the crash.
Fixes: 276680407
Test: manual test and the settings search should work properly.
Change-Id: If6fada9285bfb30412dea62377577c14353ab0cc
2023-04-13 15:17:07 +08:00
Milton Wu
e4fe606939
Fix enrolled pages not hide during SUW
...
Update mIsFaceEnrollable and mIsFingerprintEnrollable in
BiometricEnrollActivity, and use them to determine the activity flow.
Bug: 270102158
Test: Manually test following cases
1. Complete fp and face in suw, then back to "Google Service" page
to make sure
a. Fingeprint introduction page isn't shown
b. Face introduction page isn't shown
c. ConfirmCredential page is shown
2. Complete fp in suw, then press back to previous page in Face
introduction page. And check Fingerpirnt isn't shown.
Change-Id: Ibc74128f6776128d8a0f4cab014b58057ac0f844
2023-04-13 14:57:37 +08:00
Chaohui Wang
1a2ed24dfa
Merge "Fix create bluetooth dialog repeatedly" into udc-dev am: 8313b6b0fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22572958
Change-Id: If103791211d7574d7ff19af2a8b69972329e86c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 06:25:58 +00:00
Chaohui Wang
8313b6b0fb
Merge "Fix create bluetooth dialog repeatedly" into udc-dev
2023-04-13 06:02:16 +00:00
Treehugger Robot
34cefb1478
Merge "Fix b/277880435: System battery settings app crash" into udc-dev am: 6ad5b9a5f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22609037
Change-Id: I91d8a9c8327f30a039e4bc9327692fa7a08835a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 05:20:43 +00:00
Bill Yi
cb2bb50cd2
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-04-13 05:04:31 +00:00
Bill Yi
aac929ea24
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-04-13 05:04:31 +00:00
Bill Yi
0dc9c8274b
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-04-13 05:04:31 +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
48d04ef4d3
Merge "Fix the IndexOutOfBoundsException" into udc-dev am: 133fe9fbc7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573808
Change-Id: I6d70e0298d4c796a1e607f707ec4fb496e913c67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 04:36:22 +00:00
SongFerng Wang
133fe9fbc7
Merge "Fix the IndexOutOfBoundsException" into udc-dev
2023-04-13 04:12:32 +00:00
Varun Shah
0c31c38a9e
Merge "Update the default wellbeing package config." into udc-dev am: 4cf335d53c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22532865
Change-Id: Ib76cebb5a301b41be1b4a6e95ae50fff38020ca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 03:51:28 +00:00
Varun Shah
4cf335d53c
Merge "Update the default wellbeing package config." into udc-dev
2023-04-13 03:38:10 +00:00
Zaiyue Xue
29da0e6d9f
Fix b/277880435: System battery settings app crash
...
Bug: 277880435
Fix: 277880435
Test: manual
Change-Id: I369c04584c95c13e8636b5c9713e26e528ab627a
2023-04-13 11:23:46 +08:00
TreeHugger Robot
83692baf4d
Merge "Remove plug/unplug condition for the incompatible charging" into udc-dev am: 70ef00405c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573807
Change-Id: I44d88661d9eb68d745e7953df945236c965c10f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:48:13 +00:00
Suprabh Shukla
5aeef97cae
Handle corner cases in "Alarms and Reminders" page
...
There are few corner cases and new updates that need to be incorporated:
1. Apps that declare USE_EXACT_ALARM, do not need SCHEDULE_EXACT_ALARM.
So these should be filtered out, regardless of whather they declared
the latter.
2. Apps that are in the power allowlist do not need either of the
permission, and so these should be filtered out as well.
In either case, if the user somehow ends up in the app detail page for
this setting, the switch should get disabled based on existing logic.
Test: make -j RunSettingsRoboTests
Test: Manually by UI inspection:
Settings -> Apps -> Special App access -> Alarms and Reminders
or by running:
adb shell am start -a android.settings.REQUEST_SCHEDULE_EXACT_ALARM
Bug: 232460265
Change-Id: I5aeab49f95260218878bc36f5a4d73a49e5082e4
2023-04-12 19:17:57 -07:00
TreeHugger Robot
70ef00405c
Merge "Remove plug/unplug condition for the incompatible charging" into udc-dev
2023-04-13 02:16:15 +00:00
Daniel Huang
a52ac4eae7
Merge "Use ScrollView to include the full layout." into udc-dev am: 6e55a52559
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573537
Change-Id: Id2b7c87824c9083eed865a884740d02e483872f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 01:03:07 +00:00