Xin Li
5482fb0301
Merge tm-qpr-dev-plus-aosp-without-vendor@9467136
...
Bug: 264720040
Merged-In: Ic8d9f286c53e321a933d98f9c05bbc6bb8bf98f0
Change-Id: I2f32b289ee96a205816ed48e8f4490d081a0d315
2023-01-11 22:47:24 -08:00
Shen Lin
1721d0f276
Amend "Reset notification importance" list item style
...
Using LayoutPreference here makes list look like abrupt, we would like
to switch to normal Preference to align listitem style.
Bug: 265062898
Test: atest ImportanceResetPreferenceControllerTest -c
Change-Id: I93961de148915699d2cba46bdba71e667e8ea10a
2023-01-11 05:21:59 +00:00
Yasin Kilicdere
541a984ce0
Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac
am: 2ecf96a422
am: 85379e9452
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167
Change-Id: I64b7be5d06cc021d992ed2ca1d84305669234fca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-03 23:03:32 +00:00
Yasin Kilicdere
85379e9452
Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac
am: 2ecf96a422
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167
Change-Id: I6474b049eea96fa6b51692a71ea7a2433cdfb620
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-03 13:25:59 +00:00
Yasin Kilicdere
2ecf96a422
Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167
Change-Id: I2c91cb0334d6151759f925ea84286c9af619f897
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-03 12:53:48 +00:00
Yasin Kilicdere
ee476cab18
Remove the fallback AddSupervisedUserActivity.
...
Rollback the changes done in ag/16388725 and ag/16709333
Bug: 209659998
Test: croot && make RunSettingsRoboTests -j40 ROBOTEST_FILTER="com.android.settings.users.UserSettingsTest"
Change-Id: I75b85df50a3caff55375ad261a97225377644a38
(cherry picked from commit 86f3500439
)
Fixes: 249057848
2022-12-07 15:23:37 +00:00
Joshua Mccloskey
945d614158
Merge "Centered fingerprint icon" into tm-qpr-dev am: 0fb3dc390c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20447129
Change-Id: I9c88dcafd1cb73dae5dc1a7137ff78337d4d69bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-15 01:51:14 +00:00
Joshua Mccloskey
8bc66cbb9f
Merge "Remove sidefps toggle from SUW." into tm-qpr-dev am: 94ddcba809
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20442178
Change-Id: Ib5ddf26067cdd3e07ebc414aa82306fee68e0add
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-15 01:50:46 +00:00
Joshua Mccloskey
0fb3dc390c
Merge "Centered fingerprint icon" into tm-qpr-dev
2022-11-15 01:14:07 +00:00
Joshua Mccloskey
94ddcba809
Merge "Remove sidefps toggle from SUW." into tm-qpr-dev
2022-11-15 01:14:01 +00:00
Joshua McCloskey
c10d8ca045
Remove sidefps toggle from SUW.
...
Test: Verified manully that the toggle is no longer
present when enrolling sidefps.
Fixes: 258687688
Change-Id: I0ea63a61908b45399ba09ff31fd8fe6a4aacfb41
Merged-In: I0ea63a61908b45399ba09ff31fd8fe6a4aacfb41
2022-11-14 17:29:58 +00:00
TreeHugger Robot
19bc5093dd
Merge "Shorten the search box hint for two-pane layout" into tm-qpr-dev am: 0b0e75d726
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20441365
Change-Id: Ib4ea24d56abf44dc50d94852efc4a6d2cc3e1de5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-11 03:42:13 +00:00
Joshua McCloskey
566a7a3031
Centered fingerprint icon
...
Test: Verified icon was centered in the fingerprint enrollment finish
page.
Fixes: 258604191
Change-Id: I33f19731921ef39829a6bbbaa1d1b097b95d64d4
2022-11-11 00:03:34 +00:00
Jason Chiu
13ce1b48d8
Shorten the search box hint for two-pane layout
...
Change from "Search settings" to "Search".
Fix: 248006011
Test: visual
Change-Id: I76a1fa0f8c38e5438f2b01a1b6d83cae3968502c
Merged-In: I76a1fa0f8c38e5438f2b01a1b6d83cae3968502c
(cherry picked from commit 3aec52141d
)
2022-11-10 17:52:56 +00:00
Jason Chiu
2cbced55a4
Merge "Reserve the icon space to avoid preference padding change" into tm-qpr-dev am: b9b1225ac3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20392450
Change-Id: I848120e8276098a0df41c2c1d8cea68682c21e20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-08 05:02:35 +00:00
Jason Chiu
fb95451369
Reserve the icon space to avoid preference padding change
...
If the injection icon is to be retrieved from a provider, the preset
transparent drawable is a 1x1 icon, which may cause the preference
padding change before and after the injection icon reloading.
Bug: 253471066
Test: robotest, visual
Change-Id: Ie88f69bb047a64a6a0ee30c060d8cbb8fe27b3d7
2022-11-07 10:11:20 +00:00
Joshua McCloskey
e3162c2a6b
Updated sfps screen auth toggle. am: 7b58cadcfc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20378668
Change-Id: I5df9568f472562bdb2f80c36eb777913ce31323f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-04 01:24:43 +00:00
Joshua McCloskey
7b58cadcfc
Updated sfps screen auth toggle.
...
Test: Verified toggle is on top of icon during fingerprint setup.
Fixes: 254923267
Change-Id: Id2f6444646201b6e4eca0c563984527776227ebb
2022-11-03 22:22:09 +00:00
Shaowei Shen
bae059a834
Merge "[Sound Panel] Set inset for button background" into tm-qpr-dev am: 7ebdcf7b14
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20288323
Change-Id: Ie07cd8e98461f59d1b9541591ee6f638f8579661
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-03 02:42:26 +00:00
Joshua Mccloskey
4033cc7d0e
Merge "Implement SFPS “require screen on to auth”" into tm-qpr-dev am: db266ca6b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20215190
Change-Id: I7f485c93b429fc2d2f75b1fc3e46d82a47e31c25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-03 02:39:08 +00:00
Shaowei Shen
7ebdcf7b14
Merge "[Sound Panel] Set inset for button background" into tm-qpr-dev
2022-11-03 02:18:52 +00:00
Grace Cheng
13d3bdc4c0
Implement SFPS “require screen on to auth”
...
Creates new setting on SFPS to require screen on before unlocking a
device. Also sets up toggles for this setting at the end of fingerprint
enrollment and on the fingerprint settings page, and adds tests to
verify expected behavior.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintSettingsRequireScreenOnToAuthPreferenceControllerTest
Fixes: 249169615
Fixes: 245343077
Fixes: 248530806
Change-Id: Id588796426d071860b3cc2af9ec5798c0027c202
Merged-In: Ia44604b059c4847c40608419b2e16219976ced3e
2022-11-02 14:34:59 +00:00
shaoweishen
c860f87861
[Sound Panel] Set inset for button background
...
add inset for button of Sound panel, to prevent truncated when set
Display/Font size to biggest.
attached screenshots in bug.
Test: Verified on device
Bug: 252952472
Change-Id: I407d4d6cdac47cfcc63470aa8b5d4e5817e1705b
2022-10-27 03:09:36 +00:00
Tom Hsu
f0635482c7
Merge "Revert "[Languages] Add new information to system language page."" into tm-qpr-dev am: 43ceaa85ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20064133
Change-Id: Ie4a6ec648a8a524d25f44dca22cbc145884c664b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-29 16:27:06 +00:00
Tom Hsu
43ceaa85ee
Merge "Revert "[Languages] Add new information to system language page."" into tm-qpr-dev
2022-09-29 15:52:32 +00:00
Tom Hsu
a4c78e3820
Revert "[Languages] Add new information to system language page."
...
This reverts commit 3cbb6f8680
.
Reason for revert: b/248456615
Change-Id: I3bc5088784ed97f69ffadb0ea69078bfcf7dc39d
Merged-In: I3bc5088784ed97f69ffadb0ea69078bfcf7dc39d
2022-09-29 04:38:30 +00:00
Grace Cheng
59f4b7bdc9
Merge "Fix alignment of finger animation with progress bar" into tm-qpr-dev am: 108b73d972
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19995253
Change-Id: Ifc2d6aeaba2ac559b695fd1084ce6668fcc8c94e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 18:38:19 +00:00
Grace Cheng
76902f4b7c
Fix alignment of finger animation with progress bar
...
Makes progress bar opaque and fixes color codes accordingly, and adjusts
values to shift finger animation and progress bar for proper alignment
Test: Enroll finger in light and dark theme and observe alignment of
finger with progress bar
Fixes: 245819077
Change-Id: I26bea8e1870f08b413a4ec2a9e6e83015facd004
Merged-In: I26bea8e1870f08b413a4ec2a9e6e83015facd004
2022-09-20 16:53:09 +00:00
Sayak Dutta
5e168a5e7d
Merge "Fix following three issues in SD Card UX" into tm-qpr-dev am: f57f988349
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19967364
Change-Id: I17bafb783c166f5681326c3fbb0a8f2040c62a19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-18 06:21:10 +00:00
Sayak Dutta
4c36d4903d
Fix following three issues in SD Card UX
...
1) Link should not work if up-events happen outside the target region
2) Activity should retain it's last state on changing configuration
3) Improve color contrast for "Format card" button
Bug: 246485658
Bug: 246681292
Bug: 246871051
Change-Id: Iebc87e35a3f8496a33a43d906b7faba05d95fe6c
2022-09-15 16:09:18 +00:00
Grace Cheng
3dc93daa7a
Merge "Update SFPS enrollment education assets and add light/dark theme colors" into tm-qpr-dev am: 19ee730df2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19885882
Change-Id: Ia7abc775b5c535f7d126668f705830c8a2077726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-09 16:27:28 +00:00
Grace Cheng
19ee730df2
Merge "Update SFPS enrollment education assets and add light/dark theme colors" into tm-qpr-dev
2022-09-09 16:24:06 +00:00
Grace Cheng
f15c726127
Update SFPS enrollment education assets and add light/dark theme colors
...
Updates SFPS enrollment education layout and adds new assets indicating
sensor location in each orientation. Also defines color codes and adds
LottieColorUtils to dynamically map LottieAnimationView colors from light/dark theme
Test: Observe correct assets during enrollment in all orientations
Fixes: 242074146
Fixes: 238596925
Change-Id: If3b7502350057cc9b04f12aa9a5b36be06958630
2022-09-09 07:09:27 +00:00
Peter Zhang
7572bafb98
Merge "Fix insufficient contrast for the strings "Dimmer" and "Brighter" in the light theme" into tm-qpr-dev am: 66dee9be82
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19867066
Change-Id: I058b6b73ec3d92d5d80c4dd59ae0d55954b7c496
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 05:30:11 +00:00
menghanli
70a63abfe4
Fix insufficient contrast for the strings "Dimmer" and "Brighter" in the light theme
...
Apply same the sub text style from seekbar preference
Bug: 219752953
Bug: 229722937
Bug: 245093240
Fix: 245093240
Test: Manual testing
Change-Id: If107452b942e23dee17c73873f4aedc3a25c7f5d
(cherry picked from commit a8b9c805a2
)
2022-09-07 15:48:23 +00:00
YK Hung
06e92f5e45
Merge "Update defend tips card" into tm-qpr-dev am: 8bf872331b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19764101
Change-Id: I6c4d4d551dc4ccd1897422cd65bf26cadeb9994c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 15:46:17 +00:00
Wesley
243b450428
Update defend tips card
...
- Update defend tips card to unclickable
- Update secondary button's action and content description
screenshot: https://screenshot.googleplex.com/BYU8Mh5abJ9Tirh.png
Bug: 243769797
Bug: 243641857
Bug: 244219076
Test: make SettingsRoboTests
Change-Id: I7fdf5f7404d33f0374a992c83a7653a01b9f11bc
2022-09-01 04:09:31 +00:00
Grace Cheng
35125a3d2b
Merge "Implement SFPS guided enrollment for T6" into tm-qpr-dev am: 2c9dab6f0a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19562137
Change-Id: I11ce675560e40ab1c946b01e14fee329e77bfac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-01 01:13:36 +00:00
Grace Cheng
4a187e15d6
Implement SFPS guided enrollment for T6
...
Reduces perception of long enrollment process by introducing new enrollment layout and stages for SFPS. Also adds user feedback via new animated assets with dynamic colors, and all associated strings and a11y labels.
Test: Observe new guided enrollment process on T6
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Fixes: 232024488
Fixes: 233091341
Fixes: 241165082
Fixes: 242218240
Fixes: 243813773
Change-Id: I1fa0b9349545586919eceeb9d05f365c2f2ec491
Merged-In: I1fa0b9349545586919eceeb9d05f365c2f2ec491
2022-09-01 00:47:22 +00:00
Austin Delgado
71b2bb8f5c
Merge "Made learn more links clickable in biometric intros" into tm-qpr-dev am: bbcdc91967
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19582557
Change-Id: I7270f6c80cef2c28697e1ba85c9fcaaf57f25263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-30 17:37:21 +00:00
Austin Delgado
bbcdc91967
Merge "Made learn more links clickable in biometric intros" into tm-qpr-dev
2022-08-30 17:15:49 +00:00
András Kurucz
3ba24a4d94
Merge "Fix RTL layout for Notifications history" into tm-qpr-dev am: 64eb84bd7b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19742516
Change-Id: If754d4aed96372e28bae17ad04e11e2f087161a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 15:14:20 +00:00
András Kurucz
64eb84bd7b
Merge "Fix RTL layout for Notifications history" into tm-qpr-dev
2022-08-26 14:54:54 +00:00
András Kurucz
711dc8f9e2
Fix RTL layout for Notifications history
...
Using ConstraintLayout Guideline is causing an issue with RTL languages.
Test: check the Last 24hrs Notification history using forced RTL layout direction and different Display and Text sizes
Fixes: 243029840
Change-Id: Ia0807d94da4ad5aac7c8000460388ddb6ddbe987
2022-08-26 13:14:53 +00:00
Bill Lin
b154b58576
Merge "Refine face enroll & remove button layout padding" into tm-qpr-dev am: 37dfb4c46d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19742513
Change-Id: I95c27570429ac01d467545543627ef0854194113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 01:50:30 +00:00
Bill Lin
37dfb4c46d
Merge "Refine face enroll & remove button layout padding" into tm-qpr-dev
2022-08-26 01:19:04 +00:00
lbill
b77c2639d9
Refine face enroll & remove button layout padding
...
The button include in the security_settings_face.xml
When FaceSettingsRemoveButtonPreferenceController#updateState(),
the margin of Button will be overrided by FooterButtonStyleUtils.
So we should set listPreferredItemPaddingStart or End for Button's
parent view instead.
Test: manual Security > Face Unlock > Delete face model
> Set up face unlock > Back > Check the button layout
Bug: 202091542
Change-Id: I2b3815f5484ae1e5d256a43b432384e5f0f0f96a
2022-08-25 10:24:09 +00:00
Tom Hsu
7dfd2ade2f
Merge "[Languages] Add new information to system language page." into tm-qpr-dev am: bd3c0da9e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19594790
Change-Id: I767bf8a2b177a5b764458e7c8fff90e3de1b869b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-25 07:25:42 +00:00
Tom Hsu
bd3c0da9e3
Merge "[Languages] Add new information to system language page." into tm-qpr-dev
2022-08-25 06:24:12 +00:00
TreeHugger Robot
3588b515f2
Merge "Port battery usage bug fixing cls from master to tm-qpr-dev" into tm-qpr-dev am: adf79eae3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19711303
Change-Id: I137233586abf15929227f3795ef061699a7335e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 06:01:14 +00:00