Hao Dong
55ec9b88d6
Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev am: 72f2058d3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830605
Change-Id: I0411207e8f9a2c955c268b456b83f0b9c871dbb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 00:06:58 +00:00
Hao Dong
72f2058d3e
Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev
2023-06-29 23:51:50 +00:00
Matías Hernández
9feb898da7
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: aaddfd88e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247
Change-Id: I0f6901ca11f07090c15146dac2b0b39c67db8eb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:35:52 +00:00
Matías Hernández
aaddfd88e9
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247
Change-Id: If35fbb5c16a642b56de29012ce43ecd7f068d5b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 17:14:55 +00:00
Matías Hernández
4d34eb2c7a
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev
2023-06-28 16:42:13 +00:00
Hao Dong
2ca3f3232c
Fix Fingerprint enrollment UI when display size is largest.
...
1. Remove land/udfps_enroll_enrolling and use the default land layout
instead. Swap header and content when necessary to avoid overlap.
2. Add UdfpsEnrollEnrollingView.java
Test: manual test - 1. Set system display and font size largest
2. Launch fingerprint enrollment and check UI.
Test: atest FingerprintEnrollEnrollingTest
Bug: 269060514
Bug: 283169056
Change-Id: Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec
Merged-In: Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec
2023-06-27 17:48:16 +00:00
Hao Dong
93bcf8122c
Wait for systemui udfps overlay ready to show settings udfps enroll view. am: be823bc598
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23814463
Change-Id: I0b509bd402107442b93f6855f34389dfa61c59e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-26 23:26:53 +00:00
Hao Dong
be823bc598
Wait for systemui udfps overlay ready to show settings udfps enroll view.
...
Previously, we show settings's udfps enroll animation view (the fingerprint icon and progress view) once the FingerprintEnrollEnrolling is shown.
However, touch events have to wait for systemui's udfps overlay to be valid. This CL lets settings's udfps enroll view wait for systemui's overlay.
1. Sets udfps enroll animation view's default visibility Gone.
2. Propagates FingerprintManager#onUdfpsOverlayShown to
FingerprintEnrollEnrolling and when it's called, set the enroll view
visible.
Besides, this CL renames onPointerDown() and onPointerUp() with Udfps.
Bug: 280718879
Test: atest FingerprintEnrollEnrollingTest
Change-Id: Ieed3e74c182828918785edcacb021f19a3665f2a
2023-06-26 20:21:05 +00:00
Hao Dong
d44eccbc5f
Merge "Fix delete face button disappear after reenroll" into udc-d1-dev am: 0f63a450a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23768213
Change-Id: Idc66a1838b701b91affa038a581b1410b78115a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-23 00:50:35 +00:00
Hao Dong
bf84218753
Fix delete face button disappear after reenroll
...
Test: manual test - 1.enroll a face 2. delete the face and reenroll 3.
back to face settings page, the button is delete button instead of set
up button
Bug: 285806446
Change-Id: I6739296b0b099446489956f8f609c87600ffdaa3
2023-06-21 18:45:40 +00:00
Matías Hernández
027f0a46ae
Settings: don't try to allow NLSes with too-long component names
...
* NotificationAccessConfirmationActivity (triggered through CompanionDeviceManager) -> Don't show the dialog, bail out early similarly to other invalid inputs.
* NotificationAccessSettings (from Special App Access) -> No changes, but use the canonical constant now.
* ApprovalPreferenceController (used in NotificationAccessDetails) -> Disable the toggle, unless the NLS was previously approved (in which case it can still be removed).
Fixes: 260570119
Fixes: 286043036
Test: atest + manually
Change-Id: Ifc048311746c027e3683cdcf65f1079d04cf7c56
2023-06-21 17:02:32 +02:00
TreeHugger Robot
87f7101866
Merge "Remove Wi-Fi hotspot from settings search for non-admin users" into udc-d1-dev am: c548cdc4a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23753764
Change-Id: I8ca64005b6dcdc623771de162eb6d68f7fb65808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 04:58:20 +00:00
TreeHugger Robot
c548cdc4a9
Merge "Remove Wi-Fi hotspot from settings search for non-admin users" into udc-d1-dev
2023-06-21 04:25:57 +00:00
Weng Su
7bd6646e5f
Remove Wi-Fi hotspot from settings search for non-admin users
...
- Don't use ViewModel if the settings UI is restricted
Bug: 284931681
Test: manual test
atest -c WifiTetherSettingsTest
Change-Id: I3ae23b01b3be821c3560552b39cbd83ab51b2095
2023-06-21 06:58:18 +08:00
Julia Tuttle
205135ffa4
Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: 4d3b967fb8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613
Change-Id: I4fb9af8f7ea4bf07b81b9a12034700cee6ca5905
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 17:48:41 +00:00
Julia Tuttle
4d3b967fb8
Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613
Change-Id: Id026252a0ef651a3ef12d1e1fdbf261368f0d18e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 17:06:35 +00:00
Treehugger Robot
a58d63cfc7
Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97 am: 45918b72bf am: e1858cab06 am: 975e782dd4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212
Change-Id: I9294386b4cec4e05c6d843420313dc52a74efa9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 15:20:54 +00:00
Treehugger Robot
975e782dd4
Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97 am: 45918b72bf am: e1858cab06
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212
Change-Id: I4b486b4da6d99522ab004876fb1abdc2f45766dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 14:37:21 +00:00
Treehugger Robot
e1858cab06
Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97 am: 45918b72bf
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212
Change-Id: I41a6347afc1fe6a038ac75bf6a76855b42268f3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 13:50:31 +00:00
Treehugger Robot
45918b72bf
Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212
Change-Id: I11e6110ba0b640be8b373d9afd45f806c005b05f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 13:13:42 +00:00
Treehugger Robot
aa3dc53d97
Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE"
2023-06-20 12:13:34 +00:00
Dmitrii Merkurev
d7d4ec224f
Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE
...
Currently factory reset action is ignored if
PERSISTENT_DATA_BLOCK_SERVICE isn't presented on device.
Make sure that we can execute regular factory reset without
it by utilizing the logic from shouldWipePersistentDataBlock.
Test: manual verify on aosp build
Bug: 129137473
Bug: 196634851
Change-Id: I2abcb93cbc0872dd920c1dd62152596ddd723691
Signed-off-by: Dmitrii Merkurev <dimorinny@google.com >
2023-06-19 21:06:25 +01:00
Chaohui Wang
c1f06b5e28
Merge "Update the OWNERS for bluetooth & connecteddevice" am: 6b2f2ab205 am: 7fdf1c4b17 am: b1231c5f15 am: 6bceb29408
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629910
Change-Id: I95132b6df6fe214a0bae54b9c7be69efa77292b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-19 11:28:16 +00:00
Chaohui Wang
6bceb29408
Merge "Update the OWNERS for bluetooth & connecteddevice" am: 6b2f2ab205 am: 7fdf1c4b17 am: b1231c5f15
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629910
Change-Id: I936a6e4a4f24a7f8c238662ec09a02f7a3e985e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-19 10:45:36 +00:00
Chaohui Wang
b1231c5f15
Merge "Update the OWNERS for bluetooth & connecteddevice" am: 6b2f2ab205 am: 7fdf1c4b17
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629910
Change-Id: I9e87eec0995e9dde010a51e3a7ccbaf68839a696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-19 09:56:38 +00:00
Chaohui Wang
7fdf1c4b17
Merge "Update the OWNERS for bluetooth & connecteddevice" am: 6b2f2ab205
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629910
Change-Id: Ia337805f374b7c05bac8902ff9add84ced999f9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-19 09:17:09 +00:00
Chaohui Wang
85c1dea20a
Update the OWNERS for bluetooth & connecteddevice
...
Bug: N/A
Test: N/A
Change-Id: I72b4b6f47586b2dd13cfcc4a642c817c93e4ded0
2023-06-19 07:35:20 +00:00
Chaohui Wang
fd264a7696
[LE Broadcast] Fix crash when scan QR code am: c91d017080
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23729065
Change-Id: I0ca420666067575ff0e970a0ec255b024e7ed8e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-19 07:01:37 +00:00
Julia Tuttle
b23136041d
Fix colors in importance and conversation priority preferences
...
This would have been simpler and faster, but the ChannelPanelActivity
was giving me a context where Material colors always inflated in light
theme even if the device was in dark theme, so I had to work around it.
On the plus side, whoever next needs to change these colors will find
them neatly organized in themes.xml!
Bug: 284380876
Test: manual
Change-Id: I2eee877fe44d307a96d60168d0317444ff002669
2023-06-16 19:17:09 +00:00
Chaohui Wang
c91d017080
[LE Broadcast] Fix crash when scan QR code
...
Crash happens when rotated screen.
QrCodeScanModeFragment should only have default constructor.
Remove unused params to fix.
To start this page,
adb shell am start \
-a android.settings.BLUETOOTH_LE_AUDIO_QR_CODE_SCANNER
Fix: 287363885
Test: Manually
Change-Id: I3c4bcfdb8ae6ddf750e16d8e7565cb9d45d11788
2023-06-16 16:10:53 +00:00
Treehugger Robot
c68d307ca8
Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 am: 2c73cc8ca8 am: 2010c175a6 am: 2d23561a25
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935
Change-Id: I7f514c59303087a72787d6c0814ede0ecdf0743d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 12:31:02 +00:00
Treehugger Robot
2d23561a25
Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 am: 2c73cc8ca8 am: 2010c175a6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935
Change-Id: I575d1fc77fefd4bd5b441403f0bc88cf7ede8b5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 11:44:07 +00:00
Treehugger Robot
2010c175a6
Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 am: 2c73cc8ca8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935
Change-Id: I9c423f5290eec4f6a8ac68aca4ece6b6675e7a5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 10:33:50 +00:00
Treehugger Robot
2c73cc8ca8
Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935
Change-Id: Id3c8af985ccaaa05e29238bc3c0bcda257fe132e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 09:50:45 +00:00
TreeHugger Robot
ee77d651fa
Merge "[Settings] Avoid NPE when user enter WifiCallingSettings back and forth" into udc-d1-dev am: 1765c1dc6e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695884
Change-Id: I8bbc5d48e272ab0a5b7880f1ee3b99043df64665
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 05:00:40 +00:00
TreeHugger Robot
1765c1dc6e
Merge "[Settings] Avoid NPE when user enter WifiCallingSettings back and forth" into udc-d1-dev
2023-06-15 04:07:32 +00:00
Treehugger Robot
d4aa1b65a5
Merge "[Settings] Imporve MMS message UI state update" into udc-d1-dev am: 8182348d5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23669450
Change-Id: I159952074306255db4397de180ee4b49eb78613b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 03:53:50 +00:00
Treehugger Robot
8182348d5c
Merge "[Settings] Imporve MMS message UI state update" into udc-d1-dev
2023-06-15 03:02:41 +00:00
tom hsu
8bb09238bb
[Settings] Avoid NPE when user enter WifiCallingSettings back and forth
...
Bug: 277833102
Test: Manual test
Change-Id: Ifd3272ddf8b8a27fc7772d860653df2c33a3df7b
2023-06-15 02:58:42 +00:00
Matías Hernández
4c941d3a97
Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 2b1faa0aea am: dcbe38baa9 am: e8cfc9cb3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I1a2c78f743615bdc351061846fd65f4e23777c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 17:21:49 +00:00
Matías Hernández
33e5518af1
Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 2b1faa0aea am: dcbe38baa9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: Ie91f13e1b27753177e9bd7f7b88e9f2821cdada1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 16:38:43 +00:00
Matías Hernández
bbfe425326
Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 0166bcc776 am: 46cdbed02e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I1f7f948108f6f3e9a0ca2f978aaf1847c7c3e496
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 16:38:15 +00:00
Matías Hernández
e8cfc9cb3d
Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 2b1faa0aea am: dcbe38baa9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: Ic1d0d1cda4e35705215fe4268974f304350cfbc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 16:37:43 +00:00
Matías Hernández
46cdbed02e
Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 0166bcc776
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I91e72e84a4f239501953dbcf048f6043ea588ff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 15:55:36 +00:00
Matías Hernández
dcbe38baa9
Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 2b1faa0aea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I69d2ef43afb54ce3b9d141d4f676b688dd1c5c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 15:52:58 +00:00
Matías Hernández
0166bcc776
Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I33040a000b1bc4e90b9e76c8e751bca2e09959d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 15:10:59 +00:00
Matías Hernández
2b1faa0aea
Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I715da9406bd9d3fe88ff7b5353db1780109880e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 15:09:53 +00:00
David Magno
50e8eab484
'Mobile plan' is searchable even if it is unavailable
...
'Mobile plan' yields a search hit event though the 'Mobile plan'
setting is unavailable on the device.
Bug: 287198186
Test: Manual
Change-Id: Ibc6f01602a364ae902f8a6ce15083890e89446d2
2023-06-14 16:25:27 +02:00
Matías Hernández
0aa241be99
Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I8cd7cc9605b3728f9f96c3479d17aa1b362d9cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 14:22:10 +00:00
Matías Hernández
a49e14f8ff
Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I840d7836ae899bcd40eafc772b96c9460c3f8a02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 13:42:07 +00:00