Fabian Kozynski
f7885593ec
Merge "Update strings for device controls settings" into udc-dev am: 2099f58d3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22623556
Change-Id: I55256e32cc23cd7beafc2f0d6df38e165e0e6077
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-17 18:21:56 +00:00
lbill
f018643563
Fix Settings crash on non face service support devices am: e85d588904
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22670382
Change-Id: Ia9ff008d5a3310957ffe322193bdddb1ca518f27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-17 18:15:27 +00:00
Fabian Kozynski
2099f58d3e
Merge "Update strings for device controls settings" into udc-dev
2023-04-17 18:06:33 +00:00
lbill
e85d588904
Fix Settings crash on non face service support devices
...
Doing some improvement for stability:
1. Check hasSystemFeature(PackageManager.FEATURE_FACE) for non-face
service devices.
2. Wrap addAuthenticatorsRegisteredCallback()
3. Find mPreference before addAuthenticatorsRegisteredCallback
Bug: 276680407
Bug: 278174667
Bug: 277647959
Bug: 277725506
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER= \
FaceSettingsFooterPreferenceControllerTest
Change-Id: I81346b6eb8c44106c5e52867d69c8736203dd558
2023-04-17 11:45:13 +00:00
YK Hung
32c9cfa81c
Merge "Update the card preference buttons margin" into udc-dev am: ebb97daa57
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22672141
Change-Id: I717d2b068e4523cc1bdc444588a3d9dc7ed87bd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-17 09:23:49 +00:00
YK Hung
ebb97daa57
Merge "Update the card preference buttons margin" into udc-dev
2023-04-17 08:49:48 +00:00
Treehugger Robot
3124580133
Merge "Customize ChooseLockGeneric SUW options" into udc-dev am: 7d3b07f6cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22304962
Change-Id: Ia4eff855d2e880af0fc1c9133bc0077e7c3a3070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-17 07:31:57 +00:00
Treehugger Robot
7d3b07f6cb
Merge "Customize ChooseLockGeneric SUW options" into udc-dev
2023-04-17 06:59:18 +00:00
ykhung
1d51ffc91e
Update the card preference buttons margin
...
old: https://screenshot.googleplex.com/BtqQdQwDcLqRuKf
new: https://screenshot.googleplex.com/BJWhutT5SVHpXyb
Bug: 246960554
Test: presubmit
Change-Id: I329938ec25db0b92cff0cf067f31b5f0fc1674aa
2023-04-17 14:57:41 +08:00
Treehugger Robot
fab1be2d09
Merge "Fix enrolled pages not hide during SUW" into udc-dev am: 019e8ceb72
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22613578
Change-Id: I28d978d96816f1c8aa3f3bdcbb442719ebf4b060
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-17 06:00:45 +00:00
Treehugger Robot
019e8ceb72
Merge "Fix enrolled pages not hide during SUW" into udc-dev
2023-04-17 05:23:17 +00:00
Chaohui Wang
f0a01a9a73
Merge "Migrate latest changes in "Alarms and Reminders"" into udc-dev am: a42119c6a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635695
Change-Id: I556c81bd80aa5ede978f838bbb77f6dd74636794
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-15 17:01:37 +00:00
Chaohui Wang
a42119c6a8
Merge "Migrate latest changes in "Alarms and Reminders"" into udc-dev
2023-04-15 16:32:54 +00:00
Treehugger Robot
1a2bc80528
Merge "Store the PIN length to disk when Pin auto confirm feature is enabled" into udc-dev am: e1ae1c6516
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22550309
Change-Id: I7e02848d8e6b13d89a766841a7675df2b76de33b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-14 21:11:59 +00:00
Treehugger Robot
e1ae1c6516
Merge "Store the PIN length to disk when Pin auto confirm feature is enabled" into udc-dev
2023-04-14 20:46:49 +00:00
Hao Dong
9cc29dddf4
Merge "Count isActivityEmbedded() state to show split screen warning dialog" into udc-dev am: bba66e54b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22641346
Change-Id: I76809ddc788a5c379f860dd73264f19ebcfc82f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-14 19:39:53 +00:00
Hao Dong
bba66e54b3
Merge "Count isActivityEmbedded() state to show split screen warning dialog" into udc-dev
2023-04-14 19:04:55 +00:00
Treehugger Robot
239cbd309c
Merge "Fix rotate device at face unlock detailed page, device will display redundant face unlock header." into udc-dev am: 9ce2e21857
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22613587
Change-Id: I7d3fa93325a793f22c10e6fee70b971362039830
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-14 17:50:06 +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
Avinash Vadlamudi
7183e83b0b
Store the PIN length to disk when Pin auto confirm feature is enabled
...
Bug: 267222046
Test: Manual test
Change-Id: I4f76e607ea7fb08d20a042e49c9669f8988aeff8
2023-04-14 16:39:19 +00:00
Treehugger Robot
8f26a174e3
Merge "Only admin users may change private DNS settings" into tm-qpr-dev am: a5a31037cc
am: 0369c601c0
am: 202cff3d64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22414528
Change-Id: I8bb72aa9203c9179987a74b333a8abed8522a29d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-14 16:32:41 +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
a730043c30
Merge "Add text for T-QPR3 to udc branch first." into udc-dev am: a9469717a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22645641
Change-Id: Ide7e637a22738df81521877b246c83f32ad3d3b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-14 15:02:00 +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
Treehugger Robot
a9469717a0
Merge "Add text for T-QPR3 to udc branch first." into udc-dev
2023-04-14 14:27:41 +00:00
Kweku Adams
aca72e46ac
Merge "Hide TARE page when disabled." into udc-dev am: 21b9d15cd6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22384966
Change-Id: I36c2a77073053fb667fea187930a1d369cebd9ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-14 13:51:22 +00:00
Kweku Adams
21b9d15cd6
Merge "Hide TARE page when disabled." into udc-dev
2023-04-14 13:20:06 +00:00
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
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