Treehugger Robot
f4ef31b17e
Merge "Mark DataUsageState as nullable to avoid potential NPE risk" am: 0960af0bf3 am: 325b033f85 am: 8c4db8e545 am: e6901aedba
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2217422
Change-Id: Ifea8d6dfd652cf73ac9361c1224635bf6169a389
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-15 13:41:22 +00:00
Treehugger Robot
e6901aedba
Merge "Mark DataUsageState as nullable to avoid potential NPE risk" am: 0960af0bf3 am: 325b033f85 am: 8c4db8e545
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2217422
Change-Id: Ic87c58e6eb59b154258a97ff54c0e5295637af12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-15 13:15:30 +00:00
Treehugger Robot
8c4db8e545
Merge "Mark DataUsageState as nullable to avoid potential NPE risk" am: 0960af0bf3 am: 325b033f85
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2217422
Change-Id: Ie9d5325556a31c72af3520879212e5fc526ea0dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-15 12:45:07 +00:00
Shen Lin
eb627be0b4
Mark DataUsageState as nullable to avoid potential NPE risk
...
mDataUsageState is nullable in UnrestrictedDataAccessPreference.java, so we'd better
add a annotation to getDataUsageState(), and add a null-check before calling it.
Bug: 246828843
Test: manual and Robotest.
Change-Id: If7fea53ec7efd004391a09becdba5709ae686f40
2022-09-15 14:23:38 +08:00
Zaiyue Xue
83ef9001e7
Merge changes from topic "accessibility1" into tm-qpr-dev am: 9b24df2c38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19771692
Change-Id: I80680875b02983c58a9e3c324dc13e055ad75fb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-14 06:09:40 +00:00
Zaiyue Xue
9479b18cf9
Support accessibility for battery chart (1) am: 9c962b03e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19764112
Change-Id: If91f5422518ff8cc76dcc5c216a83a70dd7a337d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-14 06:09:35 +00:00
Treehugger Robot
78b58e08f5
Merge "Fix the IllegalArgumentException from RecyclerView" am: 8f793f5e4f am: 227b8f0272 am: 4aea873647 am: 68a63e0280
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2216421
Change-Id: I0580d5dc5853ca5ed43a023aa5875750ed104f61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-14 05:56:10 +00:00
Zaiyue Xue
9b24df2c38
Merge changes from topic "accessibility1" into tm-qpr-dev
...
* changes:
Support accessibility for battery chart (4)
Support accessibility for battery chart (3)
Support accessibility for battery chart (2)
Support accessibility for battery chart (1)
2022-09-14 05:46:17 +00:00
Treehugger Robot
9c695a54f5
Merge "Fix compile warnings due to non-varargs call of varargs method" am: 8b0e08ecee am: ca3213bf88 am: be35244362
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2207309
Change-Id: I11dd065ebb4f1092207fae5b2b78a62f26049a60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-14 05:28:37 +00:00
Treehugger Robot
68a63e0280
Merge "Fix the IllegalArgumentException from RecyclerView" am: 8f793f5e4f am: 227b8f0272 am: 4aea873647
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2216421
Change-Id: Iaad1dacbe8f2b477876bc0c12a49bafdfc4dd449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-14 05:28:17 +00:00
Treehugger Robot
be35244362
Merge "Fix compile warnings due to non-varargs call of varargs method" am: 8b0e08ecee am: ca3213bf88
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2207309
Change-Id: I2562d3ac792867e5b19539ce82137b3fc2dfe40e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-14 04:58:18 +00:00
Treehugger Robot
4aea873647
Merge "Fix the IllegalArgumentException from RecyclerView" am: 8f793f5e4f am: 227b8f0272
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2216421
Change-Id: I171aa7c274c51bf67f5a34740782c7ce78f88a09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-14 04:57:58 +00:00
Treehugger Robot
8b0e08ecee
Merge "Fix compile warnings due to non-varargs call of varargs method"
2022-09-14 04:16:30 +00:00
Treehugger Robot
8f793f5e4f
Merge "Fix the IllegalArgumentException from RecyclerView"
2022-09-14 03:55:49 +00:00
Kuan Wang
93c0d0227b
Add logging for count of shown / hidden apps in Battery Usage page. am: 676bcedb85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19893207
Change-Id: I52977900a9f669fa7b31c2c72cbd5ec10646a28a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-14 02:36:50 +00:00
Kuan Wang
676bcedb85
Add logging for count of shown / hidden apps in Battery Usage page.
...
Bug: 245455490
Test: manually
Change-Id: I7342e822f00f9a0aedcef592cae9809251518812
2022-09-14 02:09:16 +00:00
YK Hung
63dd5861a9
Merge "Add fade in / out animation for battery usage hourly chart." into tm-qpr-dev am: 2a33c12028
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19897905
Change-Id: I78fd0896d72ab78b8a7ad676ae6c1beab3c260fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 17:10:17 +00:00
YK Hung
2a33c12028
Merge "Add fade in / out animation for battery usage hourly chart." into tm-qpr-dev
2022-09-13 16:44:17 +00:00
Shen Lin
c463aee2b8
Fix the IllegalArgumentException from RecyclerView
...
Attempt to remove the animator as early as possible to avoid a RecyclerView crash.
Bug: 246411107
Related bug: 184214085
Test: manual.
Change-Id: I8fcb06836217f4de200a53bb88a1a0b5e42bbe21
2022-09-13 08:46:30 +00:00
Zaiyue Xue
525fd2dc3b
Support accessibility for battery chart (4)
...
According to accessibility suggestion, when users double clicked a time slot in battery usage chart with TalkBack on, jump the accessibility focus to the app list category title to let users know what happened after click.
screen record: https://drive.google.com/file/d/13vvA2Il5lz9kvHegH9Tmbq9hJYFGVwJJ/view?usp=sharing&resourcekey=0-g3A29rVsd4NU37SwBD1uzQ
Bug: 242989585
Fix: 242989585
Test: manual
Change-Id: I8ab3b5f1364247121e43b0b8d51e8aa3743b5c2b
2022-09-13 14:50:57 +08:00
TreeHugger Robot
9386416103
Merge "Fix incorrect choose screen lock during unicorn" into tm-qpr-dev am: 094d7badba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19880532
Change-Id: I7ef1ebee9bc4ba6e165f2dfab8fbef70fdc0d2c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 06:45:45 +00:00
Zaiyue Xue
79311805b6
Support accessibility for battery chart (3)
...
Support accessibilty read out full timestamp labels instead of the short one, e.g "Sunday" instead of "Sun".
Bug: 242989585
Test: manual
Change-Id: Ica2176ef3f07849d278327b9301f8c318782c2d5
2022-09-13 14:43:20 +08:00
TreeHugger Robot
094d7badba
Merge "Fix incorrect choose screen lock during unicorn" into tm-qpr-dev
2022-09-13 06:23:40 +00:00
Zaiyue Xue
266ddbf9b4
Support accessibility for battery chart (2)
...
Support virtual accessbility children in battery usage chart.
Please see the following screen record with sound:
VoiceAccess by name: https://drive.google.com/file/d/15pEEU0OJsyCRbqR4nkALlIgHue4KVEvL/view?usp=sharing&resourcekey=0-ed-u-IWSDlODiYyJIEmVng
VoiceAccess by number: https://drive.google.com/file/d/1mBNjbpPGsw4nYU_krG8283RVPaYGZMO3/view?usp=sharing&resourcekey=0-3aIhbcCzJuEpsbDkaPAcWg
SwitchAccess: https://drive.google.com/file/d/1rr8sHMGCbP0kglsp7rWwOVQV5kcgEZHa/view?usp=sharing&resourcekey=0-GW2525dHtzDWvzS2uhu8Yg
TalkBack: https://drive.google.com/file/d/1daxwHQE3BwySuSIptvO9wCJwnjVehsLE/view?usp=sharing&resourcekey=0-DWo0TuhAfz_9Qaf9_orIWA
MouseConnected: https://drive.google.com/file/d/1DzJq5tJsNneNsRbRIZptXfK1l_wR0Kdz/view?usp=sharing&resourcekey=0-npq7ekR1glpofEKMRcJzFQ
The following is the orignal broken behaviors:
Original VoiceAccess: https://drive.google.com/file/d/1FtQJoVVWnq2xZyUaxW5_h1o0y7jTm9zd/view?usp=sharing&resourcekey=0-BVfk0nzpC2RSx9vGKmfogQ
Original TalkBack: https://drive.google.com/file/d/1jMuDo8Lu0uGRSm3OWVBCbm7lXVJnpMn4/view?usp=sharing&resourcekey=0-ozUs4bN14fMPrbvHUtogpw
Bug: 242989585
Fix: 242989585
Test: manual
Change-Id: I18fe63f75c2438e80b244050608a7ccb2b52c37b
2022-09-13 14:21:55 +08:00
Zaiyue Xue
9c962b03e9
Support accessibility for battery chart (1)
...
Remove the logic of disabling clickable when accessability is on in battery chartview.
Bug: 242989585
Test: manual
Change-Id: I92ce0ff5aac5220d686d600dbdf1d5738fe2c385
Merged-In: I92ce0ff5aac5220d686d600dbdf1d5738fe2c385
2022-09-13 14:21:01 +08:00
Kuan Wang
3759adfda6
Add fade in / out animation for battery usage hourly chart.
...
After:
https://drive.google.com/file/d/1-1z2EM16X76qltTz_fL_DvgI7m65TtAN/view?usp=sharing
Before:
https://drive.google.com/file/d/1pG2rQ3V4rphjx7RLhSjb1r2HgXiFCYQZ/view?usp=sharing
Bug: 245655904
Test: manually
Change-Id: I72533a28445bea83aea604a937864052bd65c898
2022-09-13 12:19:59 +08:00
SongFerngWang
b5dbbceecd
Add more logs for analysis am: 4a5680ac09
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19888371
Change-Id: I9a8d01347fec136bac16cb85ccbfb1e5860edda7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 01:31:59 +00:00
SongFerngWang
4a5680ac09
Add more logs for analysis
...
Bug: 245657079
Test: NA. It is the log only.
Change-Id: I9909acc27ccbef48f653cfcd0cc84942c4353eac
2022-09-13 01:11:17 +00:00
TreeHugger Robot
9e155208bf
Merge "Refine checkMaxEnrolled() for fingerprint" into tm-qpr-dev am: 311d818b10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19880528
Change-Id: I7641e7dddb2865e402d02b7e6dac7c7437825f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 00:32:43 +00:00
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