OSDN Git Service
Andrei Stingaceanu [Tue, 6 Dec 2016 13:20:56 +0000 (13:20 +0000)]
Merge "AutoSize TextView (part 3) - define who supports autosize"
Andrei Stingaceanu [Mon, 28 Nov 2016 15:51:13 +0000 (15:51 +0000)]
AutoSize TextView (part 3) - define who supports autosize
Introduces a new protected hidden method that
specifies if the TextView (or descendant) widget
supports the autosize feature. All direct children of
TextView (besides EditText) support it.
Bug:
33098425
Bug:
32221168
Test: attached in the topic
Change-Id: I6f0092b4c9948afb427fe597b0515a39b1f258f6
Michal Karpinski [Tue, 6 Dec 2016 11:53:53 +0000 (11:53 +0000)]
Merge changes from topic 'netd-benchmark-and-logging-nyc-mr2-dev' into nyc-mr2-dev am:
b97196b1de
am:
41313f60aa
Change-Id: I3741cea61e253aaa15511be1be804469e761f81d
Michal Karpinski [Tue, 6 Dec 2016 11:52:26 +0000 (11:52 +0000)]
DO NOT MERGE Add connect event reporting am:
c429e71cfe
am:
37012db6d0 -s ours
Change-Id: Ia41d506de553869203e4e0c45530f8c62364f2f8
Michal Karpinski [Tue, 6 Dec 2016 11:51:24 +0000 (11:51 +0000)]
DO NOT MERGE Extending DNS event reporting am:
70444d3ad5
am:
bea60201f3 -s ours
Change-Id: Icd67ff044613a33d938f6c21b8a19e95c06c05aa
Michal Karpinski [Tue, 6 Dec 2016 11:42:11 +0000 (11:42 +0000)]
Merge changes from topic 'netd-benchmark-and-logging-nyc-mr2-dev' into nyc-mr2-dev
am:
b97196b1de
Change-Id: Iadfe22122e0d449991c5f0e29f2882dafb6de64f
Michal Karpinski [Tue, 6 Dec 2016 11:41:22 +0000 (11:41 +0000)]
DO NOT MERGE Add connect event reporting
am:
c429e71cfe
Change-Id: I0b81691ceb4d72f448a26e9ac1233a3bc89cc14e
Michal Karpinski [Tue, 6 Dec 2016 11:40:23 +0000 (11:40 +0000)]
DO NOT MERGE Extending DNS event reporting
am:
70444d3ad5
Change-Id: Iaccaa3697f14ef111985c87ecbad3b9af81a0760
Michal Karpinski [Tue, 6 Dec 2016 10:16:32 +0000 (10:16 +0000)]
Merge changes from topic 'netd-benchmark-and-logging-nyc-mr2-dev' into nyc-mr2-dev
* changes:
DO NOT MERGE Add connect event reporting
DO NOT MERGE Extending DNS event reporting
Michal Karpinski [Tue, 6 Dec 2016 09:54:10 +0000 (09:54 +0000)]
Merge "Unhiding network logging API"
Mahaver Chopra [Tue, 6 Dec 2016 09:45:01 +0000 (09:45 +0000)]
Merge "Return error code from isProvisioningAllowed"
TreeHugger Robot [Tue, 6 Dec 2016 06:54:26 +0000 (06:54 +0000)]
Merge "AAPT2: Allow <meta-data> in <manifest>"
Adam Lesinski [Tue, 6 Dec 2016 03:48:20 +0000 (19:48 -0800)]
AAPT2: Allow <meta-data> in <manifest>
Bug:
32171613
Test: libaapt2_tests
Change-Id: I30fdd9475ff7dff6ceb0ff46a4a00991b72db68b
TreeHugger Robot [Tue, 6 Dec 2016 04:52:32 +0000 (04:52 +0000)]
Merge "Prevent orphaning of windows when token is removed"
TreeHugger Robot [Tue, 6 Dec 2016 04:33:43 +0000 (04:33 +0000)]
Merge "Make tests use APKs instead of exploded APKs"
Adam Lesinski [Fri, 11 Nov 2016 00:43:59 +0000 (16:43 -0800)]
Make tests use APKs instead of exploded APKs
Tests would expect parts of the APK to be unzipped and
maintained. Instead, we now decompress the required files
from the test APKs on test setup. This simplifies
test maintenance substantially.
Test: make libandroidfw_tests && libandroidfw_tests --testdata=frameworks/base/libs/androidfw/tests/data
Change-Id: I3d2100af22df913e02401dedcf9842cdb32b2a3b
Ned Burns [Tue, 6 Dec 2016 02:59:22 +0000 (02:59 +0000)]
Merge changes from topic 'am-
0afb48b1e7264a0a939ebf26aaf8e5f0' into nyc-mr2-dev-plus-aosp
am:
f0893b68ad
Change-Id: I0ef786be68587613afeac94a4b59ee23ce66d2bc
Ned Burns [Tue, 6 Dec 2016 02:53:44 +0000 (02:53 +0000)]
Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev am:
3601d3c239 am:
ca8412c316
am:
648a8b1c05
Change-Id: Ic6cd158edec575d52ac2dc34dc874b102d94ec1a
Ned Burns [Tue, 6 Dec 2016 02:52:36 +0000 (02:52 +0000)]
Modify SwipeDismissLayout to perform its own exit animation am:
7d6cb913de am:
081fd25237
am:
94c2bf7bd9
Change-Id: Ib09e3bb0b581598adfb2a336fd6aa9804434e977
Ned Burns [Tue, 6 Dec 2016 02:49:24 +0000 (02:49 +0000)]
Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev am:
3601d3c239 am:
f59d4e0a82
am:
530e236ad6
Change-Id: If15a0b77b72300f58eb7bb0c7fe6f63c82e8c1ba
Ned Burns [Tue, 6 Dec 2016 02:48:01 +0000 (02:48 +0000)]
Modify SwipeDismissLayout to perform its own exit animation am:
7d6cb913de am:
f9566827f2
am:
768f62aac1
Change-Id: Ibe1a8b9a7cf71b715ae7d4e0157b5cdf1d52e81d
Android Build Merger (Role) [Tue, 6 Dec 2016 02:41:56 +0000 (02:41 +0000)]
Merge changes from topic 'am-
0afb48b1e7264a0a939ebf26aaf8e5f0' into nyc-mr2-dev-plus-aosp
* changes:
Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev am:
3601d3c239 am:
ca8412c316
Modify SwipeDismissLayout to perform its own exit animation am:
7d6cb913de am:
081fd25237
Ned Burns [Tue, 6 Dec 2016 02:40:23 +0000 (02:40 +0000)]
Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev am:
3601d3c239
am:
ca8412c316
Change-Id: I7b1eb7a617a5a0820cb4431daedbb9abf5b7777b
Ned Burns [Tue, 6 Dec 2016 02:39:53 +0000 (02:39 +0000)]
Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev am:
3601d3c239
am:
f59d4e0a82
Change-Id: I252049cd012a3ea0b07ea85468d57c193178264b
Ned Burns [Tue, 6 Dec 2016 02:39:03 +0000 (02:39 +0000)]
Modify SwipeDismissLayout to perform its own exit animation am:
7d6cb913de
am:
081fd25237
Change-Id: Id468ea0b13767263eb005bdefac99806fb2211dc
Ned Burns [Tue, 6 Dec 2016 02:38:47 +0000 (02:38 +0000)]
Modify SwipeDismissLayout to perform its own exit animation am:
7d6cb913de
am:
f9566827f2
Change-Id: I157e10afa6b8c0414c2af25d98bf5913928925f2
Michael Kwan [Tue, 6 Dec 2016 02:37:59 +0000 (02:37 +0000)]
Merge "Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev am:
7f2554cfb7 am:
e384a782e0" into nyc-mr2-dev-plus-aosp
am:
56739549fe
Change-Id: I1cbf407213dce91893704cce3abb04a222a16809
Michael Kwan [Tue, 6 Dec 2016 02:37:51 +0000 (02:37 +0000)]
Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev am:
7f2554cfb7 am:
e384a782e0
am:
042c1b8d3c
Change-Id: Iab854a52d63c2dbfe811290c2d8c550cb5bd63ef
Ned Burns [Tue, 6 Dec 2016 02:33:42 +0000 (02:33 +0000)]
Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev
am:
3601d3c239
Change-Id: I06edeb142fe780a80e679d08c0c8bf463737277b
Ned Burns [Tue, 6 Dec 2016 02:33:28 +0000 (02:33 +0000)]
Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev
am:
3601d3c239
Change-Id: I1ec2e39a533dcd6aefc5cd337be1be45b1a75dff
Ned Burns [Tue, 6 Dec 2016 02:33:23 +0000 (02:33 +0000)]
Modify SwipeDismissLayout to perform its own exit animation
am:
7d6cb913de
Change-Id: Ie9784fa9b7c878371f1e12acbb362b36fc66e023
Ned Burns [Tue, 6 Dec 2016 02:33:13 +0000 (02:33 +0000)]
Modify SwipeDismissLayout to perform its own exit animation
am:
7d6cb913de
Change-Id: I17d086e1c24d9eb91a984c45b88f529006465d34
Michael Kwan [Tue, 6 Dec 2016 02:32:33 +0000 (02:32 +0000)]
Merge "Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev am:
7f2554cfb7 am:
615bda5be9" into nyc-mr2-dev-plus-aosp
am:
3a46ce8a89
Change-Id: If1bcc9baef33863b94b51dda7d44d4098f6bcbc3
Michael Kwan [Tue, 6 Dec 2016 02:32:27 +0000 (02:32 +0000)]
Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev am:
7f2554cfb7 am:
615bda5be9
am:
ef62f8a5cd
Change-Id: Ifac12514d2cc5c5ffda172dc22e3870b8680a40a
Michael Kwan [Tue, 6 Dec 2016 02:30:39 +0000 (02:30 +0000)]
Merge "Revert "Change activity dismiss animation to move left to right." am:
ac9443ef9c am:
7b1d53f1f0" into nyc-mr2-dev-plus-aosp
am:
c0c7a9e844
Change-Id: I5f63b7a6d8429a45048ee3c12a94384b77811459
Michael Kwan [Tue, 6 Dec 2016 02:30:30 +0000 (02:30 +0000)]
Revert "Change activity dismiss animation to move left to right." am:
ac9443ef9c am:
7b1d53f1f0
am:
d4b161198e
Change-Id: Id3db50fca8d71c3b2724a68a175b6786a274ab6e
Michael Kwan [Tue, 6 Dec 2016 02:29:20 +0000 (02:29 +0000)]
Revert "Change activity dismiss animation to move left to right." am:
ac9443ef9c am:
e309596c62
am:
ad12efa3d8
Change-Id: I8fd5fda273befd353e8ba4d9d645f953baee401a
Ned Burns [Tue, 6 Dec 2016 02:26:40 +0000 (02:26 +0000)]
Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev
Elliot Waite [Tue, 6 Dec 2016 02:22:45 +0000 (02:22 +0000)]
Merge "Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am:
050cf854c7 am:
5a701867d5 am:
38e1cc9790" into nyc-mr2-dev-plus-aosp
am:
6e9cf8d8fd
Change-Id: I1af9eb203432b2137544598be5ebbe5d34709ab5
Elliot Waite [Tue, 6 Dec 2016 02:22:35 +0000 (02:22 +0000)]
Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am:
050cf854c7 am:
5a701867d5 am:
38e1cc9790
am:
3cf0c7a195
Change-Id: I288c7b7129c62eb86de5c38ecd53271503a2b85a
Elliot Waite [Tue, 6 Dec 2016 02:20:50 +0000 (02:20 +0000)]
Merge "Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am:
050cf854c7 am:
5a701867d5 am:
d41497de6c" into nyc-mr2-dev-plus-aosp
am:
142129854e
Change-Id: Id8fea1bf0acaa53162205dfc586224f17957ffe5
Elliot Waite [Tue, 6 Dec 2016 02:20:40 +0000 (02:20 +0000)]
Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am:
050cf854c7 am:
5a701867d5 am:
d41497de6c
am:
bf7955d10f
Change-Id: Id6fe2ca26131209eeb00905c72b79ded0518c8d0
Android Build Merger (Role) [Tue, 6 Dec 2016 02:19:54 +0000 (02:19 +0000)]
Merge "Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev am:
7f2554cfb7 am:
e384a782e0" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Tue, 6 Dec 2016 02:19:23 +0000 (02:19 +0000)]
Merge "Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev am:
7f2554cfb7 am:
615bda5be9" into nyc-mr2-dev-plus-aosp
Michael Kwan [Tue, 6 Dec 2016 02:19:10 +0000 (02:19 +0000)]
Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev am:
7f2554cfb7
am:
e384a782e0
Change-Id: I439156422ac38856d56276b313459de6fc69d9fb
Elliot Waite [Tue, 6 Dec 2016 02:19:05 +0000 (02:19 +0000)]
Merge "Change insecure HTTP resource link to scheme-relative link. am:
fc175c08cb am:
c67ea5e3ff am:
634f858088" into nyc-mr2-dev-plus-aosp
am:
bc6aff4013
Change-Id: Iee9c6f92fd7cd0853e102c38495e998f3f552200
Elliot Waite [Tue, 6 Dec 2016 02:18:55 +0000 (02:18 +0000)]
Change insecure HTTP resource link to scheme-relative link. am:
fc175c08cb am:
c67ea5e3ff am:
634f858088
am:
80b23f9757
Change-Id: Iaac79c0fa917878d9c701b1a17bc09015f69eac6
Android Build Merger (Role) [Tue, 6 Dec 2016 02:18:49 +0000 (02:18 +0000)]
Merge "Revert "Change activity dismiss animation to move left to right." am:
ac9443ef9c am:
7b1d53f1f0" into nyc-mr2-dev-plus-aosp
Michael Kwan [Tue, 6 Dec 2016 02:18:47 +0000 (02:18 +0000)]
Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev am:
7f2554cfb7
am:
615bda5be9
Change-Id: I75806947ea41931f783b7b1386782c0aed0979be
Elliot Waite [Tue, 6 Dec 2016 02:17:45 +0000 (02:17 +0000)]
Change insecure HTTP resource link to scheme-relative link. am:
fc175c08cb am:
c67ea5e3ff am:
4835467efa
am:
27e3cf2a3f
Change-Id: If718e3a97738bd04a262ad03881a011af43f01f8
Michael Kwan [Tue, 6 Dec 2016 02:17:44 +0000 (02:17 +0000)]
Revert "Change activity dismiss animation to move left to right." am:
ac9443ef9c
am:
e309596c62
Change-Id: I33a123cadaf6e63be680f068b7398934e150c93e
Michael Kwan [Tue, 6 Dec 2016 02:17:42 +0000 (02:17 +0000)]
Revert "Change activity dismiss animation to move left to right." am:
ac9443ef9c
am:
7b1d53f1f0
Change-Id: I052df9a7a5e5cbfed38c8daf9eabbe093c6926d4
Android Build Merger (Role) [Tue, 6 Dec 2016 02:14:08 +0000 (02:14 +0000)]
Merge "Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am:
050cf854c7 am:
5a701867d5 am:
38e1cc9790" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Tue, 6 Dec 2016 02:13:23 +0000 (02:13 +0000)]
Merge "Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am:
050cf854c7 am:
5a701867d5 am:
d41497de6c" into nyc-mr2-dev-plus-aosp
Elliot Waite [Tue, 6 Dec 2016 02:13:23 +0000 (02:13 +0000)]
Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am:
050cf854c7 am:
5a701867d5
am:
38e1cc9790
Change-Id: I878653770a5247cf50e09c16a76f82727a484af2
Android Build Merger (Role) [Tue, 6 Dec 2016 02:12:56 +0000 (02:12 +0000)]
Merge "Change insecure HTTP resource link to scheme-relative link. am:
fc175c08cb am:
c67ea5e3ff am:
634f858088" into nyc-mr2-dev-plus-aosp
Elliot Waite [Tue, 6 Dec 2016 02:12:37 +0000 (02:12 +0000)]
Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am:
050cf854c7 am:
5a701867d5
am:
d41497de6c
Change-Id: Ibd20375c157cb02bcfa8a2785f3042f1fa3f5d1b
Elliot Waite [Tue, 6 Dec 2016 02:12:07 +0000 (02:12 +0000)]
Change insecure HTTP resource link to scheme-relative link. am:
fc175c08cb am:
c67ea5e3ff
am:
634f858088
Change-Id: I61ffb363e67be17675462ea67cb6636a57aeb470
Michael Kwan [Tue, 6 Dec 2016 02:11:46 +0000 (02:11 +0000)]
Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev
am:
7f2554cfb7
Change-Id: I5a0046872debed1da0ed614a9237279cc74e4ace
Michael Kwan [Tue, 6 Dec 2016 02:11:41 +0000 (02:11 +0000)]
Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev
am:
7f2554cfb7
Change-Id: I98f41654b423c85cb940560a8251e67143fc0e82
Michael Kwan [Tue, 6 Dec 2016 02:11:40 +0000 (02:11 +0000)]
Revert "Change activity dismiss animation to move left to right."
am:
ac9443ef9c
Change-Id: Id496825676eb4a8dff75b7c3fe6b5b8df2309465
Michael Kwan [Tue, 6 Dec 2016 02:11:38 +0000 (02:11 +0000)]
Revert "Change activity dismiss animation to move left to right."
am:
ac9443ef9c
Change-Id: I92a48596e4ef5d24591cc063525ad719c24207a8
Elliot Waite [Tue, 6 Dec 2016 02:11:36 +0000 (02:11 +0000)]
Change insecure HTTP resource link to scheme-relative link. am:
fc175c08cb am:
c67ea5e3ff
am:
4835467efa
Change-Id: I9ad9bba2fb2498b39a6ef75de0362c67d11b2c03
Elliot Waite [Tue, 6 Dec 2016 02:06:25 +0000 (02:06 +0000)]
Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am:
050cf854c7
am:
5a701867d5
Change-Id: I2fad5b6fcd04c881ffacf8911d6c179d3af6f72a
Elliot Waite [Tue, 6 Dec 2016 02:06:13 +0000 (02:06 +0000)]
Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am:
050cf854c7
am:
5a701867d5
Change-Id: I7f5b828bd0d68f58c96765be05eb851f45d7677d
Alan Viverette [Tue, 6 Dec 2016 02:05:39 +0000 (02:05 +0000)]
Merge "Show popup transitions when there is no anchor set" into nyc-mr2-dev am:
6ad979a637
am:
2cb81f2559
Change-Id: I40af6e18d906a73de151a48c929c539a8d71ce34
Elliot Waite [Tue, 6 Dec 2016 02:05:14 +0000 (02:05 +0000)]
Change insecure HTTP resource link to scheme-relative link. am:
fc175c08cb
am:
c67ea5e3ff
Change-Id: If9c3962ac88678359e687623fc56cfcd803910bc
Elliot Waite [Tue, 6 Dec 2016 02:05:08 +0000 (02:05 +0000)]
Change insecure HTTP resource link to scheme-relative link. am:
fc175c08cb
am:
c67ea5e3ff
Change-Id: Ia69b611a90b4c72e1cc9aa846ed12e0af685a0f4
TreeHugger Robot [Tue, 6 Dec 2016 02:04:26 +0000 (02:04 +0000)]
Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev
Alan Viverette [Tue, 6 Dec 2016 02:02:07 +0000 (02:02 +0000)]
Show popup transitions when there is no anchor set am:
61edf5bbff
am:
09ce7433e9 -s ours
Change-Id: I56e2ea106d3b39dcd917e826b9bc36cfaebed62c
Elliot Waite [Tue, 6 Dec 2016 01:59:16 +0000 (01:59 +0000)]
Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev
am:
050cf854c7
Change-Id: Ibf58c209a59a7e9dc64976bafb5f4f9bfaa9a840
Elliot Waite [Tue, 6 Dec 2016 01:59:12 +0000 (01:59 +0000)]
Change insecure HTTP resource link to scheme-relative link.
am:
fc175c08cb
Change-Id: Ib5501d311ed6ee620d81b8399334097ea4c432a2
Elliot Waite [Tue, 6 Dec 2016 01:52:08 +0000 (01:52 +0000)]
Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev
Alan Viverette [Tue, 6 Dec 2016 01:07:49 +0000 (01:07 +0000)]
Merge "Show popup transitions when there is no anchor set" into nyc-mr2-dev
am:
6ad979a637
Change-Id: Id630eba9ce140eea6b6f95c4b722d8da4ca09cfe
Alan Viverette [Tue, 6 Dec 2016 01:07:43 +0000 (01:07 +0000)]
Show popup transitions when there is no anchor set
am:
61edf5bbff
Change-Id: If658b86996fbaff411d7c487f913368715026935
Alan Viverette [Tue, 6 Dec 2016 01:02:03 +0000 (01:02 +0000)]
Merge "Show popup transitions when there is no anchor set" into nyc-mr2-dev
Wale Ogunwale [Mon, 5 Dec 2016 19:38:02 +0000 (11:38 -0800)]
Prevent orphaning of windows when token is removed
When the owner of a window token requests window manager to remove the
token, we were removing it from it's parent which orphaned the token
and all it's windows and prevented them from being accessed from calls
like forAllWindows(). This problem wasn't visible before as the token
windows would still be in the window list, so they can still be accessed
for the exit animation transition which eventually removes them.
We no longer remove tokens from their parent we when are asked to remove
them from the system. We just set WindowToken.setExiting() so the token
can be removed once all its windows are removed at the end of the exit
animation.
Also,
- In AppWindowToken.removeIfPossible() and Task.removeIfPossible(), call
removeImmediately() instead of parent.removeChild() to make sure the
token and its windows are properly clean-up and avoid orphaning if they
aren't.
- Added DisplayContent.reParentWindowToken() for changing the display a
window token is on which is different from DisplayContent.removeWindowToken
which prepares the token and it's windows to be removed from the system.
- Renamed WindowToken.explicit to WindowToken.mPersistOnEmpty which is
what it does.
Fixes:
33098800
Test: bit FrameworksServicesTests:com.android.server.wm.WindowTokenTests
Test: Make sure toast windows don't persist on screen.
Change-Id: I40e0e8832141514b614e79d8e95cd27f24e52366
Jeff Sharkey [Tue, 6 Dec 2016 00:42:18 +0000 (00:42 +0000)]
Merge "Initial Binder interface for installd." am:
19fc36fa33 am:
2ab7bff525 am:
48eb4e390e
am:
043c4c575c
Change-Id: I49ba073ba2c955dd3467303bdf9f7ab14eb5ba71
Ned Burns [Fri, 2 Dec 2016 22:25:33 +0000 (17:25 -0500)]
Modify SwipeDismissLayout to perform its own exit animation
Instead of relying on the window animation system, in the special
case of a swipe-dismiss, disable any default window exit animation
and perform a custom animation. This bypasses some bugs in the
window animator codebase and allows us to have a nice "rebound"
animation if the user doesn't swipe far/fast enough to trigger a
dismiss.
Bug:
33041168
Change-Id: Ied45700d35a59950bacef1ba0650eaa5bc60fadb
Jeff Sharkey [Tue, 6 Dec 2016 00:35:44 +0000 (00:35 +0000)]
Merge "Initial Binder interface for installd." am:
19fc36fa33 am:
2ab7bff525
am:
48eb4e390e
Change-Id: I0f8015d3ca80d1f6a806b2ff7b739ea27feddc10
Jeff Sharkey [Tue, 6 Dec 2016 00:29:38 +0000 (00:29 +0000)]
Merge "Initial Binder interface for installd." am:
19fc36fa33
am:
2ab7bff525
Change-Id: I80f56bc8e531fd23ffc95f2f75c84add3f9a34e5
Jeff Sharkey [Tue, 6 Dec 2016 00:23:56 +0000 (00:23 +0000)]
Merge "Initial Binder interface for installd."
am:
19fc36fa33
Change-Id: I22e910b705327eafa5c158ec43d6d86eb0b429d0
TreeHugger Robot [Tue, 6 Dec 2016 00:22:50 +0000 (00:22 +0000)]
Merge "DozeMachine: Improve resilience against out-of-order pulse requests"
Jeff Sharkey [Tue, 6 Dec 2016 00:14:53 +0000 (00:14 +0000)]
Merge "Initial Binder interface for installd."
Adrian Roos [Mon, 5 Dec 2016 23:50:50 +0000 (23:50 +0000)]
Merge "Lockscreen: Restrict double taps to prevent falsing" into nyc-mr2-dev am:
dcb6efcd55
am:
405e0fc79e
Change-Id: I83fad7d1f623d380a3444386e3c839a28f8b2cd1
Adrian Roos [Mon, 5 Dec 2016 23:49:41 +0000 (23:49 +0000)]
Lockscreen: Restrict double taps to prevent falsing am:
ac75cddcf5
am:
923e706576
Change-Id: I2492a3a86d8468a2309a0fddd1deef53876d219a
Adrian Roos [Mon, 5 Dec 2016 23:43:13 +0000 (23:43 +0000)]
Merge "Lockscreen: Restrict double taps to prevent falsing" into nyc-mr2-dev
am:
dcb6efcd55
Change-Id: I5e4b04c054522f7620a0a8e1b37830cf2e3711da
Adrian Roos [Mon, 5 Dec 2016 23:43:05 +0000 (23:43 +0000)]
Lockscreen: Restrict double taps to prevent falsing
am:
ac75cddcf5
Change-Id: I25fe91c23f79d8f54cfa106966dbf4a820dd4c6b
Adrian Roos [Mon, 5 Dec 2016 23:37:46 +0000 (23:37 +0000)]
Merge "Lockscreen: Restrict double taps to prevent falsing" into nyc-mr2-dev
TreeHugger Robot [Mon, 5 Dec 2016 23:23:49 +0000 (23:23 +0000)]
Merge "Fixed Mockito expectation."
Shunta Sato [Mon, 5 Dec 2016 22:55:23 +0000 (22:55 +0000)]
Merge "Avoid NPE around mReusedTask of ActivityStarter" into nyc-mr2-dev am:
53db761efb
am:
cfe760531a
Change-Id: If35c341025e858939eef8424047d2595edfaac44
Shunta Sato [Mon, 5 Dec 2016 22:54:28 +0000 (22:54 +0000)]
Avoid NPE around mReusedTask of ActivityStarter am:
9fff53f2cb
am:
2c174fb0cb
Change-Id: I441f2fe4dac673f3f2fdaa9068a1085b58c0d627
Android Build Merger (Role) [Mon, 5 Dec 2016 22:49:53 +0000 (22:49 +0000)]
Merge "Merge "TwilightService: Ignore (0,0) coordinate location updates" into nyc-mr2-dev am:
b10e339774 am:
ff5ec7fdf6"
Christine Franks [Mon, 5 Dec 2016 22:49:02 +0000 (22:49 +0000)]
Merge "TwilightService: Ignore (0,0) coordinate location updates" into nyc-mr2-dev am:
b10e339774
am:
ff5ec7fdf6
Change-Id: I7e856c017c4f8b8071aa997a78dbeb9e9d81e5f7
Android Build Merger (Role) [Mon, 5 Dec 2016 22:48:38 +0000 (22:48 +0000)]
Merge "TwilightService: Ignore (0,0) coordinate location updates am:
cc2801296d am:
bc0bd475da"
TreeHugger Robot [Mon, 5 Dec 2016 22:48:28 +0000 (22:48 +0000)]
Merge "Add null checks for *Buffer params"
Shunta Sato [Mon, 5 Dec 2016 22:48:06 +0000 (22:48 +0000)]
Merge "Avoid NPE around mReusedTask of ActivityStarter" into nyc-mr2-dev
am:
53db761efb
Change-Id: I33a8ef76a1a9c192889f7f66b32b383986789e04
Shunta Sato [Mon, 5 Dec 2016 22:48:00 +0000 (22:48 +0000)]
Avoid NPE around mReusedTask of ActivityStarter
am:
9fff53f2cb
Change-Id: I3e56af93c3feaf34ac93965127ad7817d609dc11
Christine Franks [Mon, 5 Dec 2016 22:47:58 +0000 (22:47 +0000)]
TwilightService: Ignore (0,0) coordinate location updates am:
cc2801296d
am:
bc0bd475da
Change-Id: I10691fe0ee6b1d788611db17a84a960fa40d3901
Christine Franks [Mon, 5 Dec 2016 22:42:51 +0000 (22:42 +0000)]
Merge "TwilightService: Ignore (0,0) coordinate location updates" into nyc-mr2-dev
am:
b10e339774
Change-Id: Iae529fc5e891ec115379003cbb4d0236448f2f63
OSDN Git Service
