Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
660,952 Commits 3 Branches 0 Tags
795aea9658f2db9982bbdba57c8d8fc41d922bb4
Commit Graph

660952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Rosky
795aea9658 Merge "Fix some shell transitions bugs breaking splashscreen cts" into sc-v2-dev am: 317e669870 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340839

Change-Id: Ida7bb38d0da0bd5b059e7c85cd99aaa03ff2efb1
 2021-07-21 19:19:37 +00:00
Fiona Campbell
88bbda9c26 Merge "Add displayId to DPC logs" into sc-dev am: 1d509e2e21 am: fc031a9ada 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15299315

Change-Id: I50cc0e889fe1ae4dcfe58ee2e257e05c4746ba8b
 2021-07-21 19:19:05 +00:00
Ilya Matyukhin
622f14c389 Merge "Fix enrollment preview surface leak" into sc-dev am: 2151a28c7c am: f02dae3491 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15246716

Change-Id: I3fb96607d1977cf08a14bb71a24b364c62cb2662
 2021-07-21 19:18:50 +00:00
Yuncheol Heo
44399f20c8 Merge "Apply setAlwaysOnTop when recycling Task." into sc-v2-dev am: ee4ae77c5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305884

Change-Id: I3e31cb5daf9253d83954fcabbca93de04e921045
 2021-07-21 19:18:26 +00:00
Silin Huang
379ac00e3e Recreate the Wallet client before query the wallet cards with a time am: afe1913257 am: c37bf4e5f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15315891

Change-Id: Id55dbaaa99cd9bac0eb69e4cbb937af4b42306bc
 2021-07-21 19:18:05 +00:00
Chris Li
56640cd192 Merge "Do not preload recents activity if it will be visible" into sc-v2-dev am: 5b7911b8a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15319290

Change-Id: I322c1ce27cd3cce21114f33267250ebe803ca0cc
 2021-07-21 19:17:56 +00:00
Beverly Tai
f05867f696 Merge "Rely on the dozeAmount changes for mIsDozing" into sc-dev am: 814655b18c am: c4fe720f11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15348030

Change-Id: Ic51cc10472f469b4ce7489831990efda1f37f0ce
 2021-07-21 19:17:41 +00:00
Evan Severson
534ebbeec9 Merge "Don't block intent if op is restricted due to toggles" into sc-dev am: 2b11e7f25c am: b88fa4135b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15245178

Change-Id: I6b983abe3ab13c386524b073832afe271390ad71
 2021-07-21 19:17:26 +00:00
Sunny Goyal
854a50690d Merge "Accounting for image scaling when calculating color extraction" into sc-v2-dev am: f7f941743d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15342468

Change-Id: Ic92d485b2fca34e2594405c092436e48deafbfd3
 2021-07-21 19:16:56 +00:00
Josh Tsuji
d3c9519ece Merge "Fix issue where screen off is disabled after expanding then collapsing the shade." into sc-dev am: 3d89666385 am: cc8ebcaf9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340719

Change-Id: I40b814898be63ca57b767b4b1eb60bc519eac644
 2021-07-21 19:15:51 +00:00
Evan Rosky
317e669870 Merge "Fix some shell transitions bugs breaking splashscreen cts" into sc-v2-dev 2021-07-21 18:01:08 +00:00
Fiona Campbell
fc031a9ada Merge "Add displayId to DPC logs" into sc-dev am: 1d509e2e21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15299315

Change-Id: I26ef1c7c8ffad1cfb81d96cd43be4029d3e89bfd
 2021-07-21 17:56:33 +00:00
Fiona Campbell
1d509e2e21 Merge "Add displayId to DPC logs" into sc-dev 2021-07-21 17:51:27 +00:00
Ilya Matyukhin
f02dae3491 Merge "Fix enrollment preview surface leak" into sc-dev am: 2151a28c7c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15246716

Change-Id: Ia6c92a226d1fe7db3cf82c799145a7d773145352
 2021-07-21 17:51:11 +00:00
Yuncheol Heo
ee4ae77c5f Merge "Apply setAlwaysOnTop when recycling Task." into sc-v2-dev 2021-07-21 17:43:02 +00:00
Ilya Matyukhin
2151a28c7c Merge "Fix enrollment preview surface leak" into sc-dev 2021-07-21 17:41:34 +00:00
Silin Huang
c37bf4e5f6 Recreate the Wallet client before query the wallet cards with a time am: afe1913257 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15315891

Change-Id: Ifd6c3888440ba96c26f7a20c7f567b8f0a353aee
 2021-07-21 17:35:50 +00:00
Silin Huang
afe1913257 Recreate the Wallet client before query the wallet cards with a time 
window.

The previous approach won't working because we can't catch the
IOException in the tile; so we need to avoid using a staled QAW client, and the re-create call is
relatively cheap.
The re-creation will happen at most once per 10-minute time window.

Test: atest
Fixes: 188789272
Change-Id: I2c4dd25d4eb7a983c7ca7870fdba147ff8452a3d
 2021-07-21 17:32:26 +00:00
Chris Li
5b7911b8a3 Merge "Do not preload recents activity if it will be visible" into sc-v2-dev 2021-07-21 17:29:07 +00:00
Beverly Tai
c4fe720f11 Merge "Rely on the dozeAmount changes for mIsDozing" into sc-dev am: 814655b18c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15348030

Change-Id: I5b1e144f8d5c50b5eab2f99f54a4916b3256dd4e
 2021-07-21 17:26:52 +00:00
Evan Severson
b88fa4135b Merge "Don't block intent if op is restricted due to toggles" into sc-dev am: 2b11e7f25c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15245178

Change-Id: I6e6fea3721aed83e38d3b70f570036c1b3c72c03
 2021-07-21 17:26:21 +00:00
Beverly Tai
814655b18c Merge "Rely on the dozeAmount changes for mIsDozing" into sc-dev 2021-07-21 17:22:19 +00:00
Evan Severson
2b11e7f25c Merge "Don't block intent if op is restricted due to toggles" into sc-dev 2021-07-21 17:10:21 +00:00
Sunny Goyal
f7f941743d Merge "Accounting for image scaling when calculating color extraction" into sc-v2-dev 2021-07-21 16:53:51 +00:00
Josh Tsuji
cc8ebcaf9d Merge "Fix issue where screen off is disabled after expanding then collapsing the shade." into sc-dev am: 3d89666385 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340719

Change-Id: Ie254711aef1847de3ba08a26ae167dee8f0392f7
 2021-07-21 16:00:48 +00:00
Josh Tsuji
3d89666385 Merge "Fix issue where screen off is disabled after expanding then collapsing the shade." into sc-dev 2021-07-21 15:40:24 +00:00
Evan Severson
7b6d643171 Don't block intent if op is restricted due to toggles 
Test: Create sdk 22 and 30 test apps and use the MEDIASTORE intents
Bug: 192635623
Change-Id: I250a5e398e72919ec8217e87b76273082e781f63
 2021-07-21 08:37:00 -07:00
Beverly Tai
b4523a71c6 resolve merge conflicts of 1023c783d8 to sc-v2-dev-plus-aosp 
Change-Id: I1063f845f110714754f5738de95538e3ae98e66a
Fixes: 194282466
Merged-In: I621ea06984f17954e9be138e9e5669aeb3cfb3fe
 2021-07-21 15:24:17 +00:00
Beverly
346acd4920 Rely on the dozeAmount changes for mIsDozing 
The large clock view can be attached while the
doze transition is happening, so we don't want to
mistakently set mIsDozing=false from StatusBarStateController#isDozing
when we should be relying on the update from onDozeAmountChanged.

Test: manual
Fixes: 194277812
Change-Id: I202b9d845194f9d97d8ac1d6d1ff7e3f78491fd7
 2021-07-21 10:51:28 -04:00
Beverly Tai
218182d11f Merge "Don't forward touches to udfps if notification panel is expanding" into sc-dev am: f7b36eedf5 am: c2810b436a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340335

Change-Id: I7db0b1c060cc43a071ea1ec613efe94944df5a7d
 2021-07-21 14:25:28 +00:00
Beverly Tai
0e116ac6bb Merge "Don't forward touches to udfps if notification panel is expanding" into sc-dev am: f7b36eedf5 am: db88fa5c71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340335

Change-Id: I10bb5475caad73feadcca07abb47209b79a60570
 2021-07-21 14:17:19 +00:00
Beverly Tai
1023c783d8 Merge "Update orientation on rotation changes" into sc-dev am: b8a20acc47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340330

Change-Id: I88cf0a350a7bdcac3661874c9b75da5a7f8d9a35
 2021-07-21 14:08:45 +00:00
Beverly Tai
c2810b436a Merge "Don't forward touches to udfps if notification panel is expanding" into sc-dev am: f7b36eedf5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340335

Change-Id: I35812bb6ba722816320d3e8083563083e5e2c169
 2021-07-21 14:08:28 +00:00
Beverly Tai
db88fa5c71 Merge "Don't forward touches to udfps if notification panel is expanding" into sc-dev am: f7b36eedf5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340335

Change-Id: Ie8f21500e8c50cd8746f17dc03440c258031e09f
 2021-07-21 14:06:43 +00:00
Beverly Tai
b8a20acc47 Merge "Update orientation on rotation changes" into sc-dev 2021-07-21 13:57:35 +00:00
Beverly Tai
f7b36eedf5 Merge "Don't forward touches to udfps if notification panel is expanding" into sc-dev 2021-07-21 13:57:08 +00:00
TreeHugger Robot
054dbac3e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 39bd3b0f40 -s ours am: 4d7a460996 -s ours am: 429650a265 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I102321f33aec3a1b4f792656d1551cfdaecac5a7
 2021-07-21 13:50:49 +00:00
TreeHugger Robot
59ca5cf7f4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 39bd3b0f40 -s ours am: 4d7a460996 -s ours am: 9118bfc2fb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idbb6664468db0588e015cf407da7edbadc5c01c6
 2021-07-21 13:50:30 +00:00
TreeHugger Robot
9118bfc2fb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 39bd3b0f40 -s ours am: 4d7a460996 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7519602542fa70cf8b965c6bd898e0abae2f2efb
 2021-07-21 13:41:22 +00:00
TreeHugger Robot
429650a265 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 39bd3b0f40 -s ours am: 4d7a460996 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8eee4968e4701a4308bca538bacafa73577886ec
 2021-07-21 13:40:37 +00:00
TreeHugger Robot
4d7a460996 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 39bd3b0f40 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8c0cebc41af2170eef0105f2bd9b1a1f38416e8f
 2021-07-21 13:31:15 +00:00
TreeHugger Robot
f20a2ae1b5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4959acde34 -s ours am: 9d0657478b -s ours am: 82738e061b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icf7dfdba1d516ef63f6371fdf453fa3dc0dbec84
 2021-07-21 13:21:09 +00:00
TreeHugger Robot
f20faacfda [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 18636927b7 -s ours am: 0ae2db6866 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I138fc8f8841f96471d5c8c65771e31f84f11bea6
 2021-07-21 13:20:53 +00:00
TreeHugger Robot
cc3724e778 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4959acde34 -s ours am: 9d0657478b -s ours am: 78ea856c42 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idb449a9ae91e025dc5229867aeaeb25e268ae780
 2021-07-21 13:20:43 +00:00
TreeHugger Robot
4ed735e558 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 18636927b7 -s ours am: 678227ea73 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia771b138518aea87f32ad16c21cd7e3bff5d9baa
 2021-07-21 13:20:37 +00:00
TreeHugger Robot
78ea856c42 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4959acde34 -s ours am: 9d0657478b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3dbf617c997c0d061dd64fe3fb0563eaeddd906d
 2021-07-21 13:06:06 +00:00
TreeHugger Robot
678227ea73 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 18636927b7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0d933f51fb30104eebfa4d40378798aec5ea61ed
 2021-07-21 13:06:02 +00:00
TreeHugger Robot
82738e061b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4959acde34 -s ours am: 9d0657478b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib97d4215e11217da943d84fe830d6823c821f73e
 2021-07-21 13:05:31 +00:00
TreeHugger Robot
0ae2db6866 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 18636927b7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7842b8e673d07461f4d4eb63060a515e8428d32d
 2021-07-21 13:05:06 +00:00
TreeHugger Robot
39bd3b0f40 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-07-21 13:04:13 +00:00