Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
654,180 Commits 3 Branches 0 Tags
129bbf0b6865c19bde798db1cebca3cd9d604478
Commit Graph

654180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
0595a3bf92 [automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: e7449820a4 -s ours 
am skip reason: Merged-In I661f5fb6b1f3f6ce4322fab8fa84a7ab364c65b1 with SHA-1 5c822bf4ea is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15571898

Change-Id: I4c5ab0dbe85ea1c9e3423cbc72fd7d9ff5bfbcdf
 2021-08-17 18:35:50 +00:00
Xin Li
e7449820a4 Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master 2021-08-17 18:14:29 +00:00
Bill Yi
8204ae0557 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1ac49dd4ebf6ce9f84608357e437a3c4818741c9
 2021-08-17 11:13:24 -07:00
Beverly Tai
da613e88ab Merge "Auto adjust screen brightness when display state on while docked" into sc-qpr1-dev am: b8769ea47e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15582809

Change-Id: If4629326c364a4458340df769d0d5c118b300593
 2021-08-17 14:07:04 +00:00
Beverly Tai
b8769ea47e Merge "Auto adjust screen brightness when display state on while docked" into sc-qpr1-dev 2021-08-17 13:53:56 +00:00
Bill Yi
8723acd832 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I84776c72e669b534f8d7f9e49c53b89e31502570
 2021-08-17 06:15:44 -07:00
Treehugger Robot
d9f8d109dc Merge "Suppress AIDL warnings: untyped-collection" am: dee731ad0b am: c6a9f2e81c am: 48cecd59d5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1793485

Change-Id: I3d389166232c0b41e938aee53ae10c1d2df12ad5
 2021-08-17 12:30:33 +00:00
Bill Yi
6b82a396d9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I45e077f77f625a4c992fb08f40da6c8e670aed5a
 2021-08-17 05:26:26 -07:00
Treehugger Robot
48cecd59d5 Merge "Suppress AIDL warnings: untyped-collection" am: dee731ad0b am: c6a9f2e81c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1793485

Change-Id: Ifd1c48036dbc7f7a48ae24ce13553f71f1eb794c
 2021-08-17 12:17:32 +00:00
Treehugger Robot
c6a9f2e81c Merge "Suppress AIDL warnings: untyped-collection" am: dee731ad0b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1793485

Change-Id: I240a5b08c27aa30a5518f784dd4db8e2abb25e7c
 2021-08-17 12:03:43 +00:00
Treehugger Robot
dee731ad0b Merge "Suppress AIDL warnings: untyped-collection" 2021-08-17 11:46:23 +00:00
Edgar Wang
edc96bcbaf [automerger skipped] Fix lint error for those module used in mainline module am: d56251bae4 am: cfe801009b -s ours 
am skip reason: Merged-In I3a8c9e00f164d0f0dd381b188ecfd0c4a758a277 with SHA-1 d56251bae4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187812

Change-Id: I90fb1899dc5a38e0f766249a2e04af4af588077f
 2021-08-17 07:21:09 +00:00
Edgar Wang
972ea51f0b Fix lint error for those module used in mainline module am: d56251bae4 am: 0d1290e7c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187812

Change-Id: I4a4741c846e813185794cfd594980c50b1044898
 2021-08-17 07:20:52 +00:00
Edgar Wang
cfe801009b Fix lint error for those module used in mainline module am: d56251bae4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187812

Change-Id: I752af070ea1c8922715722813d4c2b0b9a946015
 2021-08-17 07:09:16 +00:00
Edgar Wang
0d1290e7c3 Fix lint error for those module used in mainline module am: d56251bae4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187812

Change-Id: I98c8e4269e9db64d96a046aad34ebda44a976e2b
 2021-08-17 07:07:55 +00:00
Treehugger Robot
a5561d4e37 Merge "Update OWNERS." am: bfc5088c1d am: a2ddc936eb am: 24bf4abd78 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1796485

Change-Id: I572761a225825cf6bb55ea8f0527699454553be8
 2021-08-17 04:41:07 +00:00
Treehugger Robot
24bf4abd78 Merge "Update OWNERS." am: bfc5088c1d am: a2ddc936eb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1796485

Change-Id: I5b712798299b03e33ebf45d5b8532ec894be6fae
 2021-08-17 04:28:47 +00:00
Edgar Wang
d56251bae4 Fix lint error for those module used in mainline module 
Bug: 187861723
Test: rebuild
Change-Id: I3a8c9e00f164d0f0dd381b188ecfd0c4a758a277
Merged-In: I3a8c9e00f164d0f0dd381b188ecfd0c4a758a277
 2021-08-17 04:23:20 +00:00
Treehugger Robot
a2ddc936eb Merge "Update OWNERS." am: bfc5088c1d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1796485

Change-Id: If25276da75dc6000e0020a4ee90ed177d5bae2b2
 2021-08-17 04:09:55 +00:00
Bill Yi
29650fe627 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c8e007b5de 
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15591143

Change-Id: Icd6423eb0e9942b9e588c1ea9672300126a8c603
 2021-08-17 04:05:46 +00:00
Bill Yi
c8e007b5de Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I49de9da8a2273fb25bf25f8d2fe2fea25b60a0cb
 2021-08-16 21:04:48 -07:00
Treehugger Robot
bfc5088c1d Merge "Update OWNERS." 2021-08-17 03:57:07 +00:00
Bill Yi
ae7644f3bf Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9b66642bfc61b946331c18850ef5d0b16fc85d71
 2021-08-16 20:50:36 -07:00
Bill Yi
d40ba98895 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I36676446dfe296dfa7fbedecb3cb42be4bbe09ff
 2021-08-16 20:41:10 -07:00
Bill Yi
3b34b471d5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id652e05d24cf6c3978cc31918cebb3d8a84c8671
 2021-08-16 20:28:04 -07:00
Curtis Belmonte
771e1f4bbe Update icon for BiometricPrompt fingerprint animations am: ddf464bc32 am: c395881ea9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15563376

Change-Id: Ib761223df96c3e8d4bf4d770ab63d289d8b2f433
 2021-08-17 03:25:38 +00:00
Bill Yi
358d4a8ae2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4ddce4e02e9512d2f42d7cb44df57524f5e8e6d8
 2021-08-16 20:23:42 -07:00
Curtis Belmonte
471339a196 [automerge] Update icon for BiometricPrompt fingerprint animations 2p: ddf464bc32 am: 2bd44f6f1b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15563376

Change-Id: I356d280e04bad6b858e1a8ae5fa2292562338e21
 2021-08-17 03:12:55 +00:00
Curtis Belmonte
c395881ea9 Update icon for BiometricPrompt fingerprint animations am: ddf464bc32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15563376

Change-Id: I52b256a008fe199c6dc9a6272b9168ea8fa6508e
 2021-08-17 03:12:25 +00:00
Huihong Luo
e5cd991769 Merge "Turn on Webview Overlays" into sc-dev am: a43c6c4f2c am: c930224c77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15559504

Change-Id: I39065654d62c8a2ac856ac141b792939062a9ec9
 2021-08-17 00:57:03 +00:00
Huihong Luo
121f512a08 Merge "Turn on Webview Overlays" into sc-dev am: a43c6c4f2c am: 5bdee6cb41 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15559504

Change-Id: I298c4f08edae91b3920232b03096db8004f3a035
 2021-08-17 00:56:42 +00:00
Curtis Belmonte
2bd44f6f1b [automerge] Update icon for BiometricPrompt fingerprint animations 2p: ddf464bc32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15563376

Change-Id: I10bed9f31520bbd247be73ad415a1a560ae32af8
 2021-08-17 00:55:48 +00:00
Curtis Belmonte
ddf464bc32 Update icon for BiometricPrompt fingerprint animations 
Use the new fingerprint icon for the fingerprint -> error and error ->
fingerprint animations shown on BiometricPrompt.

Test: Manual:
1. Enroll a fingerprint
2. Trigger BiometricPrompt (e.g. Internet > Settings > Share)
3. Try authenticating with an unenrolled fingerprint
4. Verify the updated animations are shown

Fixes: 196453178
Change-Id: Ief3cf752d12897955886e0787701774bd6a0403e
 2021-08-16 17:52:04 -07:00
Huihong Luo
c930224c77 Merge "Turn on Webview Overlays" into sc-dev am: a43c6c4f2c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15559504

Change-Id: Iba684b7c4aaa3c298e99db85084a5cf4cdca7eeb
 2021-08-17 00:39:52 +00:00
Huihong Luo
5bdee6cb41 Merge "Turn on Webview Overlays" into sc-dev am: a43c6c4f2c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15559504

Change-Id: I41cdbed64533913decb1d6855571b5a115be33c0
 2021-08-17 00:39:28 +00:00
Huihong Luo
a43c6c4f2c Merge "Turn on Webview Overlays" into sc-dev 2021-08-17 00:24:34 +00:00
Nate Jiang
409f1f5ea6 [automerger skipped] Merge "Remove modules-utils-build_system from filegroup" into sc-dev am: 9199dbc674 -s ours am: 7b284bca75 -s ours 
am skip reason: Merged-In Ica496e67dd8b7c83aa93a512d06ad1a05d1c9c8d with SHA-1 452bfe1ae9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15518500

Change-Id: I6624c22b01eda504b84f547c0968d301f1a9a823
 2021-08-17 00:21:39 +00:00
Nate Jiang
6308680c5f [automerger skipped] Merge "Remove modules-utils-build_system from filegroup" into sc-dev am: 9199dbc674 am: 4c0b867d49 -s ours 
am skip reason: Merged-In Ica496e67dd8b7c83aa93a512d06ad1a05d1c9c8d with SHA-1 452bfe1ae9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15518500

Change-Id: I36ae01857b9a828187cb90019100ab09b3c9b558
 2021-08-17 00:17:16 +00:00
Joe Bolinger
2fc9e3fa0a Update OWNERS. 
Test: N/A
Change-Id: I3da6e85dd944ca19ecfabfacb2e6928500ee0c49
 2021-08-16 17:11:15 -07:00
Nate Jiang
4c0b867d49 Merge "Remove modules-utils-build_system from filegroup" into sc-dev am: 9199dbc674 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15518500

Change-Id: Id39edf1c490b391a8b5cdb90ae1de56f8ae6416f
 2021-08-16 23:38:17 +00:00
Nate Jiang
7b284bca75 [automerger skipped] Merge "Remove modules-utils-build_system from filegroup" into sc-dev am: 9199dbc674 -s ours 
am skip reason: Merged-In Ica496e67dd8b7c83aa93a512d06ad1a05d1c9c8d with SHA-1 452bfe1ae9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15518500

Change-Id: Ib6ad6bc54f3607c14fa0793c17ccb898007ec604
 2021-08-16 23:37:25 +00:00
Nate Jiang
9199dbc674 Merge "Remove modules-utils-build_system from filegroup" into sc-dev 2021-08-16 22:55:55 +00:00
Winson Chiu
0692863a10 Merge "Revert "Use StorageManager#isUserKeyUnlocked to determine CE storage in PMS"" into sc-dev am: b8787c6f80 am: 07379c13c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561924

Change-Id: I5f2f7ab2f2d7893eab7e5b5da38bc5f4afe66294
 2021-08-16 22:21:21 +00:00
Winson Chiu
62f24fabc9 Merge "Revert "Use StorageManager#isUserKeyUnlocked to determine CE storage in PMS"" into sc-dev am: b8787c6f80 am: 2694d220e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561924

Change-Id: I02b2ef6e5d8f9f760c89912669862ce064af5fdc
 2021-08-16 22:12:02 +00:00
Winson Chiu
2694d220e1 Merge "Revert "Use StorageManager#isUserKeyUnlocked to determine CE storage in PMS"" into sc-dev am: b8787c6f80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561924

Change-Id: I325fde0fc1e5935ec25aeb27403f3578917d0abc
 2021-08-16 22:08:47 +00:00
Beverly Tai
84196d4501 Merge "Use layout parameters to determine lock icon location" into sc-dev am: d20a486dce am: 51e68e2a08 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15482397

Change-Id: Ie18a3661dd7459c744799d9490da2a766f37da4e
 2021-08-16 22:08:43 +00:00
Winson Chiu
07379c13c4 Merge "Revert "Use StorageManager#isUserKeyUnlocked to determine CE storage in PMS"" into sc-dev am: b8787c6f80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561924

Change-Id: Ibaf477d38e124f54074cc465c5df8d8108f15402
 2021-08-16 22:08:32 +00:00
Beverly Tai
b2e53ed46d Merge "Use layout parameters to determine lock icon location" into sc-dev am: d20a486dce am: d188dc349b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15482397

Change-Id: I04f45b99c8b881560fc3b358b060a8944e9ea3ec
 2021-08-16 22:03:32 +00:00
Dave Mankoff
f7882cb918 Pause Primary Prox when Secondary Running. 
This reduces usage of the primary threshold sensor by turning it off
when the secondary sensor is "safe" to use.

Fixes: 194021865
Test: atest SystemUITests
Change-Id: I95a10370bdecdd909b36259e47c1e450335eb778
 2021-08-16 21:53:22 +00:00
Winson Chiu
b8787c6f80 Merge "Revert "Use StorageManager#isUserKeyUnlocked to determine CE storage in PMS"" into sc-dev 2021-08-16 21:52:46 +00:00