PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,614 Commits 1 Branch 0 Tags
d77ddd6ab3bb86ba9968b3f8e8696d655352bb9f
Commit Graph

110614 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Android Build Coastguard Worker
5bb448889e Snap for 9053530 from e6fd2a5da8 to tm-qpr1-release 
Change-Id: I4c7dc1258cb07a11853cd67931a906f53cc5d824
 2022-09-12 23:29:39 +00:00
Bill Yi
8a67244d48 [automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" am: 677cd61616 -s ours am: 3464e33135 -s ours am: 9c26bb64b8 -s ours am: 65b45b6ecb -s ours 
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2212399

Change-Id: I67c6da9fa91608e893c79cf8b9bc0b030efd630c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 21:16:12 +00:00
Bill Yi
e798f997d7 [automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am: 042554a0e4 -s ours am: 49efcf7816 -s ours am: 517f250e13 -s ours am: aab60c8d68 -s ours 
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2212399

Change-Id: I1ed3a6b4e538b22f8833a602a29cd0df08890c91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 21:15:56 +00:00
Joshua McCloskey
fccd144930 Add phone, tablet, device fp deletion strings. 
Test: Manual.
Fixes: 245411037
Change-Id: Ib1d83072878ede27758beb0381a12cab6172b9d6
 2022-09-12 21:00:58 +00:00
Bill Yi
65b45b6ecb [automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" am: 677cd61616 -s ours am: 3464e33135 -s ours am: 9c26bb64b8 -s ours 
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2212399

Change-Id: Ie01abae883d751824703018a75ef7a41de38cc8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 20:29:27 +00:00
Bill Yi
aab60c8d68 [automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am: 042554a0e4 -s ours am: 49efcf7816 -s ours am: 517f250e13 -s ours 
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2212399

Change-Id: I17f23d231f04f41092a3be5ce59a732faad85b53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 20:29:16 +00:00
Bill Yi
9c26bb64b8 [automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" am: 677cd61616 -s ours am: 3464e33135 -s ours 
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2212399

Change-Id: Id4b69cddf31a9a3d0bb781d7fecd0f21d369c0c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 19:57:13 +00:00
Bill Yi
517f250e13 [automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am: 042554a0e4 -s ours am: 49efcf7816 -s ours 
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2212399

Change-Id: I9474f8a455c20b5335f584ba8261fd5b29435995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 19:57:01 +00:00
Bill Yi
3464e33135 [automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" am: 677cd61616 -s ours 
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2212399

Change-Id: I20ddfee04e6de1e681b647a97296fcf29d97ce66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 18:56:26 +00:00
Bill Yi
49efcf7816 [automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am: 042554a0e4 -s ours 
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2212399

Change-Id: I3e2c668af16aec333680c1ac7fad768b1db94c6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 18:56:14 +00:00
TreeHugger Robot
390769f44e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: e6fd2a5da8 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925037

Change-Id: Ib7897ec8a96aeac36b438b33c0895591f50e4274
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 18:00:18 +00:00
Bill Yi
ad0109af91 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1bfdaf22a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925037

Change-Id: Ia5941874f63385b0840dd9b6930344932eb7a34d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 18:00:03 +00:00
Bill Yi
422fa4379d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 61d351e93d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925033

Change-Id: I651889f8eca679d1aa27eae894d6b6dfc85fc363
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 17:59:55 +00:00
Bill Yi
677cd61616 Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" 2022-09-12 17:59:03 +00:00
TreeHugger Robot
e6fd2a5da8 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-12 17:41:49 +00:00
Sunny Shao
3e24aaf091 Allow summary string support both mobile and tablet devices 
-Update the string to support mobile and tablet devices.

Bug: 244137320
Test: manual test
Change-Id: I74d8d6db76001a68a648030e0c94f769d220d762
 2022-09-12 15:54:05 +08:00
Bill Yi
e1bfdaf22a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I24e95f7af07133bd771ec2b0383a9a17c798d932
 2022-09-11 16:30:55 -07:00
Bill Yi
a4f092c748 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie871e5bb344fce432b8741e50b34954cf5fc6ec9
 2022-09-11 16:28:01 -07:00
Bill Yi
61d351e93d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8de7d4371d314c5771fd9d8f41b664044929c7dc
 2022-09-11 16:24:09 -07:00
Bill Yi
f3457e4080 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iee13f8fc3f15a25a78f77111b5098b3a01d5ab8f
 2022-09-11 16:23:01 -07:00
Android Build Coastguard Worker
5269c1e8d4 Snap for 9048375 from 19ee730df2 to tm-qpr1-release 
Change-Id: I0d914865c3e90e8653260b8396899db62275e7e7
 2022-09-10 01:26:35 +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
Treehugger Robot
4378ee11ad Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" 2022-09-09 14:20:05 +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
Android Build Coastguard Worker
11e0947f4e Snap for 9043175 from 66dee9be82 to tm-qpr1-release 
Change-Id: Idef9c7bba3203c5735cb4e6a5e3b000f0d7ba837
 2022-09-08 23:26:18 +00:00
Bill Yi
727d0996d1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 976f702727 -s ours am: 158bf69a42 -s ours am: 4ad699717a -s ours am: 89fe1313c2 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205917

Change-Id: I26f0c2a5006ee63311646149ef7309e6aa09f31c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 23:23:46 +00:00
Bill Yi
dd03237f19 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66c2b80023 -s ours am: 19de182abb -s ours am: f1d8ba94d5 -s ours am: bbd35cbe45 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205917

Change-Id: I5ad37af98d3167b1579cbe7dcc67af524b750044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 23:23:32 +00:00
Bill Yi
62366cdf2b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 09b685534a -s ours am: 5f1549cee7 -s ours am: 28d6d5a7c2 -s ours am: 19640b0bc2 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205916

Change-Id: Ic717761fc4984877e7ee1c7c8f9fabdf96072ce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 23:23:12 +00:00
Bill Yi
181f1ecf60 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3348813e3 -s ours am: 2fabfd31d3 -s ours am: 21d705a708 -s ours am: 6b4251e977 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205916

Change-Id: I2c16a47156e438351ebe617036af4cda02b793ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 23:22:49 +00:00
Bill Yi
89fe1313c2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 976f702727 -s ours am: 158bf69a42 -s ours am: 4ad699717a -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205917

Change-Id: Ic78f0dbf0eb4e14f8c10855fbd7219f70d315b02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:58:30 +00:00
Bill Yi
bbd35cbe45 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66c2b80023 -s ours am: 19de182abb -s ours am: f1d8ba94d5 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205917

Change-Id: I3f20fbccb440dce4ae45998ab8714310476a3285
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:58:12 +00:00
Bill Yi
19640b0bc2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 09b685534a -s ours am: 5f1549cee7 -s ours am: 28d6d5a7c2 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205916

Change-Id: I8f4ced9ea0c104aeabf97c3b7f1634aecda90330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:57:51 +00:00
Bill Yi
6b4251e977 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3348813e3 -s ours am: 2fabfd31d3 -s ours am: 21d705a708 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205916

Change-Id: I79d399648536010692a04b480678a24e5cbbd58e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:57:44 +00: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
Bill Yi
4ad699717a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 976f702727 -s ours am: 158bf69a42 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205917

Change-Id: Ic565c19863d34961aef5dcce39ade416e816fcf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:06:50 +00:00
Bill Yi
f1d8ba94d5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66c2b80023 -s ours am: 19de182abb -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205917

Change-Id: Ib5c0d891ea8d91e1e1c1868e90456ff59947772f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:06:36 +00:00
Bill Yi
28d6d5a7c2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 09b685534a -s ours am: 5f1549cee7 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205916

Change-Id: Id56eae08a39ddea4e76a27b0bd0887c06d2ef392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:06:15 +00:00
Bill Yi
21d705a708 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3348813e3 -s ours am: 2fabfd31d3 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205916

Change-Id: I03897f87ff0fd32328f2de1d6c7f044ca58ab1a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:05:54 +00:00
Bill Yi
158bf69a42 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 976f702727 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205917

Change-Id: I77337c147a9468ff174fd851e58cb968723b3203
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 21:58:13 +00:00
Bill Yi
19de182abb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66c2b80023 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205917

Change-Id: I0357173f1cbe8056bdd872376aeb226a8cddc995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 21:58:01 +00:00
Bill Yi
5f1549cee7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 09b685534a -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205916

Change-Id: I90137c2b7dcdabd0e11ec09548224f59e42b2a81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 21:57:38 +00:00
Bill Yi
2fabfd31d3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3348813e3 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205916

Change-Id: Id5d7147bdcfb6ed4c19544f572416b3cb9278454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 21:57:17 +00:00