Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
649,783 Commits 3 Branches 0 Tags
43ded012fb72d904c776cd15c195a3caefd359e1
Commit Graph

649783 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
43ded012fb Merge "Ensure end action is called if keyguard animation is cancelled" into sc-qpr1-dev 2021-11-02 15:45:20 +00:00
TreeHugger Robot
bd69c2fd14 Merge "Fixed an issue where using UDFPS always dismissed the shade" into sc-qpr1-dev 2021-11-02 13:11:00 +00:00
Beverly
9b971d6e1b Ensure end action is called if keyguard animation is cancelled 
Else, the dozing state may be inaccurate which will
cause aod-buggyness

Test: manual, builds and transition to AOD still works
Bug: 202630143
Change-Id: I57af55792db76552d3f991204b185a9472abea58
Merged-In: I9984863d0acea1265d09dfcfac22d5e78c73a1fe
Merged-In: I57af55792db76552d3f991204b185a9472abea58
(cherry picked from commit 0f63fa265b)
 2021-11-02 12:48:21 +00:00
TreeHugger Robot
8439fe32aa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c99378b0f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia8a2e0991a44df13b61a000075ac07f22fb94e9b
 2021-11-02 00:18:25 +00:00
TreeHugger Robot
c99378b0f1 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-11-02 00:01:34 +00:00
TreeHugger Robot
1a197c7865 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: eb76dbdafc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I99c25c3d56585ee2b8ba5c6aa6132aab4b7eda1c
 2021-11-01 05:59:24 +00:00
TreeHugger Robot
698d409b93 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 396910427d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0207e873533f9f97bb3f0d0b515cc5beb5563d7b
 2021-11-01 05:59:02 +00:00
TreeHugger Robot
b9a0fe5c5a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: aa45eeb190 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I246346de56d98045021e1d2a4225aa6de898c46e
 2021-11-01 05:58:45 +00:00
TreeHugger Robot
a90653a300 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-11-01 05:56:01 +00:00
TreeHugger Robot
081aff21e5 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-11-01 05:55:40 +00:00
TreeHugger Robot
eb76dbdafc Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-11-01 05:50:50 +00:00
TreeHugger Robot
23bae112f2 Merge changes from topic "presubmit-am-d42aa9966d86454092249b55f0b30895" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8458f200a3
  Import translations. DO NOT MERGE ANYWHERE
 2021-11-01 05:50:50 +00:00
TreeHugger Robot
063a0750b7 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-11-01 05:50:13 +00:00
TreeHugger Robot
6170012fa0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-11-01 05:46:52 +00:00
TreeHugger Robot
d637f83987 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-11-01 05:46:45 +00:00
TreeHugger Robot
d4f9410cca Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-11-01 05:46:36 +00:00
TreeHugger Robot
396910427d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-11-01 05:43:56 +00:00
TreeHugger Robot
9e5fe6862f Merge changes from topic "presubmit-am-ba475b17246b4ba3be601f794b9dc05b" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fcd8332169
  Import translations. DO NOT MERGE ANYWHERE
 2021-11-01 05:43:56 +00:00
TreeHugger Robot
aa45eeb190 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-11-01 05:43:40 +00:00
TreeHugger Robot
20b7fa7d57 Merge changes from topic "presubmit-am-07fbc24475da4c549999999d34e98894" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 082d923822
  Import translations. DO NOT MERGE ANYWHERE
 2021-11-01 05:43:40 +00:00
Bill Yi
3f48a5f619 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I590df87e311a90b7e999b9f825390c3a57832b59
 2021-10-31 01:40:57 +00:00
Bill Yi
d937ac20fb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib874800465d33eb3627e59c5f0bdcf2f0feac16f
 2021-10-30 17:17:32 +00:00
Bill Yi
5f027098e3 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8458f200a3 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ia49dfb2c654df48962c681895842f12e5e5eea2d
 2021-10-30 17:16:19 +00:00
Bill Yi
8458f200a3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9ec97a2b4a98824c25fbf61426de24942b4755c7
 2021-10-30 17:16:08 +00:00
Bill Yi
e700785fec Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibc92ac3580c0d9d1e5ecda252c29e87ce1cb34cf
 2021-10-30 17:10:31 +00:00
Bill Yi
388b7175bb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia505694a68fe54ee8571d6bebc22023fe167074f
 2021-10-30 17:08:27 +00:00
Bill Yi
bac6655905 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iee4e12553242e1bc151bef4815910365e5f8d4e5
 2021-10-30 16:33:42 +00:00
Bill Yi
0f0709dec0 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 041728595d 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ic61a62148eb88b493d079f1821576282434d8497
 2021-10-30 16:32:30 +00:00
Bill Yi
041728595d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I558e1e32ea18567501b34e3ecc2bdfed5dcb38ca
 2021-10-30 16:32:23 +00:00
Bill Yi
0dcdd922f1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I15bb88121b04131f060c0ca427381bd01a3732f9
 2021-10-30 16:25:51 +00:00
Bill Yi
7135e7fd8c [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 082d923822 
Blank merge reason: commit message contains skip directive

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

Change-Id: I4be3c9c1a11705253b673c79db59f624eb470623
 2021-10-30 16:24:38 +00:00
Bill Yi
082d923822 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I85a3bae50353bd45a35e021cfae33191770c6935
 2021-10-30 16:24:30 +00:00
Bill Yi
68d040ec1f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8485957d4545b86b961dfb0b59fb15bbcfd57d8a
 2021-10-30 13:20:32 +00:00
Bill Yi
204396496a [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fcd8332169 
Blank merge reason: commit message contains skip directive

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

Change-Id: If1fce0ba90b59720ad5e7d623865812bdf5a7a41
 2021-10-30 13:18:21 +00:00
Bill Yi
fcd8332169 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0ed170343893d9416340b8813341b01ea4d79ef7
 2021-10-30 13:17:47 +00:00
Joy Babafemi
7bde0926f7 [DO NOT MERGE] Handle IllegalStateException in APM event handling. 
Test: Manual
Bug: 204003158
Change-Id: I8cf2b091b9f323079f54a38dfc9ddfc8af512a43
 2021-10-28 18:55:47 +00:00
Selim Cinek
571fdde909 Fixed an issue where using UDFPS always dismissed the shade 
Because we were only checking for the bouncer to be shown and not
the alternative auth interceptor, the unlock mode always ended up
being unlock_collapse instead of dismiss_bouncer.
The isBouncerShowing() was already taking into account the alternative
auth path, but the bouncerIsOrWillBeShowing() didn't

Fixes: 204049350
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java
Merged-In: Id8bf8460bff26ec5694c82466ea63e3cdf61216e
Change-Id: Id8bf8460bff26ec5694c82466ea63e3cdf61216e
 2021-10-28 16:35:05 +00:00
Weng Su
f42de45da6 Merge "[RESTRICT AUTOMERGE] Hide Wi-Fi Scanning message when Location is disabled (QS Internet Dialog)" into sc-qpr1-dev 2021-10-27 18:42:44 +00:00
Issei Suzuki
f5a613e528 Fix black frame flicker in UNOCCLUDE transition. 
When an activity which occludes the keyguard finishes, WindowManager
immediately updatees the keyguard occluded status, so show-when-locked
wallpaper was not used anymore. However sysui needed some time to finish
keyguard occluded status change in their side, and meantime no wallpaper
target existed.

With this change, we keep using show-when-locked wallpaper until app
transition finishes.

Bug: 201560359
Test: manual. Show assist app on the lockscreen and close.
Change-Id: I4958a2f5ecdd12b3db43b44ee4a221972070ab2c
 2021-10-26 08:55:15 +00:00
Ahming Chen
3e4737aafa Merge "Fixed the performance of unlocking when dozing" into sc-qpr1-dev 2021-10-26 04:28:38 +00:00
TreeHugger Robot
fe4b701900 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ce29e7fe5c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ice8c8fc608a5e07c492328dc0dd34b4c4e4f630f
 2021-10-22 06:30:40 +00:00
TreeHugger Robot
ce29e7fe5c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-10-22 06:14:39 +00:00
TreeHugger Robot
89a07b5a1b Merge changes from topic "presubmit-am-0550843f1444420ab16f47a7d2ecee97" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2cda11dd3c
  Import translations. DO NOT MERGE ANYWHERE
 2021-10-22 06:14:39 +00:00
TreeHugger Robot
30d10334c4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f28827d1e7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I841634db3abc067d513cfef00d29263b1caed869
 2021-10-22 05:44:18 +00:00
TreeHugger Robot
82443994f8 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-10-22 05:36:48 +00:00
TreeHugger Robot
f28827d1e7 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-10-22 05:31:08 +00:00
TreeHugger Robot
3307b3eda9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-10-22 05:23:28 +00:00
Bill Yi
fbf951b12e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ff4ac67089 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If4eadbdd72934e7bda1b16754dd0f4ca81089719
 2021-10-22 04:30:43 +00:00
Bill Yi
ff4ac67089 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-10-22 04:15:40 +00:00
Bill Yi
c056ea0d52 Merge changes from topic "presubmit-am-902b4a010a85419caf0dc4cf949d2c72" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5cde27cf42
  Import translations. DO NOT MERGE ANYWHERE
 2021-10-22 04:15:40 +00:00