OSDN Git Service
felkachang [Wed, 9 May 2018 02:43:07 +0000 (19:43 -0700)]
Fix Clock flickers after reboot with strong authentication
am:
d5060280cb
Change-Id: I5bab533b677a7bbcf7fdb5292fe3795784f86c11
felkachang [Fri, 4 May 2018 08:25:45 +0000 (16:25 +0800)]
Fix Clock flickers after reboot with strong authentication
After boot, the device request the strong authentication but
finger print is not strong. The keyguard will appear after collapsing
NotificationPanelView.
Because StatusBarKeyguardViewManager.mExpansionCallback.onFullyShown
->updateStates should call mStatusBar.setBouncerShowing(true)
before PanelBar.mExpanded = false but
StatusBarKeyguardViewManager.mBouncer.isShowing() return false,
StatusBarKeyguardViewManager.updateStates doesn't call
mStatusBar.setBouncerShowing.
After PanelBar.mExpanded = false, PhoneStatusBarView post runnable
mHideExpandedRunnable to show the Bouncer and make the Bouncer to be
showing and then change the NotificationPanelView to be VISIBLE.
The solution is to call
mStatusBarKeyguardViewManager.showBouncer(false) before calling
mStatusBarKeyguardViewManager.animateCollapsePanels(
FINGERPRINT_COLLAPSE_SPEEDUP_FACTOR). To make the
KeyguardBouncer.mRoot to be VISIBLE by KeyguardBouncer.mShowRunnable.
Bug:
78490344
Test: atest SystemUITests
Change-Id: Ia8770cd3ca98007574c0ba18c0464fc2f58b7973
Michael Kwan [Wed, 9 May 2018 02:07:12 +0000 (19:07 -0700)]
Merge "Add watch specific tweaks to global actions layouts." into pi-dev
am:
9327d2d757
Change-Id: Ied7fdc908831f58e77618c75c697db5d3e707580
Michael Kwan [Wed, 9 May 2018 01:53:50 +0000 (01:53 +0000)]
Merge "Add watch specific tweaks to global actions layouts." into pi-dev
android-build-prod (mdb) [Wed, 9 May 2018 01:48:38 +0000 (18:48 -0700)]
Merge "Bluetooth: Fix HFP SCO logic and documentation" am:
9c4593243c
am:
caa341904a
Change-Id: I89a005fcc9b9bd063d6a23c87cf00db52225228d
android-build-prod (mdb) [Wed, 9 May 2018 01:37:29 +0000 (18:37 -0700)]
Merge "Bluetooth: Fix HFP SCO logic and documentation"
am:
9c4593243c
Change-Id: I86b54d8d05be040eb2273e83f25201e0f2b005a1
Chenjie Yu [Wed, 9 May 2018 01:07:57 +0000 (18:07 -0700)]
Merge "fix cts error on x86 simulator" into pi-dev
am:
9743fae2d9
Change-Id: I13f5120724b6983661bd29f93112c66c4bce0f3d
Chenjie Yu [Wed, 9 May 2018 00:53:09 +0000 (00:53 +0000)]
Merge "fix cts error on x86 simulator" into pi-dev
android-build-team Robot [Wed, 9 May 2018 00:38:02 +0000 (17:38 -0700)]
Merge "Fix statsd returning uidmap with empty reports." into pi-dev
am:
0d3a6dee7f
Change-Id: I3ab384316614255710a51ff84e43d1fe4dc076c8
android-build-team Robot [Wed, 9 May 2018 00:25:31 +0000 (00:25 +0000)]
Merge "Fix statsd returning uidmap with empty reports." into pi-dev
android-build-prod (mdb) [Wed, 9 May 2018 00:25:12 +0000 (00:25 +0000)]
Merge "Bluetooth: Fix HFP SCO logic and documentation"
android-build-prod (mdb) [Wed, 9 May 2018 00:25:04 +0000 (17:25 -0700)]
Merge "Update the Open Mobile API version" am:
cf54a958db
am:
b6d1fd2a07
Change-Id: I9c6143ac7a3bf8f4c72467a01591de4e60bedfc7
android-build-team Robot [Tue, 8 May 2018 23:46:37 +0000 (16:46 -0700)]
Merge "Should not use the absolute value when the value does not change." into pi-dev
am:
64307ea578
Change-Id: I8d4c27f386e4e952d2d32f627ea3818d8f50334e
android-build-team Robot [Tue, 8 May 2018 23:31:40 +0000 (23:31 +0000)]
Merge "Should not use the absolute value when the value does not change." into pi-dev
android-build-prod (mdb) [Tue, 8 May 2018 23:27:07 +0000 (16:27 -0700)]
Merge "Update the Open Mobile API version"
am:
cf54a958db
Change-Id: If5f611b074e3ee855d58878688333d1031e6fa93
android-build-team Robot [Tue, 8 May 2018 23:02:43 +0000 (16:02 -0700)]
Merge "Fade in/out onboarding tips." into pi-dev
am:
668556cd47
Change-Id: I14a5762bc446eb4781de4ac95baec7f6b1c41c6d
android-build-team Robot [Tue, 8 May 2018 22:58:16 +0000 (15:58 -0700)]
Merge "Add null check before checking overlay" into pi-dev
am:
5d1d771e99
Change-Id: I9ab7d738a4a32d1dcba566b0ce9cea0b149dfaef
android-build-team Robot [Tue, 8 May 2018 22:53:48 +0000 (22:53 +0000)]
Merge "Fade in/out onboarding tips." into pi-dev
android-build-team Robot [Tue, 8 May 2018 22:42:24 +0000 (22:42 +0000)]
Merge "Add null check before checking overlay" into pi-dev
Chenjie Yu [Wed, 18 Apr 2018 23:25:36 +0000 (16:25 -0700)]
fix cts error on x86 simulator
Bug:
78242568
Fix:
78242568
Test: cts test
Change-Id: I235991c7c5b7c5a0d660ebaaff1356cc69fd1854
android-build-prod (mdb) [Tue, 8 May 2018 22:22:13 +0000 (22:22 +0000)]
Merge "Update the Open Mobile API version"
Yangster [Tue, 8 May 2018 22:12:30 +0000 (15:12 -0700)]
Should not use the absolute value when the value does not change.
Test: statsd test
BUG: b/
79265262
Change-Id: Ic654e1a07a505ec0e073a41fb41bcd38a29b125e
David Brazdil [Tue, 8 May 2018 22:03:44 +0000 (15:03 -0700)]
Merge "Greylist cloned SDK fields" into pi-dev
am:
13428c8965
Change-Id: I938fff00538eb2bafaf9bd81527ca2344c94724b
David Brazdil [Tue, 8 May 2018 21:53:45 +0000 (21:53 +0000)]
Merge "Greylist cloned SDK fields" into pi-dev
android-build-team Robot [Tue, 8 May 2018 21:52:53 +0000 (14:52 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
ef38b83e9d -s ours
Change-Id: I0a31793f01e54a372d4ec109b4065b88e43a6e92
android-build-team Robot [Tue, 8 May 2018 21:41:34 +0000 (21:41 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Patrick Baumann [Tue, 8 May 2018 21:31:45 +0000 (14:31 -0700)]
Add null check before checking overlay
This change prevents an NPE that was occurring when the package
for a given setting was assumed to be non-null while dumping
package information for e.g. adb shell dumpsys package
Test: manual - adb shell dumpsys package is no longer malformed
Change-Id: Idaf6a6b82f1fb450848faa15f19ee08085605bdb
Fixes:
79268525
Rohan Shah [Tue, 8 May 2018 21:17:35 +0000 (14:17 -0700)]
Merge "Add knobs for tweaking blocking helper thresholds" into pi-dev
am:
7af8fe3e29
Change-Id: I5a5307d2345bb4ab5d3e91f3b58eaf8fc875f1ef
Phil Weaver [Tue, 8 May 2018 21:12:42 +0000 (14:12 -0700)]
Merge "Revert Nav bar contrast under magnification" into pi-dev
am:
4179c5ca2c
Change-Id: I09e51eace7aa5bbd59e6d59fb2f9b39edfd4b984
Tracy Zhou [Tue, 8 May 2018 21:09:44 +0000 (14:09 -0700)]
Fade in/out onboarding tips.
Bug:
79431649
Test: Manual test
Change-Id: I8054f4626f261f6620021b909982276428ccd673
Rohan Shah [Tue, 8 May 2018 21:00:07 +0000 (21:00 +0000)]
Merge "Add knobs for tweaking blocking helper thresholds" into pi-dev
Phil Weaver [Tue, 8 May 2018 20:59:27 +0000 (20:59 +0000)]
Merge "Revert Nav bar contrast under magnification" into pi-dev
Makoto Onuki [Tue, 8 May 2018 20:41:06 +0000 (13:41 -0700)]
Merge "Pre-cache more system servers" into pi-dev
am:
0c2985384b
Change-Id: Ic6b58e5d2a1e1df1ccf683c09e6422fdd16e5c78
Ying Zheng [Tue, 8 May 2018 20:34:04 +0000 (13:34 -0700)]
Merge "Deprecate UserManagerHelper in SettingsLib, use CarUserManagerHelper." into pi-dev
am:
ec443f99aa
Change-Id: I3db5f47a6e2e5fc902c935eeda2aec31be5f6421
Makoto Onuki [Tue, 8 May 2018 20:25:11 +0000 (20:25 +0000)]
Merge "Pre-cache more system servers" into pi-dev
Ying Zheng [Tue, 8 May 2018 20:22:09 +0000 (20:22 +0000)]
Merge "Deprecate UserManagerHelper in SettingsLib, use CarUserManagerHelper." into pi-dev
android-build-team Robot [Tue, 8 May 2018 19:36:08 +0000 (12:36 -0700)]
Merge "Use the non-chained interface for mobile/wifi power atoms." into pi-dev
am:
ac10be860f
Change-Id: Ib9f3929788d24e010e1315af6524eb7434c2ca83
android-build-team Robot [Tue, 8 May 2018 19:27:47 +0000 (19:27 +0000)]
Merge "Use the non-chained interface for mobile/wifi power atoms." into pi-dev
Philip P. Moltmann [Tue, 8 May 2018 19:06:38 +0000 (12:06 -0700)]
Merge "Disable throttling of SoundTrigger" into pi-dev
am:
1936031cbe
Change-Id: Ic0847e0f6de3588b819a40dda976287c5f784bd8
android-build-team Robot [Tue, 8 May 2018 19:02:04 +0000 (12:02 -0700)]
Merge "Adding a utility class for listening disable rotation changes" into pi-dev
am:
2040fbd40f
Change-Id: Ic4495411c92cb7ade09282606e441f28f120e39d
Bill Yi [Tue, 8 May 2018 19:01:09 +0000 (12:01 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I96be3cc38b6c433685e187b85303a1ed584b6108
Philip P. Moltmann [Tue, 8 May 2018 18:51:19 +0000 (18:51 +0000)]
Merge "Disable throttling of SoundTrigger" into pi-dev
android-build-team Robot [Tue, 8 May 2018 18:45:30 +0000 (18:45 +0000)]
Merge "Adding a utility class for listening disable rotation changes" into pi-dev
android-build-team Robot [Tue, 8 May 2018 18:43:06 +0000 (11:43 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
3812f1d1a7 -s ours
Change-Id: I4baa47ae5c1f162d176e21577fe7599485e90f3d
David Brazdil [Tue, 8 May 2018 18:40:26 +0000 (11:40 -0700)]
Merge changes I8b20e03c,Id1ef4ab5,Ie34adb8b into pi-dev
am:
a08802dac1
Change-Id: Icfc9aab47db9568d5c06b11c3713f49924b94438
android-build-team Robot [Tue, 8 May 2018 18:34:33 +0000 (11:34 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
c2db8716e2 -s ours
Change-Id: I514ae888940f66c8ec4895ab06c3b1eed29af41f
David Brazdil [Tue, 8 May 2018 18:27:13 +0000 (19:27 +0100)]
Greylist cloned SDK fields
Doclava will expose a field from a hidden interface if it is inherited
by an SDK class by temporarily creating a new FieldInfo object which
pretends the field is in fact declared in the SDK class.
This mechanism was missed by the routine which prints non-SDK APIs
and the fields are considered non-SDK. Until this is fixed, put the
affected fields on the light greylist to unblock CTS tests.
Bug:
64382372
Bug:
73082683
Test: atest CtsCurrentApiSignatureTestCases
Change-Id: Ic10d26b82ad8f324280e0198f1d3e8b0ab824d35
android-build-team Robot [Tue, 8 May 2018 18:31:14 +0000 (11:31 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
120e47282f -s ours
Change-Id: I60e0da3be58cddac61800b8ba07acae50fe33c8f
Makoto Onuki [Tue, 8 May 2018 18:28:50 +0000 (11:28 -0700)]
Merge "Show "in parole?" in dumpsys jobscheduler" into pi-dev
am:
c70d756bf6
Change-Id: Iaa77f4ab265274cba5d906acb2b3d8e61963a66e
android-build-team Robot [Tue, 8 May 2018 18:25:21 +0000 (18:25 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
David Brazdil [Tue, 8 May 2018 18:22:05 +0000 (18:22 +0000)]
Merge changes I8b20e03c,Id1ef4ab5,Ie34adb8b into pi-dev
* changes:
Manualy blacklist certain hidden APIs
Populate hidden API dark greylist
Refactor build rules for hidden API lists
android-build-team Robot [Tue, 8 May 2018 18:21:49 +0000 (18:21 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
android-build-team Robot [Tue, 8 May 2018 18:18:25 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Dianne Hackborn [Tue, 8 May 2018 18:16:28 +0000 (11:16 -0700)]
Merge "Make android:cantSaveState an optional feature." into pi-dev
am:
330dd0b244
Change-Id: Id9825ba64e762c1ce32eb5f3721315d724863b5d
android-build-team Robot [Tue, 8 May 2018 18:11:13 +0000 (11:11 -0700)]
Merge "EBS: Don't disable vibration when accessibility is on" into pi-dev
am:
9cd0e44482
Change-Id: Ie12393d98af737ed2713059f7d52e4c01edc9576
Makoto Onuki [Tue, 8 May 2018 18:09:56 +0000 (18:09 +0000)]
Merge "Show "in parole?" in dumpsys jobscheduler" into pi-dev
Dianne Hackborn [Tue, 8 May 2018 17:59:32 +0000 (17:59 +0000)]
Merge "Make android:cantSaveState an optional feature." into pi-dev
android-build-team Robot [Tue, 8 May 2018 17:58:24 +0000 (17:58 +0000)]
Merge "EBS: Don't disable vibration when accessibility is on" into pi-dev
android-build-team Robot [Tue, 8 May 2018 17:43:32 +0000 (10:43 -0700)]
Merge "Count launching the same app as an app launch for Quickstep onboarding" into pi-dev
am:
1589a43ece
Change-Id: I1eed7766bb579971377feec3ae05aa94751031f7
Ryan Mitchell [Tue, 8 May 2018 17:28:36 +0000 (10:28 -0700)]
Merge "AAPT: Fixed split resource dumping" into pi-dev
am:
fb07d82086
Change-Id: I66dedae28679c07e0bfa76cfafba97d563356fcb
android-build-team Robot [Tue, 8 May 2018 17:26:31 +0000 (17:26 +0000)]
Merge "Count launching the same app as an app launch for Quickstep onboarding" into pi-dev
Sunny Goyal [Tue, 8 May 2018 00:30:10 +0000 (17:30 -0700)]
Adding a utility class for listening disable rotation changes
Bug:
79376298
Test: Verified the library with Launcher
Change-Id: I2682f97f323438db0d19a2eba1a8328b7af5e3f0
Ryan Mitchell [Tue, 8 May 2018 17:17:17 +0000 (17:17 +0000)]
Merge "AAPT: Fixed split resource dumping" into pi-dev
Makoto Onuki [Mon, 7 May 2018 21:43:05 +0000 (14:43 -0700)]
Pre-cache more system servers
Bug:
78792330
Test: Boot system
Change-Id: Id65d9f7d9a697e3c85b410e5da4028a712e4347a
android-build-team Robot [Tue, 8 May 2018 16:56:11 +0000 (09:56 -0700)]
Merge changes I1539580e,I8452e799 into pi-dev
am:
8ea760c815
Change-Id: I4273e08bb50ba9b509171ea65d32bb6757a4a2b7
Ying Zheng [Tue, 8 May 2018 16:53:12 +0000 (09:53 -0700)]
Deprecate UserManagerHelper in SettingsLib, use CarUserManagerHelper.
Bug:
79417730
Test: Build
Change-Id: I49b8e7bca5ae9b036e191fbdc14e1bb459b132fb
android-build-team Robot [Tue, 8 May 2018 16:46:12 +0000 (09:46 -0700)]
Merge "Fixes a NPE in search manager in CTS tests." into pi-dev
am:
188b642ac0
Change-Id: Ie3a7de65c4b8d06a5b0110a93689ca604bdf858a
android-build-team Robot [Tue, 8 May 2018 16:41:47 +0000 (16:41 +0000)]
Merge changes I1539580e,I8452e799 into pi-dev
* changes:
Volume dialog mulit-streams have 8dp padding
Check if alarm and now times are in schedule
android-build-team Robot [Tue, 8 May 2018 16:41:04 +0000 (09:41 -0700)]
Merge "Fix intercepting touch events for guts" into pi-dev
am:
87ffd28760
Change-Id: If558d3856e5572e130fc5506e1b9f129828cad63
Nicolas Geoffray [Tue, 8 May 2018 16:35:13 +0000 (09:35 -0700)]
Merge "Add some JobInfo APIs in light grey." into pi-dev
am:
da801c2a25
Change-Id: I6cad7d446beb7cd0f8bcf0044de27722aa232142
Rohan Shah [Fri, 4 May 2018 20:42:18 +0000 (13:42 -0700)]
Add knobs for tweaking blocking helper thresholds
Added both blocking helper parameters to Global Settings to allow for
tweaking stats/values. Added listeners for value updates (so that
channels are updated properly with new thresholds).
Bug:
77143005
Test: manually, test cases
Change-Id: Ia5cfb29ca40500a694261bd5e9e60fa1f34e742a
android-build-team Robot [Tue, 8 May 2018 16:21:39 +0000 (16:21 +0000)]
Merge "Fixes a NPE in search manager in CTS tests." into pi-dev
android-build-team Robot [Tue, 8 May 2018 16:19:50 +0000 (16:19 +0000)]
Merge "Fix intercepting touch events for guts" into pi-dev
David Brazdil [Tue, 8 May 2018 15:49:02 +0000 (16:49 +0100)]
Manualy blacklist certain hidden APIs
Previous CL introduced the concept of populating the dark greylist
with remaining members of classes on the light greylist. This breaks
the assumption that some methods/fields will always remain blacklisted.
Introduce a new file which forces their blacklisting and adjust the
build rules accordingly.
Bug:
64382372
Test: make out/target/common/obj/PACKAGING/hiddenapi-blacklist.txt
Change-Id: I8b20e03c50f4027a24d2a6081bedb08bc8a34011
David Brazdil [Tue, 8 May 2018 14:28:31 +0000 (15:28 +0100)]
Populate hidden API dark greylist
This patch will iterate over all classes in the light greylist and
add the remaining (currently blacklisted) class members into the
dark greylist. This is meant to mitigate the impact of the feature
on legacy apps, in case their hidden API uses have not been detected
by our analyses. The dark greylist entries will be available to apps
targeting pre-P SDK versions, but blocked for apps targeting P or later.
Bug:
64382372
Test: make out/target/common/obj/PACKAGING/hiddenapi-dark-greylist.txt
Change-Id: Id1ef4ab523b3b4d1333b5fbf2b3e6622ef2be607
David Brazdil [Tue, 8 May 2018 14:04:20 +0000 (15:04 +0100)]
Refactor build rules for hidden API lists
The build rules were getting messy and too difficult to extend.
Extract assertions into own functions, create shared variables.
Bug:
64382372
Test: make out/target/common/obj/PACKAGING/hiddenapi-blacklist.txt
Change-Id: Ie34adb8b5349b30daa2e9e4976d285f6d9711f0e
Winson Chung [Tue, 8 May 2018 16:08:01 +0000 (09:08 -0700)]
Merge "Cancel any recents animation whenever a display's stack order changes" into pi-dev
am:
0f3698c88a
Change-Id: Id21b521fe83bc4f7afa922ee540f35fa35201c16
Nicolas Geoffray [Tue, 8 May 2018 16:06:04 +0000 (16:06 +0000)]
Merge "Add some JobInfo APIs in light grey." into pi-dev
Winson Chung [Tue, 8 May 2018 15:51:04 +0000 (15:51 +0000)]
Merge "Cancel any recents animation whenever a display's stack order changes" into pi-dev
android-build-team Robot [Tue, 8 May 2018 15:45:11 +0000 (08:45 -0700)]
Merge "Remove ticker text for screenshot saving notification." into pi-dev
am:
70c9a79127
Change-Id: I35594cbfb73048ae2fe7d3757232d193632d1d5a
android-build-team Robot [Tue, 8 May 2018 15:28:31 +0000 (15:28 +0000)]
Merge "Remove ticker text for screenshot saving notification." into pi-dev
Makoto Onuki [Tue, 8 May 2018 15:17:18 +0000 (08:17 -0700)]
Merge "Fix "battery saver" notification keeping coming back." into pi-dev
am:
f450a7266b
Change-Id: Ie3d52e44e04737d07efe8f75e04cae1e5f86b400
Beverly [Tue, 8 May 2018 15:16:02 +0000 (11:16 -0400)]
Volume dialog mulit-streams have 8dp padding
Change-Id: I1539580e2d848521638b50c10bd51c18ff415268
Fixes:
79353898
Test: visual inspection with multi-stream and dnd
Makoto Onuki [Tue, 8 May 2018 15:11:57 +0000 (15:11 +0000)]
Merge "Fix "battery saver" notification keeping coming back." into pi-dev
android-build-team Robot [Tue, 8 May 2018 15:11:22 +0000 (08:11 -0700)]
Merge "Adding batterystats history to proto dump." into pi-dev
am:
291b944d89
Change-Id: Ie1766ac31bc048eeba13d540c446372ef56c2da6
Nicolas Geoffray [Tue, 8 May 2018 15:04:30 +0000 (16:04 +0100)]
Add some JobInfo APIs in light grey.
bug:
79258941
Test: m
Change-Id: Ief508c5785482a28ee0262cc168b01d3b632fbfa
Steven Wu [Tue, 8 May 2018 15:03:17 +0000 (11:03 -0400)]
Fixes a NPE in search manager in CTS tests.
Test: atest CtsSliceTestCases
Change-Id: I9e9b3bbcf0dc980e5189293abcee95ff374e309f
Fixes:
76211625
android-build-team Robot [Tue, 8 May 2018 14:58:09 +0000 (14:58 +0000)]
Merge "Adding batterystats history to proto dump." into pi-dev
android-build-team Robot [Tue, 8 May 2018 14:34:57 +0000 (07:34 -0700)]
[automerger skipped] Merge "Store package restriction settings at shutdown" into pi-dev
am:
ae4a20c75b -s ours
Change-Id: Iafb944832459af35cbc1f6df2c7d6a06b3cc51c1
android-build-team Robot [Tue, 8 May 2018 14:22:30 +0000 (14:22 +0000)]
Merge "Store package restriction settings at shutdown" into pi-dev
Beverly [Fri, 4 May 2018 15:21:20 +0000 (11:21 -0400)]
Check if alarm and now times are in schedule
Bug:
77570224
Bug:
79230399
Test: ScheduleCalendarTest
Change-Id: I8452e799189dab0559b49f1e62b18b7106929cd3
Bill Yi [Tue, 8 May 2018 12:50:55 +0000 (05:50 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I463ac2560e83ff4f58c588e7b19986870f55bebd
Remi NGUYEN VAN [Tue, 8 May 2018 09:13:00 +0000 (02:13 -0700)]
Merge "Fix testRegisterUsageCallback" am:
d0b9f983d6
am:
66674ce8fb
Change-Id: If16708b5ce00dc374663e3c3dedd1d96342175f1
Bill Yi [Tue, 8 May 2018 09:04:29 +0000 (02:04 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Icba148a61ddf79c00763628ac9b3c66f64f29cd2
Remi NGUYEN VAN [Tue, 8 May 2018 09:00:59 +0000 (02:00 -0700)]
Merge "Fix testRegisterUsageCallback"
am:
d0b9f983d6
Change-Id: I7ec1e3a05971e8e0448289e3c3f979fd7dcfe144
Bill Yi [Tue, 8 May 2018 08:11:49 +0000 (01:11 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I4c02115eba93fb80a723e0ba82f5ca70a4243488
Remi NGUYEN VAN [Tue, 8 May 2018 07:55:42 +0000 (07:55 +0000)]
Merge "Fix testRegisterUsageCallback"
Winson Chung [Fri, 4 May 2018 01:03:15 +0000 (18:03 -0700)]
Cancel any recents animation whenever a display's stack order changes
- The recents animation holds a reference to the stack that the recents
stack was previously behind (before the animation started) and should be
restored behind after the animation ends. Due to the ordering of events,
it is possible for a call to cancelRecentsAnimation() to come in after
we have started the transition to home
ie.
1) in app A
2) touch down on home button -> start recents animation, home stack
saves A stack as the one to restore behind if animation doesn't
finish
3) touch up to trigger button -> PWM to start home activity and
simultaneously proxies the motion even to launcher which happens to
call cancelRecentsAnimation (as a part of a catch all)
4) PWM start activity -> move home stack to top
5) cancelRecentsAnimation from launcher will try to restore the home
stack behind A, when the rest of the system has already thought
that the home stack was already moved to the front and focused
Instead of depending on any particular ordering of events, we can just
cancel the recents animation (without reordering) whenever the display's
stacks change so as not to affect any upcoming changes. There is only
one stack order changed listener (the recents animation, and there can
only be one animation at a time; the previous animation is always
canceled and unregisters the listener when cleaning up.
- Revert the old workaround for Beta 1 in PWM as it doesn't catch other
cases
- Removed confusing code suggesting that we were using a non-default
display (we are always only ever doing this animation for the default
display since that's where we resolved the target stack).
Bug:
73188263
Test: Was able to repro by artificially calling cancelRecentsAnimation
immediately after starting home (and also by swiping up, holding,
then invoking the home via adb (to trigger start activity) and then
releasing (to trigger cancelRecentsAnimation)). Ensure that case
now works.
Test: atest FrameworksServicesTests:RecentsAnimationTest
Test: atest FrameworksServicesTests:ActivityStackTests
Change-Id: Iec1a29b5bb53737b4be3f1a3719c4e7c26313a11
android-build-team Robot [Tue, 8 May 2018 06:03:51 +0000 (23:03 -0700)]
Merge "AOD padding animation should match slice" into pi-dev
am:
1b5e2d8b3e
Change-Id: I9795fc0a2e780c6b8075ea5f4c5a4d514b1a61b0
android-build-team Robot [Tue, 8 May 2018 05:52:36 +0000 (05:52 +0000)]
Merge "AOD padding animation should match slice" into pi-dev