Jason Hsu
d3453f681c
Merge "Fix pair another dialog doesn't show up after pairing in all bluetooth device page." into udc-dev am: 80016ad92a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22477523
Change-Id: I2d794bf5d149f2301364431114abdbe04352e8ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 09:00:43 +00:00
Jason Hsu
80016ad92a
Merge "Fix pair another dialog doesn't show up after pairing in all bluetooth device page." into udc-dev
2023-04-18 08:47:37 +00:00
Treehugger Robot
9c37881b64
Merge "[BiometricsV2] fix enrolling rotate failed" into udc-dev am: 2a0d6ead1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22651124
Change-Id: Id9d4afd348cd1274dc37cee3d5fa73b0e88789b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 05:26:25 +00:00
Treehugger Robot
2a0d6ead1a
Merge "[BiometricsV2] fix enrolling rotate failed" into udc-dev
2023-04-18 04:56:12 +00:00
YK Hung
74692be06c
Merge "Cleanup smart battery entries (1/3)" into udc-dev am: d9f390010b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22639713
Change-Id: Ib0ce398e1d92751367123891c9930735626ae62f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 02:22:49 +00:00
YK Hung
d9f390010b
Merge "Cleanup smart battery entries (1/3)" into udc-dev
2023-04-18 01:59:06 +00:00
Jay Sullivan
a90fd5c5cb
Merge "[Safety Labels] Filter out auto, wear and tv" into udc-dev am: 4d5ac5a89f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562077
Change-Id: If69eb762d77b1b1ba3fe405cf78a9f23e8d16f37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-17 20:13:47 +00:00
Becca Hughes
167ba43c34
Merge "Add dialog for enabling a provider in settings" into udc-dev am: e18613ccc6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22605959
Change-Id: I981fe036a79c7c2476ff5ba46021ca6ace57dd97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-17 20:12:52 +00:00
Jay Sullivan
4d5ac5a89f
Merge "[Safety Labels] Filter out auto, wear and tv" into udc-dev
2023-04-17 19:53:43 +00:00
Becca Hughes
e18613ccc6
Merge "Add dialog for enabling a provider in settings" into udc-dev
2023-04-17 19:42:57 +00:00
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
Becca Hughes
b69351b06d
Add dialog for enabling a provider in settings
...
Test: manual
Bug: 277923170
Merged-In: I404444115f178faf5545dec9686096fcdfdf73de
Change-Id: I404444115f178faf5545dec9686096fcdfdf73de
2023-04-17 18:06:50 +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
Wesley Wang
742e506d13
Cleanup smart battery entries (1/3)
...
- Remove smart battery entry from battery settings page since
restriction app info already move to app list page and smart battery
feature will keep as enabled, smart battery page will be empty
- Enable battery usage list page for AOSP
Bug: 277175992
Test: make SettingsRoboTests
Change-Id: I9221cecbfc8445b8f470975551f600e94e3128d5
2023-04-17 16:50:21 +08:00
YK Hung
ebb97daa57
Merge "Update the card preference buttons margin" into udc-dev
2023-04-17 08:49:48 +00:00
Milton Wu
562bbc8193
[BiometricsV2] fix enrolling rotate failed
...
Clean help message during progress changed, and reload help message from
ViewModel in onStart of enrolling page.
Bug: 275513362
Test: atest FingerprintEnrollProgressViewModelTest
Test: enable biometrics v2, and manully rotate screen when help msg
is shown, and check help msg is kept after screen rotation.
Change-Id: I44220050806038ee62750f8945b8ba8f8bb9c282
2023-04-17 08:06:53 +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
jasonwshsu
c8a53a9391
Fix pair another dialog doesn't show up after pairing in all bluetooth device page.
...
Solution: Finish the page immediately to back to previous page when already BONDED the device in
all bluetooth device page.
Bug: 270096758
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ViewAllBluetoothDevicesPreferenceControllerTest
Change-Id: I13a88c3fbe0c6851f9446a9f574a1c18f934cd2e
2023-04-14 18:25:28 +08: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