Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
644,744 Commits 3 Branches 0 Tags
6ec897cb20345780406f4d748dc033014fa38d67
Commit Graph

644744 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ilya Matyukhin
6ec897cb20 Merge changes from topic "IFace-anapic-review" into sc-dev am: 426461e8ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14284620

Change-Id: Iaad785b110e9834971b1d932ef11f64cdd80dde4
 2021-04-22 23:02:44 +00:00
Kweku Adams
19128ee451 Merge changes I61392c55,I97e40d35 into sc-dev am: 2e2e94cc2c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14271905

Change-Id: Id1beea7676ecdb9c1a3c13cff1ea177aeb9305aa
 2021-04-22 23:02:17 +00:00
Ilya Matyukhin
426461e8ae Merge changes from topic "IFace-anapic-review" into sc-dev 
* changes:
  Add HAL-to-framework constant conversion
  Update framework with IFace getSensorConfig
 2021-04-22 22:58:59 +00:00
Kweku Adams
2e2e94cc2c Merge changes I61392c55,I97e40d35 into sc-dev 
* changes:
  Expand internal stop reasons.
  Rename "legacy" stop reasons.
 2021-04-22 22:54:12 +00:00
Ben Lin
20da91c0de Merge "PiP: Don't invoke double-tap gesture (maximize) if menu is showing." into sc-dev am: f0572fd733 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14202488

Change-Id: Ib1d41fe4d4051a7e80bbc5ffc515dd1f7931ce51
 2021-04-22 22:50:59 +00:00
Ben Lin
f0572fd733 Merge "PiP: Don't invoke double-tap gesture (maximize) if menu is showing." into sc-dev 2021-04-22 22:27:25 +00:00
Winson Chung
565d99be66 Merge "Add some logging to track when SysUI binds to the overview service" into sc-dev am: a80a2548ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14270931

Change-Id: Id4ba2a442a269370c62f235688b2bfaf23e7a35a
 2021-04-22 22:21:21 +00:00
Winson Chung
a80a2548ca Merge "Add some logging to track when SysUI binds to the overview service" into sc-dev 2021-04-22 22:09:11 +00:00
James Lin
6def3e0058 Merge "Remove unnecessary UCE APIs because some of UCE APIs change." am: 86cb5eeb1c am: 46d67749d5 am: 6e1bf17f30 am: dfdde4c5f7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684035

Change-Id: Ibf7322b1a46e1387009256acd860d9c2d34d59f4
 2021-04-22 21:55:43 +00:00
Treehugger Robot
78b10cc1a5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 07587bd2f7 -s ours am: 655c3483dd -s ours am: 3ca99603e3 -s ours am: 20c5dbae83 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I15248a63164b0369b5ebdeb677ddc1cd234ce734
 2021-04-22 21:55:31 +00:00
Treehugger Robot
7bceaeb21a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f975580f62 -s ours am: 446ade3135 -s ours am: 7a9d7c3b12 -s ours am: 47d1352999 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id5254f8930280cf231274fa9fcdf3ab4993428f6
 2021-04-22 21:55:19 +00:00
Treehugger Robot
d325dfe7e5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 6670c24067 -s ours am: 619e3f9aac -s ours am: 552d78d352 -s ours am: 5cfa84197d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7cf7e32d7930a97c80b5ecc1d694106b17bcb821
 2021-04-22 21:55:08 +00:00
Treehugger Robot
1bcae7badb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: db44950d25 -s ours am: ca61a9bcca -s ours am: 05957b7ac0 -s ours am: 90d7f4a7f2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I048ab14e590d3cfac3f055dc4bb4c167935baecf
 2021-04-22 21:54:56 +00:00
Beverly Tai
d3273d0115 Merge "Support slide to udfps auth on keyguard" into sc-dev am: 86b5b1ec88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14282610

Change-Id: I4a431e29c1b00abca0d385990ed7045970999369
 2021-04-22 21:53:39 +00:00
James Lin
dfdde4c5f7 Merge "Remove unnecessary UCE APIs because some of UCE APIs change." am: 86cb5eeb1c am: 46d67749d5 am: 6e1bf17f30 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684035

Change-Id: I98c2b446d76b8ba97f0efcd61e40cc9ee7322665
 2021-04-22 21:46:33 +00:00
Treehugger Robot
20c5dbae83 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 07587bd2f7 -s ours am: 655c3483dd -s ours am: 3ca99603e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I13818b9efcfab88fe676948814a26c85f3dcb5f5
 2021-04-22 21:46:17 +00:00
Treehugger Robot
47d1352999 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f975580f62 -s ours am: 446ade3135 -s ours am: 7a9d7c3b12 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0b0b65cbc60175188a0762f8c371575d5bb619d1
 2021-04-22 21:45:43 +00:00
Treehugger Robot
5cfa84197d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 6670c24067 -s ours am: 619e3f9aac -s ours am: 552d78d352 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7d0e7d50ae2caf15e50d2ea38cf6816faa69856a
 2021-04-22 21:45:25 +00:00
Treehugger Robot
90d7f4a7f2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: db44950d25 -s ours am: ca61a9bcca -s ours am: 05957b7ac0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If983558e39d572f6aa197ede0d67826d41d29bc8
 2021-04-22 21:44:55 +00:00
Beverly Tai
86b5b1ec88 Merge "Support slide to udfps auth on keyguard" into sc-dev 2021-04-22 21:27:49 +00:00
James Lin
6e1bf17f30 Merge "Remove unnecessary UCE APIs because some of UCE APIs change." am: 86cb5eeb1c am: 46d67749d5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684035

Change-Id: I368a1289fa670a885eeec0aa67760d7c6f52e083
 2021-04-22 21:23:54 +00:00
Treehugger Robot
3ca99603e3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 07587bd2f7 -s ours am: 655c3483dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I63aad3dfab7083c8a084e244ce2ce2a17546b4fe
 2021-04-22 21:23:36 +00:00
Treehugger Robot
7a9d7c3b12 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f975580f62 -s ours am: 446ade3135 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I61a9bbc24b3e8cee87610ea6f74604c0347f0aa6
 2021-04-22 21:23:24 +00:00
Treehugger Robot
552d78d352 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 6670c24067 -s ours am: 619e3f9aac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibb87884da80c200c489323a6acfe461aa798e389
 2021-04-22 21:23:10 +00:00
Treehugger Robot
05957b7ac0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: db44950d25 -s ours am: ca61a9bcca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id5b83e9b7fc27ec4ffdd9466918d67e08a21dedf
 2021-04-22 21:22:52 +00:00
James Lin
46d67749d5 Merge "Remove unnecessary UCE APIs because some of UCE APIs change." am: 86cb5eeb1c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684035

Change-Id: I905a28e7a168a5854ff279078727da27305d8b01
 2021-04-22 21:17:29 +00:00
Treehugger Robot
655c3483dd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 07587bd2f7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I681625098abbf7f198054efea311c3dadad3e797
 2021-04-22 21:12:20 +00:00
Haiping Yang
d1069b628b Merge "Revert "Add global settings keys for sysui package and main activity"" 2021-04-22 21:10:31 +00:00
Haiping Yang
dd5fc3b13e Revert "Add global settings keys for sysui package and main activity" 
This reverts commit 85eda008b8.

Bug:185951726

Reason for revert: <it might have caused P0 https://b.corp.google.com/issues/185951726>

Change-Id: I420d55f59d92a97dba1b6c776103777c6ad9ed0e
 2021-04-22 21:09:30 +00:00
Winson Chiu
004543aab4 Merge "Add cert digest separator to pm app link output" 2021-04-22 21:06:57 +00:00
Treehugger Robot
446ade3135 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f975580f62 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie22a71a022db330e33583c49e8267d3a7aaa45c8
 2021-04-22 21:04:23 +00:00
Treehugger Robot
d53ed3ddc7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 679c657122 -s ours am: f6374c6bec -s ours am: da19a9eeec -s ours am: 57e3cf1042 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib58079ff1d7eab4dbcee90117004ae97810cc0c9
 2021-04-22 21:03:08 +00:00
Treehugger Robot
83176a763c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 7dbd97e972 -s ours am: 975541d9f0 -s ours am: 843c4eecc3 -s ours am: 7f2483c42a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I80355888c5eb933c701a6640280bd2bda82203de
 2021-04-22 21:02:27 +00:00
Treehugger Robot
858e2b2425 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4bdc1121da -s ours am: d6a61eed90 -s ours am: 40b26445f4 -s ours am: 28f94dd1ee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I29f7707a96dd27325dd5a3f9c05d31c9833059ef
 2021-04-22 21:02:13 +00:00
Treehugger Robot
012f011e8b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 59464d6fa9 -s ours am: d0d8f77e5c -s ours am: b8322e46bd -s ours am: 058fd42f0a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3727bd9c28ab445216820cf79113c75d79675b05
 2021-04-22 21:02:00 +00:00
Treehugger Robot
73ced4c13d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2b348a40ae -s ours am: e908f88308 -s ours am: e18a6f61b1 -s ours am: c4b02736dc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic38eb1540e6ca5b8e92cc36a8f0d93813e2b87c0
 2021-04-22 21:01:22 +00:00
Jeff Sharkey
a2cd559d96 Merge "Refinement of AttributionSource handling." into sc-dev am: 054fd43e2c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14274118

Change-Id: I7c97b1d0415dfc88328c8c5a637ea4997f036358
 2021-04-22 21:00:40 +00:00
Treehugger Robot
619e3f9aac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 6670c24067 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I730c727c606b6876b367bdb8ca347a0e5472f0d9
 2021-04-22 20:56:36 +00:00
Treehugger Robot
ca61a9bcca [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: db44950d25 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie6ee552173ddba4ea52f4d32ca2c9348c9661b44
 2021-04-22 20:51:03 +00:00
Treehugger Robot
57e3cf1042 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 679c657122 -s ours am: f6374c6bec -s ours am: da19a9eeec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8f96b3a94c1e51fea546e224dc3125ee5af6acab
 2021-04-22 20:45:14 +00:00
Treehugger Robot
7f2483c42a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 7dbd97e972 -s ours am: 975541d9f0 -s ours am: 843c4eecc3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idb8787667784ab3a11c0e8add5dfdadbc38afbe5
 2021-04-22 20:44:57 +00:00
Treehugger Robot
28f94dd1ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4bdc1121da -s ours am: d6a61eed90 -s ours am: 40b26445f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08b33a2b80167e9988f1926a3cc1e0ef43f06e65
 2021-04-22 20:44:41 +00:00
Treehugger Robot
058fd42f0a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 59464d6fa9 -s ours am: d0d8f77e5c -s ours am: b8322e46bd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id890e3cad3b362e2906a59cab4292809249bcec8
 2021-04-22 20:44:25 +00:00
Treehugger Robot
c4b02736dc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2b348a40ae -s ours am: e908f88308 -s ours am: e18a6f61b1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iebe9720fb7f6adebf865ffd2118b49fbf512c304
 2021-04-22 20:44:08 +00:00
Jeff Sharkey
054fd43e2c Merge "Refinement of AttributionSource handling." into sc-dev 2021-04-22 20:43:14 +00:00
Treehugger Robot
da19a9eeec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 679c657122 -s ours am: f6374c6bec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia2266cdb0891bde13a8b2cc9751f157bfd0d7232
 2021-04-22 20:42:25 +00:00
Treehugger Robot
f6374c6bec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 679c657122 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2ce940a7276b2ed8469a54786891005d601607e2
 2021-04-22 20:29:45 +00:00
Garfield Tan
7b2f2510ee Merge "Add a method to obtain task info with intent extra" into sc-dev am: 0ce27fdffe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14256489

Change-Id: I21d69275162a4e57e4ed76a70ce2362eae1171c3
 2021-04-22 20:25:50 +00:00
James Lin
86cb5eeb1c Merge "Remove unnecessary UCE APIs because some of UCE APIs change." 2021-04-22 20:25:39 +00:00
TreeHugger Robot
76a397a3d2 Merge "Add null check around mImeRequester.getWindow()" into sc-dev am: 7c2b1d57db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14271626

Change-Id: Iefbd0fe0df64e469984fdf59e3bac49d4c504909
 2021-04-22 20:25:36 +00:00