TreeHugger Robot
311d818b10
Merge "Refine checkMaxEnrolled() for fingerprint" into tm-qpr-dev
2022-09-12 23:57:04 +00:00
Bill Yi
677cd61616
Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE"
2022-09-12 17:59:03 +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
Treehugger Robot
5d3e2d3f42
Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am: 4378ee11ad
am: 1f9c4c483a
am: 693ce48efb
am: 2d1b325cd0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2210776
Change-Id: I8fc0d30dd8338152ce2e9c7dc7741b9543f6dcf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-09 16:10:43 +00:00
Treehugger Robot
2d1b325cd0
Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am: 4378ee11ad
am: 1f9c4c483a
am: 693ce48efb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2210776
Change-Id: If71d8f5e024a9ecc993ff35140995c3627c85196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-09 15:46:13 +00:00
Treehugger Robot
693ce48efb
Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am: 4378ee11ad
am: 1f9c4c483a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2210776
Change-Id: I2b246b643ff341ff8a2158cbabd3f4a33c04703f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-09 15:18:57 +00:00
Treehugger Robot
1f9c4c483a
Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am: 4378ee11ad
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2210776
Change-Id: Ib115186ff66f8246082bc274624cb116a63c790c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-09 14:49:24 +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
Shen Lin
78fc8a21a4
Fix potential NPE crash in ConversationHeaderPreferenceController
...
mChannel is nullable and we have to do a null-check before calling its method.
Bug: 245506600
Test: manual and atest
Change-Id: Ib739f0f66f1a2aee1b2741263e7c206341782892
2022-09-09 10:16:29 +08:00
Rambo Wang
c21d77b724
Merge "Support AIDL IDumpstateDevice service in verbose vendor logging" into tm-qpr-dev am: 31cd5304ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19885633
Change-Id: I7b90423f637140df909eedc024a801d700148e42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 22:23:55 +00:00
Rambo Wang
31cd5304ab
Merge "Support AIDL IDumpstateDevice service in verbose vendor logging" into tm-qpr-dev
2022-09-08 21:57:11 +00:00
Bill Yi
042554a0e4
Merge TP1A.220905.004 to aosp-master - DO NOT MERGE
...
Merged-In: Id0c4e3c68ee40e5d0d57449b531228b31f2246ac
Merged-In: Ib71b6904b5c85b3d9f96563bd38bbf2d0305127d
Change-Id: I186ff56c007d17ad650b64facfbd4862cc06bf9a
2022-09-08 14:23:20 -07:00
Milton Wu
4f93ef7790
Fix incorrect choose screen lock during unicorn
...
ChooseLockGeneneric uses intent extra key to determine correct strings
on "Choose screen lock" screen.
Bug: 219419005
Test: atest BiometricEnrollActivityTest
Test: Manully test SUW as following combinations
1. W/ unicorn flow or W/O unicorn flow
2. Fingerprint only devices or Fingerpirnt+Face devices
Change-Id: I2abf9555676f3fb3b92dd6ddcc091ea8158bfe9f
2022-09-08 07:54:53 +00:00
Shen Lin
e960694a15
Fix compile warnings due to non-varargs call of varargs method
...
Bug: 245384099
Test: manual
Change-Id: Ie25c53b20cad318097ff17b7df0b4dd9ffeb4a32
Merged-In: Ib225d185b6f15463f4fae809e0cdaa25920d52af
2022-09-08 07:02:52 +00:00
Rambo Wang
c9292dc792
Support AIDL IDumpstateDevice service in verbose vendor logging
...
IDumpstateDevice HAL switched to AIDL service in P22 devices.
This change will firstly apply to AIDL service if available and
fall back to HIDL service if not, making the feature work for
both HIDL an AIDL based devices.
Bug: 242634531
Test: make && make RunSettingsRoboTests
Change-Id: I4a2ec44092804574a60113e5be3df19b586bfa64
Merged-In: I4a2ec44092804574a60113e5be3df19b586bfa64
(cherry picked from commit 17a9fb6bec
)
2022-09-08 05:29:10 +00:00
Treehugger Robot
fc899d5e64
Merge "Fix NPE crash in TextToSpeechSettings" am: 6672e37864
am: 451ced2f5a
am: 1b69e6b87c
am: f0c250900c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2208995
Change-Id: I6d2cc6fbab002ad366a73dd2241e0afccbe46303
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 03:16:53 +00:00
Bill Yi
e7e935454f
Merge "Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master
2022-09-08 02:32:31 +00:00
PETER LIANG
66816bcbc6
Merge "Fix the preview section incorrectly ordered of the display size and text." into tm-qpr-dev am: 240eb5c9e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19770084
Change-Id: I309b5d5fd545ad6289df487669c4dbccdb03526e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 02:31:54 +00:00
Menghan Li
5f9570381f
Merge "Fix extra dim turns on failed in setting search bar" into tm-qpr-dev am: 299057e294
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19880529
Change-Id: I0e107181ccbf59fc80d1b429768f8281128092cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 02:31:25 +00:00
Treehugger Robot
f0c250900c
Merge "Fix NPE crash in TextToSpeechSettings" am: 6672e37864
am: 451ced2f5a
am: 1b69e6b87c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2208995
Change-Id: I63721073b4e8032505b97413cf8064caa3497ff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 02:18:57 +00:00
PETER LIANG
240eb5c9e5
Merge "Fix the preview section incorrectly ordered of the display size and text." into tm-qpr-dev
2022-09-08 02:09:13 +00:00
Peter_Liang
e10799c774
Fix the preview section incorrectly ordered of the display size and text.
...
Goals: Set correct order into.
Fix: 233326281
Test: manual test
Change-Id: I88c65aa9c3f05281a5c5090c2ca9503327bb580f
Merged-In: I88c65aa9c3f05281a5c5090c2ca9503327bb580f
(cherry picked from commit 4b13620457
)
2022-09-08 02:07:02 +00:00
Menghan Li
299057e294
Merge "Fix extra dim turns on failed in setting search bar" into tm-qpr-dev
2022-09-08 02:02:26 +00:00
Treehugger Robot
1b69e6b87c
Merge "Fix NPE crash in TextToSpeechSettings" am: 6672e37864
am: 451ced2f5a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2208995
Change-Id: I16683a4e78350d713ab8a0f756d69581aa97526d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 01:46:51 +00:00
Bill Lin
37785c81ce
Merge "Fix regression of pressing power key cancel sfps enrollment" into tm-qpr-dev am: b9263732ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19880527
Change-Id: I60e52637331ca2801845999334a8d83f4bec04fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 01:46:49 +00:00
Bill Lin
b9263732ee
Merge "Fix regression of pressing power key cancel sfps enrollment" into tm-qpr-dev
2022-09-08 00:59:09 +00:00
menghanli
aaee157fdd
Fix extra dim turns on failed in setting search bar
...
Root cause: Don't call displayPreference before setChecked called.
Solution: Don't show quick settings tooltips if preference is not ready.
Bug: 237850687
Bug: 244676175
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest
Change-Id: I52425190cce4ab3cf31be025a743bf8b212fa1f9
Merged-In: I52425190cce4ab3cf31be025a743bf8b212fa1f9
2022-09-08 07:44:17 +08:00
Milton Wu
9b998b7dac
Refine checkMaxEnrolled() for fingerprint
...
FingerprintEnrollIntroduction shall allow setting 2nd fingerprint if
this intent is coming from "Anything else" page in SUW.
Bug: 228418807
Test: Manually test fingerprint in SUW
Test: ROBOTEST FingerprintEnrollIntroduction and
SetupFingerprintEnrollIntroduction
Change-Id: I62edeb91f90b32f62b3ca2b2ea04ec427b31d483
2022-09-07 07:49:42 +00:00
Bill Yi
e935326ab9
Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE
...
Merged-In: I3048482c0e9c74bc4488fb76e7166b4e94bf1e98
Change-Id: I60bd05c8418800fe8f9f432e11d4ca97d03e57a2
2022-09-06 22:34:26 -07:00
lbill
82a42834b1
Fix regression of pressing power key cancel sfps enrollment
...
Previous ag/19699461 used to fix UdfpsControllerOverlay bug.
However, we didn't consider a feature click power button to
notify user with a Toast on sfps project.
Bug: 245383975
Bug: 228261883
Bug: 242478941
Bug: 227905887
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Test: manual verify sfps enrollment, press/long press power key would
not cancel enrollment.
Test: manual verify udfps enrollment, UdfpsControllerOverlay lose focus
cancel enrollment.
Change-Id: I44394bdb91660b27a704064a7f7cdc5d0ad95d30
2022-09-07 04:01:40 +00:00
Shen Lin
fa6a8e9767
Fix NPE crash in TextToSpeechSettings
...
Recyclerview's getItemAnimator() is nullable so we need a null check.
Bug: 245383855
Test: Manual
Change-Id: Iebad430e81a32b7fa8ebe0543abf3f122befb7e5
2022-09-07 10:26:39 +08:00
Treehugger Robot
4b4795676e
Merge "Fix NPE crash in UwbPreferenceController and optimize the lifecycle observer adding condition in page" am: b2a466d92f
am: a9c6040eb8
am: d24f4a3f54
am: 41fc3efd4c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2206258
Change-Id: I8f3a0597e938b3d1fd1a3e87a89f95834716c16d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-07 01:51:12 +00:00
Treehugger Robot
41fc3efd4c
Merge "Fix NPE crash in UwbPreferenceController and optimize the lifecycle observer adding condition in page" am: b2a466d92f
am: a9c6040eb8
am: d24f4a3f54
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2206258
Change-Id: Ie5e21d09224749e8d8e2c321cff3d73bd21d3669
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-07 01:11:26 +00:00
Treehugger Robot
d24f4a3f54
Merge "Fix NPE crash in UwbPreferenceController and optimize the lifecycle observer adding condition in page" am: b2a466d92f
am: a9c6040eb8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2206258
Change-Id: I3048482c0e9c74bc4488fb76e7166b4e94bf1e98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-07 00:41:43 +00:00
Treehugger Robot
b2a466d92f
Merge "Fix NPE crash in UwbPreferenceController and optimize the lifecycle observer adding condition in page"
2022-09-06 23:54:40 +00:00
TreeHugger Robot
32c2f9b75f
Merge "Fix Incorrect Trust Agent Count" into tm-qpr-dev am: 9f1dba6017
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19669514
Change-Id: I2334c56c62c3f019ad50d505a91b08351c392aee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-06 19:01:06 +00:00
TreeHugger Robot
9f1dba6017
Merge "Fix Incorrect Trust Agent Count" into tm-qpr-dev
2022-09-06 18:29:43 +00:00
Treehugger Robot
1a0c26dd7e
Merge "Crash in PreferredSimDialogFragment" am: a512817aba
am: 42cc405781
am: a4915b26f4
am: 140d335571
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2207096
Change-Id: I3b2652dfe7abb46558109033328de07011cd0594
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-06 13:59:59 +00:00
Treehugger Robot
140d335571
Merge "Crash in PreferredSimDialogFragment" am: a512817aba
am: 42cc405781
am: a4915b26f4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2207096
Change-Id: I16700abafd46e5d24964a7dc16aa45fd2c5809f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-06 13:33:49 +00:00
Treehugger Robot
a4915b26f4
Merge "Crash in PreferredSimDialogFragment" am: a512817aba
am: 42cc405781
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2207096
Change-Id: If9f57b125c3e336cd6f10325e8e066f918000e75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-06 13:05:24 +00:00
Shen Lin
0b9a6304aa
Fix NPE crash in UwbPreferenceController and optimize the lifecycle observer adding condition in page
...
This patch contains two fixes:
- Make sure mUwbManager is non-null by calling isUwbSupportedOnDevice to avoid a NPE.
- Modify AdvancedConnectedDeviceDashboardFragment, add lifecycle observer only if device supports UWB.
Bug: 244871579
Test: manual test and Robotest.
Change-Id: I78f97794a66f3fb487f067c4570899e21c254acf
2022-09-06 14:55:08 +08:00
SongFerng Wang
17122f9617
Merge "Add owner for job handover" into tm-qpr-dev
2022-09-06 04:57:49 +00:00
Pingzhi Wang
77ce80d6cb
Crash in PreferredSimDialogFragment
...
NullPointerException when removing physical SIM card
Bug: 244622300
Test: Manual
Change-Id: Ie32c4d07e4c77a0460265a47501e332ae62e17e4
2022-09-05 11:29:42 +02:00
TreeHugger Robot
ada5c33946
Merge "Hide toggle to Turn on Wi-Fi automatically preference in Search settings" into tm-qpr-dev am: 06cc4ed4ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19816198
Change-Id: I6b16ef9121b890647e1ff49ee6e380b8bbdaa832
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-05 08:36:45 +00:00
TreeHugger Robot
06cc4ed4ab
Merge "Hide toggle to Turn on Wi-Fi automatically preference in Search settings" into tm-qpr-dev
2022-09-05 07:51:36 +00:00
YK Hung
1a7168a114
Merge changes from topic "app_battery_usage" into tm-qpr-dev am: 0bad72889e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19726220
Change-Id: Ie2f3751d89e77aecc9a5e799127ea8c8d1478430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-05 04:04:22 +00:00
Tiffany Nguyen
d36c2f7cba
Align strings and UX across the different pages. am: c2ad30d432
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19728353
Change-Id: I0eabd6c4dd7f42020c2551f1f63f1cf20de33b23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-05 04:04:20 +00:00
Tiffany Nguyen
9e491e0f1b
Move restricted apps page to new battery optimization page. am: 032649b4f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19727752
Change-Id: I4285c9d6e7df762f697f5ad62fe30b2e6151cdd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-05 04:04:18 +00:00
Tiffany Nguyen
3fa60efb6c
Add Apps > Battery optimization page implementation. am: 6147e0fa5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19726219
Change-Id: I3498f3c1482acf6ece57bd1297bffd9c08d81c5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-05 04:04:13 +00:00