OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev...
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

7 years agoModify SwipeDismissLayout to perform its own exit animation am: 7d6cb913de
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

7 years agoMerge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev
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

7 years agoModify SwipeDismissLayout to perform its own exit animation
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

7 years agoMerge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev
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

7 years agoMerge "Merge "Revert "Change activity dismiss animation to move left to right.""...
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

7 years agoMerge "Merge "Revert "Change activity dismiss animation to move left to right.""...
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

7 years agoMerge "Revert "Change activity dismiss animation to move left to right."" into cw...
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

7 years agoMerge "Revert "Change activity dismiss animation to move left to right." am: ac9443ef...
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

7 years agoMerge "Revert "Change activity dismiss animation to move left to right."" into cw...
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

7 years agoRevert "Change activity dismiss animation to move left to right." am: ac9443ef9c
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

7 years agoRevert "Change activity dismiss animation to move left to right." am: ac9443ef9c
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

7 years agoMerge "Merge "Change insecure HTTP resource link to scheme-relative link." into nyc...
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

7 years agoMerge "Merge "Change insecure HTTP resource link to scheme-relative link." into nyc...
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

7 years agoMerge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1...
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

7 years agoMerge "Change insecure HTTP resource link to scheme-relative link. am: fc175c08cb...
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

7 years agoMerge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1...
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

7 years agoChange insecure HTTP resource link to scheme-relative link. am: fc175c08cb am: c67ea5e3ff
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

7 years agoMerge "Revert "Change activity dismiss animation to move left to right."" into cw...
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

7 years agoMerge "Revert "Change activity dismiss animation to move left to right."" into cw...
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

7 years agoRevert "Change activity dismiss animation to move left to right."
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

7 years agoRevert "Change activity dismiss animation to move left to right."
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

7 years agoChange insecure HTTP resource link to scheme-relative link. am: fc175c08cb am: c67ea5e3ff
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

7 years agoMerge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1...
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

7 years agoMerge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1...
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

7 years agoChange insecure HTTP resource link to scheme-relative link. am: fc175c08cb
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

7 years agoChange insecure HTTP resource link to scheme-relative link. am: fc175c08cb
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

7 years agoMerge "Revert "Change activity dismiss animation to move left to right."" into cw...
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

7 years agoMerge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev
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

7 years agoChange insecure HTTP resource link to scheme-relative link.
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

7 years agoMerge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev
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

7 years agoMerge "Show popup transitions when there is no anchor set" into nyc-mr2-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

7 years agoShow popup transitions when there is no anchor set
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

7 years agoMerge "Show popup transitions when there is no anchor set" into nyc-mr2-dev
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

7 years agoModify SwipeDismissLayout to perform its own exit animation
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

7 years agoMerge "Initial Binder interface for installd." am: 19fc36fa33 am: 2ab7bff525
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

7 years agoMerge "Initial Binder interface for installd." am: 19fc36fa33
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

7 years agoMerge "Initial Binder interface for installd."
Jeff Sharkey [Tue, 6 Dec 2016 00:23:56 +0000 (00:23 +0000)]
Merge "Initial Binder interface for installd."
am: 19fc36fa33

Change-Id: I22e910b705327eafa5c158ec43d6d86eb0b429d0

7 years agoMerge "Initial Binder interface for installd."
Jeff Sharkey [Tue, 6 Dec 2016 00:14:53 +0000 (00:14 +0000)]
Merge "Initial Binder interface for installd."

7 years agoMerge "Lockscreen: Restrict double taps to prevent falsing" into nyc-mr2-dev
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

7 years agoLockscreen: Restrict double taps to prevent falsing
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

7 years agoMerge "Lockscreen: Restrict double taps to prevent falsing" into nyc-mr2-dev
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

7 years agoMerge "Avoid NPE around mReusedTask of ActivityStarter" into nyc-mr2-dev
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

7 years agoAvoid NPE around mReusedTask of ActivityStarter
Shunta Sato [Mon, 5 Dec 2016 22:48:00 +0000 (22:48 +0000)]
Avoid NPE around mReusedTask of ActivityStarter
am: 9fff53f2cb

Change-Id: I3e56af93c3feaf34ac93965127ad7817d609dc11

7 years agoMerge "TwilightService: Ignore (0,0) coordinate location updates" into nyc-mr2-dev
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

7 years agoTwilightService: Ignore (0,0) coordinate location updates
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

7 years agoMerge "Avoid NPE around mReusedTask of ActivityStarter" into nyc-mr2-dev
TreeHugger Robot [Mon, 5 Dec 2016 22:41:19 +0000 (22:41 +0000)]
Merge "Avoid NPE around mReusedTask of ActivityStarter" into nyc-mr2-dev

7 years agoMerge "TwilightService: Ignore (0,0) coordinate location updates" 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

7 years agoMerge "sysui: fix navbar button view orientation" into nyc-mr2-dev
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

7 years agosysui: fix navbar button view orientation
Xiaohui Chen [Mon, 5 Dec 2016 21:31:45 +0000 (21:31 +0000)]
sysui: fix navbar button view orientation
am: 7917006430

Change-Id: I94127b0eba0f0abf47558131218dd21b5a82e089

7 years agoMerge "sysui: fix navbar button view orientation" into nyc-mr2-dev
TreeHugger Robot [Mon, 5 Dec 2016 21:21:58 +0000 (21:21 +0000)]
Merge "sysui: fix navbar button view orientation" into nyc-mr2-dev

7 years agoAvoid NPE around mReusedTask of ActivityStarter
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)

7 years agoMerge "Move dump() to dumpAsync(), more oneway calls." into nyc-mr1-dev-plus-aosp
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

7 years agoMove dump() to dumpAsync(), more oneway calls.
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

7 years agoMerge "Move dump() to dumpAsync(), more oneway calls." into nyc-mr1-dev-plus-aosp
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

7 years agoMerge "Fix vertical nav button direction issue" into nyc-mr2-dev
Xiaohui Chen [Mon, 5 Dec 2016 19:26:01 +0000 (19:26 +0000)]
Merge "Fix vertical nav button direction issue" into nyc-mr2-dev
am: 33db4b77d5

Change-Id: I8222d96f03dbde0d325f5e547974161058a8f831

7 years agoFix vertical nav button direction issue
Xiaohui Chen [Mon, 5 Dec 2016 19:25:54 +0000 (19:25 +0000)]
Fix vertical nav button direction issue
am: 854bc8ea1e

Change-Id: Ic1a9a82c4c2c89a2c89430495b6f751b9e6ba717

7 years agoMerge "Fix vertical nav button direction issue" into nyc-mr2-dev
Xiaohui Chen [Mon, 5 Dec 2016 19:20:16 +0000 (19:20 +0000)]
Merge "Fix vertical nav button direction issue" into nyc-mr2-dev

7 years agoTwilightService: Ignore (0,0) coordinate location updates
Christine Franks [Wed, 30 Nov 2016 17:33:07 +0000 (09:33 -0800)]
TwilightService: Ignore (0,0) coordinate location updates

Location providers may erroneously return (0.0, 0.0) when they
fail to determine the device's location. These location updates
can be safely ignored since the chance of a user actually being
at these coordinates is quite low.

Bug: 31009261
Test: added TwilightServiceTest; both tests pass

Change-Id: Ie9d7d10f81ade9b0be10f98ed74978539efaa658

7 years agoInitial Binder interface for installd.
Jeff Sharkey [Mon, 5 Dec 2016 18:19:28 +0000 (11:19 -0700)]
Initial Binder interface for installd.

Start using new installd Binder interface, with a quick-disable
switch if something breaks.

Test: builds, boots
Bug: 1375896030944031
Change-Id: Ia6e55d49595c96ae928aefc8a6606ee690e58764

7 years agoMerge "Revert "Import translations. DO NOT MERGE"" into nyc-mr2-dev
Bill Yi [Mon, 5 Dec 2016 18:43:14 +0000 (18:43 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into nyc-mr2-dev
am: a1b10fcdb9  -s ours

Change-Id: Ib21612d463f8918a3afea37932a517b555c6690c

7 years agoRevert "Import translations. DO NOT MERGE"
Bill Yi [Mon, 5 Dec 2016 18:43:09 +0000 (18:43 +0000)]
Revert "Import translations. DO NOT MERGE"
am: 05ab7a37a4  -s ours

Change-Id: I7ce400c10d832990993bdebda4317bff2ffe800e

7 years agoMerge "Revert "Import translations. DO NOT MERGE"" into nyc-mr2-dev
Bill Yi [Mon, 5 Dec 2016 18:35:35 +0000 (18:35 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into nyc-mr2-dev

7 years agoRevert "Import translations. DO NOT MERGE"
Bill Yi [Mon, 5 Dec 2016 18:35:00 +0000 (18:35 +0000)]
Revert "Import translations. DO NOT MERGE"

This reverts commit 52ae3289fba02b03b7cb74afad628b9c80253045.

Change-Id: I629775ecf2470e8a16eb58df5cb1e8406865a6ba

7 years agoMerge "To enable scroll function at DatePickerDialog" into nyc-mr2-dev
Kouji Shiotani [Mon, 5 Dec 2016 18:31:20 +0000 (18:31 +0000)]
Merge "To enable scroll function at DatePickerDialog" into nyc-mr2-dev
am: 8c917322a7

Change-Id: I4d5a3afeb1b04f3ea955ed92bad3430d117d27ac

7 years agoTo enable scroll function at DatePickerDialog
Kouji Shiotani [Mon, 5 Dec 2016 18:31:14 +0000 (18:31 +0000)]
To enable scroll function at DatePickerDialog
am: 6b04f11100

Change-Id: I75d4c9ee283d4b76366ab042a50739d788de1764

7 years agoMerge "To enable scroll function at DatePickerDialog" into nyc-mr2-dev
TreeHugger Robot [Mon, 5 Dec 2016 18:23:53 +0000 (18:23 +0000)]
Merge "To enable scroll function at DatePickerDialog" into nyc-mr2-dev

7 years agoMerge "Disable swipe-to-dismiss for not cancelable dialogs. am: f7964be938 am: 912001...
Android Build Merger (Role) [Mon, 5 Dec 2016 18:16:31 +0000 (18:16 +0000)]
Merge "Disable swipe-to-dismiss for not cancelable dialogs. am: f7964be938 am: 9120012566" into nyc-mr2-dev-plus-aosp

7 years agoDisable swipe-to-dismiss for not cancelable dialogs. am: f7964be938
Michael Kwan [Mon, 5 Dec 2016 18:15:44 +0000 (18:15 +0000)]
Disable swipe-to-dismiss for not cancelable dialogs. am: f7964be938
am: 9120012566

Change-Id: Ic56ecf1100d40a5e37bc0cbd4376403948efc0c5

7 years agoDisable swipe-to-dismiss for not cancelable dialogs. am: f7964be938
Michael Kwan [Mon, 5 Dec 2016 18:14:46 +0000 (18:14 +0000)]
Disable swipe-to-dismiss for not cancelable dialogs. am: f7964be938
am: 85ba660b16

Change-Id: Ia85402c3008cfd0a6b876fbda4a7a753c23d8a88

7 years agoDisable swipe-to-dismiss for not cancelable dialogs.
Michael Kwan [Mon, 5 Dec 2016 18:09:10 +0000 (18:09 +0000)]
Disable swipe-to-dismiss for not cancelable dialogs.
am: f7964be938

Change-Id: I6d71bb4c6acdc9d994766eebd7a6320356aa3a23

7 years agoDisable swipe-to-dismiss for not cancelable dialogs.
Michael Kwan [Mon, 5 Dec 2016 18:09:07 +0000 (18:09 +0000)]
Disable swipe-to-dismiss for not cancelable dialogs.
am: f7964be938

Change-Id: I4a6cad65f91368393272cd8f7d6012d131ec56ff

7 years agoMerge "[AWARE] Fix javadocs for match filter update" am: 7241d28826 am: 65617f21bf
Etan Cohen [Mon, 5 Dec 2016 16:08:11 +0000 (16:08 +0000)]
Merge "[AWARE] Fix javadocs for match filter update" am: 7241d28826 am: 65617f21bf
am: 4c43aba36e

Change-Id: I0a094416e0eaa1b09ec964cba3ec889ccca35eb6

7 years agoMerge "[AWARE] Fix javadocs for match filter update" am: 7241d28826
Etan Cohen [Mon, 5 Dec 2016 16:03:44 +0000 (16:03 +0000)]
Merge "[AWARE] Fix javadocs for match filter update" am: 7241d28826
am: 65617f21bf

Change-Id: I8428c743bf607a096674aa84cb8eda1929b55d84

7 years agoMerge "[AWARE] Fix javadocs for match filter update"
Etan Cohen [Mon, 5 Dec 2016 15:57:37 +0000 (15:57 +0000)]
Merge "[AWARE] Fix javadocs for match filter update"
am: 7241d28826

Change-Id: I67b2798b0eb1bc7e4ccd727aad9e761da49a8823

7 years agoMerge "Introduce a new user restriction for disallowing Bluetooth." am: 5fb37a7641...
ltrochtova [Mon, 5 Dec 2016 15:57:33 +0000 (15:57 +0000)]
Merge "Introduce a new user restriction for disallowing Bluetooth." am: 5fb37a7641  -s ours am: 8058dc0e82  -s ours
am: ad5eb744aa  -s ours

Change-Id: I2468b18021198c8b1a7dfa739d28ec1aaafba9b1

7 years agoShow popup transitions when there is no anchor set
Alan Viverette [Mon, 5 Dec 2016 15:56:18 +0000 (10:56 -0500)]
Show popup transitions when there is no anchor set

Allow anchorRoot to be null when starting exit transition. Pushes
epicenter callback creation into startExitTransition. Adds nullability
annotations.

Bug: 33035511
Test: PopupWindowTest#testEnterExitTransition
Change-Id: Ie752a0d6b29d5eb11c160771d8a78fa6234de5bb

7 years agoMerge "[AWARE] Fix javadocs for match filter update"
Etan Cohen [Mon, 5 Dec 2016 15:51:17 +0000 (15:51 +0000)]
Merge "[AWARE] Fix javadocs for match filter update"

7 years agoMerge "Introduce a new user restriction for disallowing Bluetooth." am: 5fb37a7641...
ltrochtova [Mon, 5 Dec 2016 15:51:10 +0000 (15:51 +0000)]
Merge "Introduce a new user restriction for disallowing Bluetooth." am: 5fb37a7641  -s ours
am: 8058dc0e82  -s ours

Change-Id: I1d84e927e8cd05c51285fba9226b1bd9f2c1c12a

7 years agoMerge "Introduce a new user restriction for disallowing Bluetooth."
ltrochtova [Mon, 5 Dec 2016 15:44:06 +0000 (15:44 +0000)]
Merge "Introduce a new user restriction for disallowing Bluetooth."
am: 5fb37a7641  -s ours

Change-Id: Ib4a1173b40701562fc41738319371e126eba6c04

7 years agoIntroduce a new user restriction for disallowing Bluetooth. am: 13a0519394
Lenka Trochtova [Mon, 5 Dec 2016 15:44:01 +0000 (15:44 +0000)]
Introduce a new user restriction for disallowing Bluetooth. am: 13a0519394
am: 3e149d59f9

Change-Id: I2622c1f9a92ff7784787885859c4b5a7cf974964

7 years agoIntroduce a new user restriction for disallowing Bluetooth.
Lenka Trochtova [Mon, 5 Dec 2016 15:37:34 +0000 (15:37 +0000)]
Introduce a new user restriction for disallowing Bluetooth.
am: 13a0519394

Change-Id: I3d875e1a7baf69022d58902689fa9370bcb44dc6

7 years agoMerge "Introduce a new user restriction for disallowing Bluetooth."
ltrochtova [Mon, 5 Dec 2016 15:35:21 +0000 (15:35 +0000)]
Merge "Introduce a new user restriction for disallowing Bluetooth."

7 years agoIntroduce a new user restriction for disallowing Bluetooth.
Lenka Trochtova [Fri, 2 Dec 2016 11:19:39 +0000 (12:19 +0100)]
Introduce a new user restriction for disallowing Bluetooth.

Only the device owner will be able to set the restriction
and the restriction will prevent usage of Bluetooth on the
entire device - i.e. in all the users.

Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.UserRestrictionsTest
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction

Bug: 32895300

Merged-In: I2875cf178cb16eca1965d0ba965d1cd3d8db2ad5

Change-Id: I2875cf178cb16eca1965d0ba965d1cd3d8db2ad5

7 years agoIntroduce a new user restriction for disallowing Bluetooth.
Lenka Trochtova [Fri, 2 Dec 2016 11:19:39 +0000 (12:19 +0100)]
Introduce a new user restriction for disallowing Bluetooth.

Only the device owner will be able to set the restriction
and the restriction will prevent usage of Bluetooth on the
entire device - i.e. in all the users.

Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.UserRestrictionsTest
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction

Bug: 32895300

Merged-In: I2875cf178cb16eca1965d0ba965d1cd3d8db2ad5

Change-Id: I2875cf178cb16eca1965d0ba965d1cd3d8db2ad5

7 years agoMerge "Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64" am...
Tobias Thierer [Mon, 5 Dec 2016 09:46:21 +0000 (09:46 +0000)]
Merge "Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64" am: 1e498a96c1 am: 6e2d3fa82f
am: 386ba42ec5

Change-Id: I0b0e8139cc084fbdf9918dd700d9be337e0c47df

7 years agoMerge "Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64" am...
Tobias Thierer [Mon, 5 Dec 2016 09:39:55 +0000 (09:39 +0000)]
Merge "Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64" am: 1e498a96c1
am: 6e2d3fa82f

Change-Id: I925b0ca87bbd0f3be3f03865f70cafaaa1ef25ba

7 years agoMerge "Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64"
Tobias Thierer [Mon, 5 Dec 2016 09:35:10 +0000 (09:35 +0000)]
Merge "Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64"
am: 1e498a96c1

Change-Id: I28b8deadc9386b8772bd94870809213fdddad7e6

7 years agoMerge "Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64"
Tobias Thierer [Mon, 5 Dec 2016 09:28:46 +0000 (09:28 +0000)]
Merge "Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64"

7 years agoMerge "ExifInterface: fix NegativeArraySizeException" am: c57b472d67 am: 582e612fdc
Sungsoo Lim [Mon, 5 Dec 2016 04:54:35 +0000 (04:54 +0000)]
Merge "ExifInterface: fix NegativeArraySizeException" am: c57b472d67 am: 582e612fdc
am: 52dd278eb3

Change-Id: I511eb25ec5124d989889fcf9da33a167eed63bcd

7 years agoMerge "ExifInterface: fix NegativeArraySizeException" am: c57b472d67
Sungsoo Lim [Mon, 5 Dec 2016 04:47:33 +0000 (04:47 +0000)]
Merge "ExifInterface: fix NegativeArraySizeException" am: c57b472d67
am: 582e612fdc

Change-Id: I671ef98f05431e7c4baa2a7b84f6cb04a82c5d9d

7 years agoMerge "ExifInterface: fix NegativeArraySizeException"
Sungsoo Lim [Mon, 5 Dec 2016 04:41:30 +0000 (04:41 +0000)]
Merge "ExifInterface: fix NegativeArraySizeException"
am: c57b472d67

Change-Id: Ifbe9af9b62837923e6e56159759da6c59795b3aa

7 years agoMerge "ExifInterface: fix NegativeArraySizeException"
Sungsoo Lim [Mon, 5 Dec 2016 04:35:17 +0000 (04:35 +0000)]
Merge "ExifInterface: fix NegativeArraySizeException"

7 years agoMerge "Use IBase instead of IBinder for IServiceManager." am: 8ead2f0c9a am: dab9e7bfc7
Yifan Hong [Sat, 3 Dec 2016 23:22:40 +0000 (23:22 +0000)]
Merge "Use IBase instead of IBinder for IServiceManager." am: 8ead2f0c9a am: dab9e7bfc7
am: bc9c711513

Change-Id: I6047e1d936ef515d531a8ad4b875ab443ff2f50d

7 years agoMerge "Use IBase instead of IBinder for IServiceManager." am: 8ead2f0c9a
Yifan Hong [Sat, 3 Dec 2016 23:15:52 +0000 (23:15 +0000)]
Merge "Use IBase instead of IBinder for IServiceManager." am: 8ead2f0c9a
am: dab9e7bfc7

Change-Id: I8c39d01e0670d200c18ba02dbd3d09cea5a503c7

7 years agoMerge "Use IBase instead of IBinder for IServiceManager."
Yifan Hong [Sat, 3 Dec 2016 23:10:08 +0000 (23:10 +0000)]
Merge "Use IBase instead of IBinder for IServiceManager."
am: 8ead2f0c9a

Change-Id: Ia18426c336f1ba9c9bceb57db0222ba6c59667a9

7 years agoMerge "Use IBase instead of IBinder for IServiceManager."
Treehugger Robot [Sat, 3 Dec 2016 23:04:24 +0000 (23:04 +0000)]
Merge "Use IBase instead of IBinder for IServiceManager."

7 years agoRevert "Change activity dismiss animation to move left to right."
Michael Kwan [Sat, 3 Dec 2016 19:33:27 +0000 (11:33 -0800)]
Revert "Change activity dismiss animation to move left to right."

This reverts commit 6d969ea4d86918ce8e2e3fb6618527c55f0c05da.

Change-Id: I39ab1bc00d20b6a719ac0930e5596e14fd8345b7

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 3 Dec 2016 09:59:20 +0000 (09:59 +0000)]
Import translations. DO NOT MERGE
am: 52ae3289fb  -s ours

Change-Id: I77c441b5116ab1dc8d9236cdb38bf776afaa88e4

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 3 Dec 2016 08:20:58 +0000 (00:20 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ifb7cde4b8e869f98f49a2fb0270bc9cd30ed7b0d
Auto-generated-cl: translation import