Bill Lin
6934169f4f
Merge "Remove onWindowFocusChange solution from FPS enrollment" into udc-dev am: f77643bec7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22613586
Change-Id: I82ebead89323f9092d6e5b38c3ba00a264b1eccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-14 10:03:17 +00:00
Jason Hsu
e01555de5f
Merge "Add ability to handle onActivityResult for AbstractPreferenceController in DashboardFragment" into udc-dev am: 32614f2b52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22477522
Change-Id: I14a9a8369e45788087da4901087eab7198176acc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-14 10:03:08 +00:00
Vania Januar
97f0292aa4
Merge "[RESTRICT AUTOMERGE] Force enabling Notes role from developer options affects all users." into udc-dev am: cd0176ba92
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22598718
Change-Id: Id9e078743fc3e3f4ca8ca2a44646079123bafa9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-14 10:02:42 +00:00
Vania Januar
b7a36ed2ff
[RESTRICT AUTOMERGE] Force enabling Notes role from developer options affects all users. am: a1b7888c30
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22598718
Change-Id: I5404a919e2ae65c76a8de8313719b09ca44ab193
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-14 10:02:40 +00:00
lbill
09276c9639
Count isActivityEmbedded() state to show split screen warning dialog
...
According to Activity#isInMultiWindowMode() API design,
When the Task is in fullscreen windowing mode, and the app is in
ActivityEmbedding split (two activities split left and right),
Activity.isInMultiWindowMode() == true.
With the reason, we should consider additional condidion for
foldable device in unfolded mode, while settings activities
config to embedded activity, we can't only count on
isInMultiWindowMode() for split-screen mode
Bug: 278176550
Bug: 276938441
Test: atest CombinedBiometricProfileSettingsTest
Test: atest FingerprintSettingsFragmentTest
Test: manaul go to split screen mode and try to enroll face
Test: manual unfold device and enroll finger or face
Change-Id: I02bd223f27889e74e67b73051531a5b4554f3de1
2023-04-14 09:57:04 +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
lbill
53c0c2f4ee
Customize ChooseLockGeneric SUW options
...
Legacy choose lock options was hard coded description.
1. In T-QPR when device do not support Face enroll in SUW flow,
We should remove "Face" from the description.
2. Use BidiFormatter to handle RTL string combination.
3. Define a new string for "Fingerprint"
4. Add workaround crash in ChooseLockGenericTest/SetupChooseLockGenericTest
Test: Manual login corp, and observe the UI in Choose screen lock
Test: adb shell settings put system system_locales ar check RTL
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Bug: 269786629
Bug: 277361320
Change-Id: I2b26b7cc229f66300bb23ca190bb21f86f1caa01
2023-04-14 09:34:54 +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
Zaiyue Xue
e8e353130f
Add text for T-QPR3 to udc branch first.
...
The text is used in ag/22635696. Add it to udc is make it to be
translated fast.
Bug: 278022447
Test: presbumit
Change-Id: I065c2c13c6967cabc3c46888d2a93a11f5ceffa5
2023-04-14 16:02:49 +08: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
Chaohui Wang
f6caf24369
Migrate latest changes in "Alarms and Reminders"
...
To the new spa version.
Fix: 278113001
Test: Follows the instruction in bug
Test: Unit test
Change-Id: Iff38f01cd34c7b56ff23f4a17cb6ec1b78fba1ee
2023-04-14 13:46:24 +08:00
Weng Su
3e4fe73001
Merge "String updates for hotspot speed & compatibility settings" into udc-dev am: 06f84d96cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22607239
Change-Id: Iffc473382077dbcdf9cf817b1e99381e431825d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-14 04:17:12 +00:00
Weng Su
06f84d96cd
Merge "String updates for hotspot speed & compatibility settings" into udc-dev
2023-04-14 03:37:48 +00:00
Treehugger Robot
872336e5a5
Merge "Fixes SelectLongPressTimeoutPreferenceControllerTest summary check." into udc-dev am: 5c8d1332c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22630556
Change-Id: I4ee332dd0bb0e5f77eafb0bea02e85d5bd85ec43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 23:25:37 +00:00
Treehugger Robot
5c8d1332c7
Merge "Fixes SelectLongPressTimeoutPreferenceControllerTest summary check." into udc-dev
2023-04-13 22:50:25 +00:00
Jay Thomas Sullivan
fa6d0031f1
[Safety Labels] Filter out auto, wear and tv
...
This feature should never be enabled on these form factors.
Bug: 277601279
Bug: 264939792
Test: atest CtsPermission3TestCases:SafetyLabelChangesJobServiceTest
Test: atest CtsPermission3TestCases:AppDataSharingUpdatesTest
Change-Id: I89f0443c52cfc0894f2ad5398a15f2c0e1a9ad77
2023-04-13 15:17:04 -07:00
Xiaozhen Lin
2e070346c7
Merge "Destroy activity in onStop()" into udc-dev am: d913003d55
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22625076
Change-Id: I110bfedf36fc45f838d2eb8ec416187f53b6d3ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 20:50:49 +00:00
Treehugger Robot
4abad22b60
Merge "Handle corner cases in "Alarms and Reminders" page" into udc-dev am: 3b24bafb80
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22609703
Change-Id: I17b0b90258f62fa921db27d20c6db545318b2f9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 20:47:26 +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
Daniel Norman
5c6ba285b7
Fixes SelectLongPressTimeoutPreferenceControllerTest summary check.
...
This preference was updated in
commit 6c3805288b
to use "%s" summary and remove the controller's getSummary()
implementation so the old test that checked the controller summary
was failing.
This new version checks the preference's summary directly, but that
seems to require running using the robotest runner instead of unit test
so this test was moved there and now follows patterns used by other
similar tests there.
Fix: 278110568
Test: SelectLongPressTimeoutPreferenceControllerTest
Change-Id: Ib65c823a568ad200ebeae74ad443f32441e5cb73
2023-04-13 19:57:32 +00:00
Bill Yi
6d22363f4f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c7550f62e7
-s ours am: 938a981ff6
-s ours am: c81a93c898
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567295
Change-Id: Idfe688d92a924ef5f1cbf57019c46dc5cb63d6ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 19:46:48 +00:00
Bill Yi
c81a93c898
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c7550f62e7
-s ours am: 938a981ff6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567295
Change-Id: I3c0c3db07c74f7b0c8c275cde1aa0c05ad33710b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 19:12:58 +00:00
Lucas Silva
e7b7c8f919
Merge "Add intent for entering communal settings" into udc-dev am: 07d056f5c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22597360
Change-Id: Ibbd51e1338a7f8f404a5bb125b968e59a70d1e7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 18:35:37 +00:00
Bill Yi
938a981ff6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c7550f62e7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567295
Change-Id: I08a06bda42f5180f702b93e5285c374d03606cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 18:33:28 +00:00
Lucas Silva
07d056f5c6
Merge "Add intent for entering communal settings" into udc-dev
2023-04-13 18:28:43 +00:00
Bill Yi
2e834a8f88
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfb5780a19
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567636
Change-Id: I512b398134c74e19705ddeeaed1f4f8709a7206a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 18:09:15 +00:00
Bill Yi
6783da78de
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 54bb26194d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567636
Change-Id: Iefc6632a3603279a0bcef3af6409d58ee9972f5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 18:09:11 +00:00
Bill Yi
154e826ae6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 10284d973a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567294
Change-Id: I9f7a39e56745b0e1bb6ca44dad6ff56067772355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 18:09:08 +00:00
Bill Yi
23cddc9689
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38819c3840
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567294
Change-Id: Ibf8617bcada40ca4924dd6f6b7cc19f3d647703c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 18:08:52 +00:00
Bill Yi
f6e56e7ad3
[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: I4ff77937dabcca782b6c8a54138a0c742f868f21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 18:08:34 +00:00
Bill Yi
a60ca8c201
[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: Ifa75a86c9366e359911775d92df45a1c8b75832e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 18:08:13 +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
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
6b07394a8d
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: Ib57b9a1d2489b702c47d49d0f53dd1533fbf080c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 17:17:31 +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
02210d5752
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: Ib1a3ac04d9463896322b6cd716024f9f95402fe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 10:57:07 +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
07f3152ad2
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: Icf683ac2919638a3b49d18b84dee325157397295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 09:12:25 +00:00
Milton Wu
fa091d4a38
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: Iea8dd6641ae9eaded125e398c586aa107f81f229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 09:12:09 +00:00