OSDN Git Service
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
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: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
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
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
Christine Franks [Mon, 5 Dec 2016 22:42:45 +0000 (22:42 +0000)]
TwilightService: Ignore (0,0) coordinate location updates
am:
cc2801296d
Change-Id: Ic74955ff78956953288de96d261dc1eab8fc6137
TreeHugger Robot [Mon, 5 Dec 2016 22:41:19 +0000 (22:41 +0000)]
Merge "Avoid NPE around mReusedTask of ActivityStarter" into nyc-mr2-dev
Christine Franks [Mon, 5 Dec 2016 22:38:10 +0000 (22:38 +0000)]
Merge "TwilightService: Ignore (0,0) coordinate location updates" into nyc-mr2-dev
TreeHugger Robot [Mon, 5 Dec 2016 22:37:08 +0000 (22:37 +0000)]
Merge "Fix monkey NPE"
TreeHugger Robot [Mon, 5 Dec 2016 22:23:52 +0000 (22:23 +0000)]
Merge "Fixes recents from expanding full size when an app is docked"
Adrian Roos [Fri, 2 Dec 2016 17:01:09 +0000 (09:01 -0800)]
DozeMachine: Improve resilience against out-of-order pulse requests
Fixes a class of bugs that arise from requesting to pulse at
inopportune times. Also improves logging such that we know what
state transition failed to validate.
Test: runtest -x frameworks/base/packages/SystemUI/tests/src/com/android/systemui/doze/DozeMachineTest.java
Change-Id: If0bbe003c4805fd180d013dadbc28addc5bb0dd4
Fixes:
32869355
TreeHugger Robot [Mon, 5 Dec 2016 21:55:05 +0000 (21:55 +0000)]
Merge "Correct the string resource for tooltip_popup_title"
Felipe Leme [Mon, 5 Dec 2016 21:41:43 +0000 (13:41 -0800)]
Fixed Mockito expectation.
Bug:
33349775
Test: most tests from NetworkPolicyManagerServiceTest passes (there are still
3 failures, but they're unrelated).
Change-Id: I291a2d8404ba540d9922e5de62f5224d2d9b9314
Xiaohui Chen [Mon, 5 Dec 2016 21:41:35 +0000 (21:41 +0000)]
Merge "sysui: fix navbar button view orientation" into nyc-mr2-dev am:
4eaf8c2d9b
am:
472e287812 -s ours
Change-Id: I06212be8ae14836aa6082f755ef693233bb3eb56
TreeHugger Robot [Mon, 5 Dec 2016 21:39:59 +0000 (21:39 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
Xiaohui Chen [Mon, 5 Dec 2016 21:37:51 +0000 (21:37 +0000)]
sysui: fix navbar button view orientation am:
7917006430
am:
fe4413b214 -s ours
Change-Id: Ia7c0d2e2f64507c8d84fdab7373d26295f8483b2
Xiaohui Chen [Mon, 5 Dec 2016 21:35:15 +0000 (21:35 +0000)]
Merge "sysui: fix navbar button view orientation" into nyc-mr2-dev
am:
4eaf8c2d9b
Change-Id: I442ff67a71fef2f9fe65c8c7f966259b6c85b495
Xiaohui Chen [Mon, 5 Dec 2016 21:31:45 +0000 (21:31 +0000)]
sysui: fix navbar button view orientation
am:
7917006430
Change-Id: I94127b0eba0f0abf47558131218dd21b5a82e089
TreeHugger Robot [Mon, 5 Dec 2016 21:21:58 +0000 (21:21 +0000)]
Merge "sysui: fix navbar button view orientation" into nyc-mr2-dev
Jeff Sharkey [Mon, 5 Dec 2016 21:19:15 +0000 (21:19 +0000)]
Merge "Move dump() to dumpAsync(), more oneway calls." into nyc-mr1-dev-plus-aosp am:
5e2155058d
am:
173e689099
Change-Id: I3df7c60af177c378f142514158f84c9430cf4168
Jeff Sharkey [Mon, 5 Dec 2016 21:18:02 +0000 (21:18 +0000)]
Move dump() to dumpAsync(), more oneway calls. am:
c06f184ae9
am:
a909053664 -s ours
Change-Id: Ibd2d476fc502891a2687fcae55fe7d8cdc8f43fc
TreeHugger Robot [Mon, 5 Dec 2016 21:03:01 +0000 (21:03 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
TreeHugger Robot [Mon, 5 Dec 2016 21:01:30 +0000 (21:01 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
Shunta Sato [Wed, 12 Oct 2016 09:35:17 +0000 (18:35 +0900)]
Avoid NPE around mReusedTask of ActivityStarter
Symptom:
System crash by NPE is observed on ActivityStarter
during phone boot-up.
Detail and sample:
ActivityStarter has possibility to be called itself recursively
by calling TaskRecord$performClearTaskLocked().
Then class variable of mReusedTask is initialized to null
after the call, because the recursive call isn't guarded by
synchronized block.
Then NPE crash occurs on next statement.
Solutions:
Call performClearTaskLocked() before assigning
intentActivity.task to mReusedTask.
Bug:
32361138
Test: builds, boots, Manual testing of condition in bug
Author: Shigeki Yokomichi <shigeki.x.yokomichi@sonymobile.com>
Change-Id: Iaea3e066a6f7134fcae4338ff864bb236241194c
(cherry picked from commit
0bd28e2c5f7fd7e4448ae489b425e4e5cee57f9a)
TreeHugger Robot [Mon, 5 Dec 2016 20:54:31 +0000 (20:54 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
TreeHugger Robot [Mon, 5 Dec 2016 20:52:47 +0000 (20:52 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
TreeHugger Robot [Mon, 5 Dec 2016 20:51:58 +0000 (20:51 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
Jeff Sharkey [Mon, 5 Dec 2016 20:51:57 +0000 (20:51 +0000)]
Merge "Move dump() to dumpAsync(), more oneway calls." into nyc-mr1-dev-plus-aosp
am:
5e2155058d
Change-Id: Ia18426e76a62315071cca3a5deb6cd44578f5314
Jeff Sharkey [Mon, 5 Dec 2016 20:51:52 +0000 (20:51 +0000)]
Move dump() to dumpAsync(), more oneway calls.
am:
c06f184ae9
Change-Id: I1f060cb7e20c732e7c6da412e2e9fb7335011ec8
Matthew Ng [Mon, 5 Dec 2016 19:39:23 +0000 (11:39 -0800)]
Fixes recents from expanding full size when an app is docked
This is a bug as a result from change ag/
1635318 where the
recents/overview area expands to full size when tapped after docking an
app by dragging it to the top. As a result it would expand to full size
and show behind the docked stack.
Fixes:
33335322
Test: ./run-test android.server.cts and ran manual use case from bug
Change-Id: Icf3443631fc3f1c3407d5fd23db077e47ba81110
TreeHugger Robot [Mon, 5 Dec 2016 20:46:27 +0000 (20:46 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
TreeHugger Robot [Mon, 5 Dec 2016 20:44:56 +0000 (20:44 +0000)]
Merge "Move dump() to dumpAsync(), more oneway calls." into nyc-mr1-dev-plus-aosp
TreeHugger Robot [Mon, 5 Dec 2016 20:42:39 +0000 (20:42 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
TreeHugger Robot [Mon, 5 Dec 2016 20:39:31 +0000 (20:39 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
OSDN Git Service
