Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
661,218 Commits 3 Branches 0 Tags
08bb830b05d199674527e6708c0894be44744979
Commit Graph

661218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
08bb830b05 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 69b8a6c9c9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id68b8b4acf806c57924b081717043057a7d8464f
 2021-07-23 19:43:11 +00:00
TreeHugger Robot
c9207e9913 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c703274ee9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idc2dbf2b41aa510db75c88ea98e54863c236aab8
 2021-07-23 19:41:51 +00:00
TreeHugger Robot
69b8a6c9c9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-23 19:37:20 +00:00
TreeHugger Robot
c703274ee9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-23 19:31:00 +00:00
Beth Thibodeau
7c7dfc2624 Merge "Fix drag down animation when bypassing" into sc-v2-dev am: c9d779caa3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15363324

Change-Id: I8b9849055c23aedee94ad962bb9350bc9d29bb6a
 2021-07-23 18:19:17 +00:00
TreeHugger Robot
65ed84d135 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: ca31c5e7db -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I64694d2f76cd16a0dd102fcb2ef560f81464fd14
 2021-07-23 18:18:56 +00:00
Chris Li
d266638c3b Merge "Fix Keyguard exit remote animation not invoke finish callback" into sc-v2-dev am: 56e45a0dd4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15331681

Change-Id: Ib427c462e255b6644bed73340f9a51f4ae8e91bc
 2021-07-23 18:18:38 +00:00
TreeHugger Robot
2572782ea0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5f74fa08ba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1b716b0a41fd44643861aa3145ad62d3547d4d8f
 2021-07-23 18:17:40 +00:00
TreeHugger Robot
3663ca587e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: f14036160e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I004c633d704fa855f2fb3adbf15b233830f85b0f
 2021-07-23 18:17:18 +00:00
TreeHugger Robot
3c09d364eb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: cb59ead845 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I12a121c18b2ee3cb70fdeb66c80ce00b7ac489a7
 2021-07-23 18:17:03 +00:00
Beth Thibodeau
c9d779caa3 Merge "Fix drag down animation when bypassing" into sc-v2-dev 2021-07-23 18:15:22 +00:00
TreeHugger Robot
ca31c5e7db Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-23 18:12:41 +00:00
Chris Li
56e45a0dd4 Merge "Fix Keyguard exit remote animation not invoke finish callback" into sc-v2-dev 2021-07-23 18:01:17 +00:00
TreeHugger Robot
5f74fa08ba Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-23 17:57:24 +00:00
TreeHugger Robot
f14036160e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-23 17:53:33 +00:00
TreeHugger Robot
cb59ead845 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-23 17:52:46 +00:00
Bill Yi
e6987aff6a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifd001dc07b61d2e5518168af4da68da3ed46ca2c
 2021-07-23 17:12:57 +00:00
Bill Yi
8128340b67 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibe661f99fb20c735cd33adb39b98c4f790c36e54
 2021-07-23 17:08:29 +00:00
Bill Yi
c01605f9de Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2da9b057a7e2402a99363f8f342516c53bad320f
 2021-07-23 16:54:41 +00:00
Bill Yi
20193b10f0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I180ea7cd109483733eb4036b3665a483af6b2ae1
 2021-07-23 16:16:50 +00:00
Jamie Garside
d7a0bdbafc Merge "Updated keyguard_pin_view to use a ConstraintLayout." into sc-v2-dev am: a8813c12da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302107

Change-Id: I5e2fde84e2fbafc8d87a11cb224bdcd907b1183f
 2021-07-23 13:55:56 +00:00
Sergey Volnov
f4a51077b8 Merge "Revert "Fix stage split rotation"" into sc-v2-dev am: e175b6f56f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15371911

Change-Id: Ib437340feadb5923c0ccc5748d14bfdac60a4e1d
 2021-07-23 13:54:46 +00:00
Bill Yi
a81a5aefe9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I42bee20dd7e0a9fb93eb366fd51be58d4fcba2f2
 2021-07-23 13:35:10 +00:00
Jamie Garside
a8813c12da Merge "Updated keyguard_pin_view to use a ConstraintLayout." into sc-v2-dev 2021-07-23 13:34:43 +00:00
Sergey Volnov
e175b6f56f Merge "Revert "Fix stage split rotation"" into sc-v2-dev 2021-07-23 13:33:52 +00:00
Bill Yi
ed5a96473f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I916416da0bee68ce06a50f6f17ced5902a7d69d4
 2021-07-23 12:42:56 +00:00
Tony Huang
acc62fda0a Revert "Fix stage split rotation" 
This reverts commit 706bb3e9a3.

Reason for revert: Cause tests fail

Fix: 191338484
Change-Id: I7a5fb1fa31be2cb52c440dc64f91a83548bcc230
 2021-07-23 11:37:41 +00:00
Louis Chang
d6d6710ab8 Merge "Providing caller's token when starting activity in TaskFragment" into sc-v2-dev am: 692e92bfde 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15359961

Change-Id: Ib5f1f947f4357f91a93bb818b63ac619d36b1d7f
 2021-07-23 08:44:24 +00:00
Louis Chang
692e92bfde Merge "Providing caller's token when starting activity in TaskFragment" into sc-v2-dev 2021-07-23 08:26:03 +00:00
Louis Chang
c094430565 Merge "Finishing root activity if having other running activities" into sc-v2-dev am: f1a38d121f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15358030

Change-Id: I1010babaf075eeb4f059e9a788ad9e74c18e32a1
 2021-07-23 07:06:11 +00:00
Louis Chang
f1a38d121f Merge "Finishing root activity if having other running activities" into sc-v2-dev 2021-07-23 06:52:09 +00:00
Tony Huang
77d8f94df8 Merge "Make sure divider show after DA info changed" into sc-v2-dev am: c7efed22c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15358031

Change-Id: I4791771c87632623dd23ea398ef47f867cdcaf98
 2021-07-23 06:42:19 +00:00
Tony Huang
c7efed22c4 Merge "Make sure divider show after DA info changed" into sc-v2-dev 2021-07-23 06:26:43 +00:00
Charles Chen
a98b15ccdd Merge "Add hasRunningActivity in TaskFragmentInfo" into sc-v2-dev am: 7d66f8c082 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15334932

Change-Id: Idfffbec56f2a6327043644d6dc500db9119bed23
 2021-07-23 04:04:16 +00:00
TreeHugger Robot
8ed4e9940c Merge "Prevent NPE when dropping app icon to split" into sc-v2-dev am: c739eabbd3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15344540

Change-Id: I6d0467366b4b9e487cec5e20f2eefd6985e099cf
 2021-07-23 04:03:02 +00:00
Charles Chen
7d66f8c082 Merge "Add hasRunningActivity in TaskFragmentInfo" into sc-v2-dev 2021-07-23 03:46:27 +00:00
TreeHugger Robot
c739eabbd3 Merge "Prevent NPE when dropping app icon to split" into sc-v2-dev 2021-07-23 03:37:23 +00:00
Louis Chang
ca43bb061b Providing caller's token when starting activity in TaskFragment 
NEW_TASK flag was added by ATMS when #startActivityInTaskFragment
is called because the activity was started without source record.

Bug: 193846941
Test: starting CCT in sample app
Change-Id: Ida26034324f7ff761f1e688403d78959a01f010d
 2021-07-23 11:14:35 +08:00
Tony Huang
24024d9f40 Merge "Fix stage split rotation" into sc-v2-dev am: 15cf30408a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15334934

Change-Id: If7afb693e6117fcbaf750855acad1710b0323858
 2021-07-23 03:13:20 +00:00
Tony Huang
2ac27f9e10 Make sure divider show after DA info changed 
Currently it will not receive stage visibility changed callback
after display info changed, the divider will not show even if it
has re-initialized.

Fix this by add applyVisibility call when display info changed.

Fix: 194159070
Test: active stage split and rotate phone
Change-Id: I2b9d6849300bc8a594cdbe658a7f7a663fd949a7
 2021-07-23 10:58:09 +08:00
Tony Huang
15cf30408a Merge "Fix stage split rotation" into sc-v2-dev 2021-07-23 02:54:09 +00:00
Chris Li
6ea18c5778 Fix Keyguard exit remote animation not invoke finish callback 
When Shell transition is enabled, some launcher tests failed because the
keyguard exit remote animation never invoke the finish callback.

The expect flow is:
1. Dismiss amount changed from 0 to 0.1+ to trigger the keyguard going
away transition.
2. Dismiss amount changed from 0.1+ to 0.3+ to finish the keyguard exit
remote animation.

However, in presubmit test, the dismiss amount may changed from 0.0+ to
1.0 directly. When it happened, there is only a trigger to start the
transition, but never trigger the change event to call the finish
callback, which blocked the Shell transition.

The idea is to also check the current dismiss amount when the keyguard
going away transition reach to the controller.

Bug: 183993924
Test: atest PromiseIconUiTest
Change-Id: I95951385130578f45df0837200cc7e88d89edd34
 2021-07-22 18:46:03 -07:00
Selim Cinek
d879f8802c Fix drag down animation when bypassing 
The drag down animation didn't do the transition
to the full shade visually, so things would look
out of place.

Fixes: 191282610
Test: drag down while bypassing
Change-Id: Icdd62155f3762621c1046ed5271476ec0b4e2635
 2021-07-22 21:48:50 +00:00
Ram Parameswaran
a1871cd45c Merge "Update dialog styling to comply with design guidelines" into sc-v2-dev am: a22be8fb7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15286553

Change-Id: I1103a5d18745b3a27a6fc48f18eff428b0620ed4
 2021-07-22 21:40:10 +00:00
Ram Parameswaran
a22be8fb7e Merge "Update dialog styling to comply with design guidelines" into sc-v2-dev 2021-07-22 21:39:41 +00:00
TreeHugger Robot
b401cf519f Merge "Skip operation on content overlay if task's vanished" into sc-v2-dev am: 8dbc900327 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15361375

Change-Id: I95c5c79067599e11a13695d6e7419102613cef7a
 2021-07-22 21:39:33 +00:00
Ben Lin
2f23941508 Merge "PiP: Implement auto-rotate w/ button nav for Shell Transitions." into sc-v2-dev am: 9e8c821a32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15314232

Change-Id: Ie6c0fb65ac66c770b681f96968c74efc3698ec0d
 2021-07-22 21:34:02 +00:00
TreeHugger Robot
8dbc900327 Merge "Skip operation on content overlay if task's vanished" into sc-v2-dev 2021-07-22 21:28:20 +00:00
Ben Lin
9e8c821a32 Merge "PiP: Implement auto-rotate w/ button nav for Shell Transitions." into sc-v2-dev 2021-07-22 21:25:07 +00:00
TreeHugger Robot
52c4adb516 Merge "PiP: Fully disable dismiss target." into sc-v2-dev am: aff5acf765 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15351301

Change-Id: I42609cde00a2d5743d4df38db7abb5fa0d653c9e
 2021-07-22 19:40:37 +00:00