OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074...
Android Build Merger (Role) [Thu, 6 Jul 2017 18:54:17 +0000 (18:54 +0000)]
Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp am: b91a596c9b" into oc-dr1-dev-plus-aosp

7 years agoMerge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074...
Android Build Merger (Role) [Thu, 6 Jul 2017 18:53:36 +0000 (18:53 +0000)]
Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 7e97085ee7" into oc-dev-plus-aosp am: 60ec77baf9" into oc-dr1-dev-plus-aosp

7 years agoMerge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into...
Hall Liu [Thu, 6 Jul 2017 18:53:16 +0000 (18:53 +0000)]
Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp
am: b91a596c9b

Change-Id: I6771283cdf4e8bd9f7644a325a31a6ea6fe76001

7 years agoMerge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into...
Hall Liu [Thu, 6 Jul 2017 18:52:04 +0000 (18:52 +0000)]
Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 7e97085ee7" into oc-dev-plus-aosp
am: 60ec77baf9

Change-Id: I7b838c599027ae365b92fd2fe06f2ef3e9599117

7 years agoMerge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074...
Android Build Merger (Role) [Thu, 6 Jul 2017 18:51:30 +0000 (18:51 +0000)]
Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp am: b91a596c9b" into oc-dr1-dev-plus-aosp

7 years agoMerge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into...
Hall Liu [Thu, 6 Jul 2017 18:49:59 +0000 (18:49 +0000)]
Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp
am: b91a596c9b

Change-Id: I7b21ffc84d7c53ae68ae3ca61b3bcca107df141d

7 years agoMerge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074...
Android Build Merger (Role) [Thu, 6 Jul 2017 18:49:29 +0000 (18:49 +0000)]
Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp am: af3c9615f1" into oc-dr1-dev-plus-aosp

7 years agoMerge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc...
Android Build Merger (Role) [Thu, 6 Jul 2017 18:48:03 +0000 (18:48 +0000)]
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev am: f259a1975b" into oc-dr1-dev-plus-aosp

7 years agoMerge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into...
Hall Liu [Thu, 6 Jul 2017 18:47:57 +0000 (18:47 +0000)]
Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp
am: af3c9615f1

Change-Id: If16e4a6da97e2ee70f2a2ca8444fa24fa9210bf1

7 years agoMerge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev
Hiroki Yamamoto [Thu, 6 Jul 2017 18:47:09 +0000 (18:47 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev
am: f259a1975b

Change-Id: Ie16f4282d3881bc7f306d55aacc7c9f0585a1be0

7 years agoMerge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev
Hiroki Yamamoto [Thu, 6 Jul 2017 18:46:41 +0000 (18:46 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev
am: f259a1975b

Change-Id: I89bc4bb9469a1bd316eabe22abaf7ee2c10fc02c

7 years agoMerge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into...
Android Build Merger (Role) [Thu, 6 Jul 2017 18:42:05 +0000 (18:42 +0000)]
Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 7e97085ee7" into oc-dev-plus-aosp

7 years agoMerge "Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage...
Fyodor Kupolov [Thu, 6 Jul 2017 18:41:48 +0000 (18:41 +0000)]
Merge "Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master am: 785ab04d7a" into oc-dev-plus-aosp
am: d6bb9401eb

Change-Id: Ie879dcf1b443563f5e3e55e15eb0dca8670d325d

7 years agoMerge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage...
Hall Liu [Thu, 6 Jul 2017 18:40:45 +0000 (18:40 +0000)]
Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master
am: 7e97085ee7

Change-Id: If496a76fc79f0f402e8a0c509f1d370903ab535a

7 years agoMerge "Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage...
Fyodor Kupolov [Thu, 6 Jul 2017 18:40:20 +0000 (18:40 +0000)]
Merge "Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master am: 785ab04d7a" into oc-dev-plus-aosp
am: f035f800b7

Change-Id: I4cd47fea5a6e32d166295374ce3e5a898fe57110

7 years agoMerge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into...
Android Build Merger (Role) [Thu, 6 Jul 2017 18:39:03 +0000 (18:39 +0000)]
Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp

7 years agoMerge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27 am: 481d92c517...
Fyodor Kupolov [Thu, 6 Jul 2017 18:38:57 +0000 (18:38 +0000)]
Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27 am: 481d92c517" into oc-dev-plus-aosp
am: 6c6b3820f7

Change-Id: Ic03a469684e57e6c703d55cef69bedd6eabd1664

7 years agoMerge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into...
Android Build Merger (Role) [Thu, 6 Jul 2017 18:38:02 +0000 (18:38 +0000)]
Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp

7 years agoMerge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage...
Hall Liu [Thu, 6 Jul 2017 18:37:59 +0000 (18:37 +0000)]
Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master
am: 4c3be35123

Change-Id: I7a352def470a54916129fb9fc90239658847a02f

7 years agoMerge "Fix ContentObserver unregister issue" am: 09b6988e27 am: 481d92c517
Fyodor Kupolov [Thu, 6 Jul 2017 18:37:34 +0000 (18:37 +0000)]
Merge "Fix ContentObserver unregister issue" am: 09b6988e27 am: 481d92c517
am: aee5787b48

Change-Id: I6cbd47b7158d5ccd207c0ce57ca613ebc7822b5f

7 years agoMerge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage...
Hall Liu [Thu, 6 Jul 2017 18:36:42 +0000 (18:36 +0000)]
Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master
am: 4c3be35123

Change-Id: I3fe46bf58306211ca49557a8fc2131caf902b2cf

7 years agoMerge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 18:35:25 +0000 (18:35 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev

7 years agoMerge "Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage...
Android Build Merger (Role) [Thu, 6 Jul 2017 18:33:42 +0000 (18:33 +0000)]
Merge "Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master am: 785ab04d7a" into oc-dev-plus-aosp

7 years agoMerge "Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage...
Android Build Merger (Role) [Thu, 6 Jul 2017 18:33:32 +0000 (18:33 +0000)]
Merge "Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master am: 785ab04d7a" into oc-dev-plus-aosp

7 years agoMerge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp...
Fyodor Kupolov [Thu, 6 Jul 2017 18:32:42 +0000 (18:32 +0000)]
Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master
am: 785ab04d7a

Change-Id: I3f75c0bd9928013ce04b86a93e16f43eacb3a588

7 years agoMerge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp...
Fyodor Kupolov [Thu, 6 Jul 2017 18:32:37 +0000 (18:32 +0000)]
Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master
am: 785ab04d7a

Change-Id: I63d56be90cdf022d01fa2bf4b79d228f48e19eb1

7 years agoMerge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27 am: 481d92c517...
Android Build Merger (Role) [Thu, 6 Jul 2017 18:32:12 +0000 (18:32 +0000)]
Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27 am: 481d92c517" into oc-dev-plus-aosp

7 years agoMerge "Fix ContentObserver unregister issue" am: 09b6988e27
Fyodor Kupolov [Thu, 6 Jul 2017 18:31:14 +0000 (18:31 +0000)]
Merge "Fix ContentObserver unregister issue" am: 09b6988e27
am: 481d92c517

Change-Id: Icad1a472602443fe5a4931cf6181411e15b4c68f

7 years agoMerge "Fix ContentObserver unregister issue" am: 09b6988e27
Fyodor Kupolov [Thu, 6 Jul 2017 18:30:44 +0000 (18:30 +0000)]
Merge "Fix ContentObserver unregister issue" am: 09b6988e27
am: 481d92c517

Change-Id: I2f6cfe7465a9816815172db2fb3defa8f49bdd31

7 years agoMerge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage...
Android Build Merger (Role) [Thu, 6 Jul 2017 18:26:39 +0000 (18:26 +0000)]
Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master

7 years agoMerge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage...
Android Build Merger (Role) [Thu, 6 Jul 2017 18:25:41 +0000 (18:25 +0000)]
Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master

7 years agoMerge "Add a reason arg to streamStateUpdated"
Hall Liu [Thu, 6 Jul 2017 18:24:49 +0000 (18:24 +0000)]
Merge "Add a reason arg to streamStateUpdated"
am: 6ba3829074

Change-Id: Ied8d6168fc625600c865c1980bb82da0f919e02b

7 years agoMerge "Add a reason arg to streamStateUpdated"
Hall Liu [Thu, 6 Jul 2017 18:24:02 +0000 (18:24 +0000)]
Merge "Add a reason arg to streamStateUpdated"
am: 6ba3829074

Change-Id: I0c05734f18d58d7693d8777a4d1bb7950a5f54af

7 years agoMerge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp...
Android Build Merger (Role) [Thu, 6 Jul 2017 18:23:57 +0000 (18:23 +0000)]
Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master

7 years agoMerge "Fix ContentObserver unregister issue"
Fyodor Kupolov [Thu, 6 Jul 2017 18:22:49 +0000 (18:22 +0000)]
Merge "Fix ContentObserver unregister issue"
am: 09b6988e27

Change-Id: Ia9573b2cb453d3ff493a691675bee0f5dfc44396

7 years agoMerge "Fix ContentObserver unregister issue"
Fyodor Kupolov [Thu, 6 Jul 2017 18:21:54 +0000 (18:21 +0000)]
Merge "Fix ContentObserver unregister issue"
am: 09b6988e27

Change-Id: I242e87b53f603a05ba7c4069662456457a3d980a

7 years agoMerge "Merge "Password field colors" into oc-dr1-dev am: e21a151fe7" into oc-dr1...
Android Build Merger (Role) [Thu, 6 Jul 2017 18:08:32 +0000 (18:08 +0000)]
Merge "Merge "Password field colors" into oc-dr1-dev am: e21a151fe7" into oc-dr1-dev-plus-aosp

7 years agoMerge "Add a reason arg to streamStateUpdated"
Hall Liu [Thu, 6 Jul 2017 18:08:02 +0000 (18:08 +0000)]
Merge "Add a reason arg to streamStateUpdated"

7 years agoMerge "Password field colors" into oc-dr1-dev
Lucas Dupin [Thu, 6 Jul 2017 18:07:42 +0000 (18:07 +0000)]
Merge "Password field colors" into oc-dr1-dev
am: e21a151fe7

Change-Id: I1b0ba8bb0cfcc5a5b7002242f134873682decf7b

7 years agoMerge "Password field colors" into oc-dr1-dev
Lucas Dupin [Thu, 6 Jul 2017 18:07:09 +0000 (18:07 +0000)]
Merge "Password field colors" into oc-dr1-dev
am: e21a151fe7

Change-Id: I71a11428363e20474f7bed44da68bd01e39fb3de

7 years agoMerge "Fix ContentObserver unregister issue"
Fyodor Kupolov [Thu, 6 Jul 2017 18:07:04 +0000 (18:07 +0000)]
Merge "Fix ContentObserver unregister issue"

7 years agoMerge "Merge "AOD: Skip window animations while dozing" into oc-dr1-dev am: 92b6b7090...
Android Build Merger (Role) [Thu, 6 Jul 2017 18:04:09 +0000 (18:04 +0000)]
Merge "Merge "AOD: Skip window animations while dozing" into oc-dr1-dev am: 92b6b7090c" into oc-dr1-dev-plus-aosp

7 years agoMerge "AOD: Skip window animations while dozing" into oc-dr1-dev
Adrian Roos [Thu, 6 Jul 2017 18:03:11 +0000 (18:03 +0000)]
Merge "AOD: Skip window animations while dozing" into oc-dr1-dev
am: 92b6b7090c

Change-Id: If0fc6ed0c95587114df1e7f8950fb0df99812ae2

7 years agoMerge "Password field colors" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 18:02:47 +0000 (18:02 +0000)]
Merge "Password field colors" into oc-dr1-dev

7 years agoMerge "AOD: Skip window animations while dozing" into oc-dr1-dev
Adrian Roos [Thu, 6 Jul 2017 18:02:30 +0000 (18:02 +0000)]
Merge "AOD: Skip window animations while dozing" into oc-dr1-dev
am: 92b6b7090c

Change-Id: I834761678ad26b66ac3e3b93a1398d9fce5e0f6c

7 years agoMerge "AOD: Skip window animations while dozing" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 17:53:24 +0000 (17:53 +0000)]
Merge "AOD: Skip window animations while dozing" into oc-dr1-dev

7 years agoMerge "Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev am...
Android Build Merger (Role) [Thu, 6 Jul 2017 17:18:55 +0000 (17:18 +0000)]
Merge "Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev am: 25937550af" into oc-dr1-dev-plus-aosp

7 years agoMerge "Change visibility on formatPercentage(double)." into oc-dr1-dev
Daniel Nishi [Thu, 6 Jul 2017 17:17:11 +0000 (17:17 +0000)]
Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev
am: 25937550af

Change-Id: If4b01fcf9e984546f9242446dcb3d02efe4725af

7 years agoMerge "Change visibility on formatPercentage(double)." into oc-dr1-dev
Daniel Nishi [Thu, 6 Jul 2017 17:15:24 +0000 (17:15 +0000)]
Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev
am: 25937550af

Change-Id: I53435cc58c29fd72cecca91e730cbfd745c35ef6

7 years agoMerge "Merge "Broadcast only if boot complete" into oc-dr1-dev am: b60c48a6a2" into...
Android Build Merger (Role) [Thu, 6 Jul 2017 17:12:04 +0000 (17:12 +0000)]
Merge "Merge "Broadcast only if boot complete" into oc-dr1-dev am: b60c48a6a2" into oc-dr1-dev-plus-aosp

7 years agoMerge "Broadcast only if boot complete" into oc-dr1-dev
Jerry Zhang [Thu, 6 Jul 2017 17:10:55 +0000 (17:10 +0000)]
Merge "Broadcast only if boot complete" into oc-dr1-dev
am: b60c48a6a2

Change-Id: I53d2958b56ee6b48457741268e8578dc3316091c

7 years agoMerge "Broadcast only if boot complete" into oc-dr1-dev
Jerry Zhang [Thu, 6 Jul 2017 17:10:40 +0000 (17:10 +0000)]
Merge "Broadcast only if boot complete" into oc-dr1-dev
am: b60c48a6a2

Change-Id: I99f2ec3d45fa69be68aa52aa769929645f8432cf

7 years agoMerge "Change visibility on formatPercentage(double)." into oc-dr1-dev
Daniel Nishi [Thu, 6 Jul 2017 17:04:59 +0000 (17:04 +0000)]
Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev

7 years agoMerge "Broadcast only if boot complete" into oc-dr1-dev
Jerry Zhang [Thu, 6 Jul 2017 16:52:04 +0000 (16:52 +0000)]
Merge "Broadcast only if boot complete" into oc-dr1-dev

7 years agoMerge "AOD: Disable if device is not yet provisioned" into oc-dr1-dev
Adrian Roos [Thu, 6 Jul 2017 16:31:27 +0000 (16:31 +0000)]
Merge "AOD: Disable if device is not yet provisioned" into oc-dr1-dev
am: 789f10fe12

Change-Id: I86bf782941a26766de14e187270540dac32cf73a

7 years agoMerge "Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1...
Android Build Merger (Role) [Thu, 6 Jul 2017 16:26:07 +0000 (16:26 +0000)]
Merge "Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev am: 9731c8bfef" into oc-dr1-dev-plus-aosp

7 years agoMerge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev
Adrian Roos [Thu, 6 Jul 2017 16:25:05 +0000 (16:25 +0000)]
Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev
am: 9731c8bfef

Change-Id: Ic5cec922b3492c6ea27c89c2260ba6bfa1febedb

7 years agoMerge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev
Adrian Roos [Thu, 6 Jul 2017 16:24:43 +0000 (16:24 +0000)]
Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev
am: 9731c8bfef

Change-Id: I3fff6c1d14b6611a8e2700bc5b6cafcbd2420fa0

7 years agoMerge "AOD: Disable if device is not yet provisioned" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 16:20:19 +0000 (16:20 +0000)]
Merge "AOD: Disable if device is not yet provisioned" into oc-dr1-dev

7 years agoMerge "Merge "Fix tests?" into oc-dr1-dev am: f22c79a27b" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 16:20:17 +0000 (16:20 +0000)]
Merge "Merge "Fix tests?" into oc-dr1-dev am: f22c79a27b" into oc-dr1-dev-plus-aosp

7 years agoMerge "Merge "Fix tests?" into oc-dr1-dev am: f22c79a27b" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 16:19:40 +0000 (16:19 +0000)]
Merge "Merge "Fix tests?" into oc-dr1-dev am: f22c79a27b" into oc-dr1-dev-plus-aosp

7 years agoMerge "Fix tests?" into oc-dr1-dev
Jason Monk [Thu, 6 Jul 2017 16:19:11 +0000 (16:19 +0000)]
Merge "Fix tests?" into oc-dr1-dev
am: f22c79a27b

Change-Id: I5697df0de7367aacf4e1765c241e4311a9b293b5

7 years agoMerge "Fix tests?" into oc-dr1-dev
Jason Monk [Thu, 6 Jul 2017 16:18:48 +0000 (16:18 +0000)]
Merge "Fix tests?" into oc-dr1-dev
am: f22c79a27b

Change-Id: I28ff128653f9ffa65d8e3e0ee3af9368a0d194c4

7 years agoMerge "Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev am:...
Android Build Merger (Role) [Thu, 6 Jul 2017 16:18:46 +0000 (16:18 +0000)]
Merge "Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev am: c3fef742c0" into oc-dr1-dev-plus-aosp

7 years agoMerge "Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev am:...
Android Build Merger (Role) [Thu, 6 Jul 2017 16:18:01 +0000 (16:18 +0000)]
Merge "Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev am: c3fef742c0" into oc-dr1-dev-plus-aosp

7 years agoMerge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev
Adrian Roos [Thu, 6 Jul 2017 16:17:26 +0000 (16:17 +0000)]
Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev
am: c3fef742c0

Change-Id: Ie50de879916ce5b9a48728eee0054fc54b5f1fac

7 years agoMerge "Merge "Don't animate grayscale if animations are off" into oc-dr1-dev am:...
Android Build Merger (Role) [Thu, 6 Jul 2017 16:17:04 +0000 (16:17 +0000)]
Merge "Merge "Don't animate grayscale if animations are off" into oc-dr1-dev am: ab7af71c64" into oc-dr1-dev-plus-aosp

7 years agoMerge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev
Adrian Roos [Thu, 6 Jul 2017 16:16:58 +0000 (16:16 +0000)]
Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev
am: c3fef742c0

Change-Id: If13721952bf6651b87e13567067a241b1e7b3c95

7 years agoMerge "Merge "Don't animate grayscale if animations are off" into oc-dr1-dev am:...
Android Build Merger (Role) [Thu, 6 Jul 2017 16:16:38 +0000 (16:16 +0000)]
Merge "Merge "Don't animate grayscale if animations are off" into oc-dr1-dev am: ab7af71c64" into oc-dr1-dev-plus-aosp

7 years agoMerge "Don't animate grayscale if animations are off" into oc-dr1-dev
Evan Laird [Thu, 6 Jul 2017 16:15:51 +0000 (16:15 +0000)]
Merge "Don't animate grayscale if animations are off" into oc-dr1-dev
am: ab7af71c64

Change-Id: I4bb89c8045d1aee0441882556819d0187a2349b8

7 years agoMerge "Merge "Fixed an issue where a notification could stay userlocked" into oc...
Android Build Merger (Role) [Thu, 6 Jul 2017 16:15:24 +0000 (16:15 +0000)]
Merge "Merge "Fixed an issue where a notification could stay userlocked" into oc-dr1-dev am: 7b04275a68" into oc-dr1-dev-plus-aosp

7 years agoMerge "Don't animate grayscale if animations are off" into oc-dr1-dev
Evan Laird [Thu, 6 Jul 2017 16:15:17 +0000 (16:15 +0000)]
Merge "Don't animate grayscale if animations are off" into oc-dr1-dev
am: ab7af71c64

Change-Id: I598597675ce0dd2373625ac1968217e42576b692

7 years agoMerge "Fixed an issue where a notification could stay userlocked" into oc-dr1-dev
Selim Cinek [Thu, 6 Jul 2017 16:14:10 +0000 (16:14 +0000)]
Merge "Fixed an issue where a notification could stay userlocked" into oc-dr1-dev
am: 7b04275a68

Change-Id: I0f67b6aeb6b770df12679fc333f506b67e79b5f3

7 years agoMerge "Fixed an issue where a notification could stay userlocked" into oc-dr1-dev
Selim Cinek [Thu, 6 Jul 2017 16:13:39 +0000 (16:13 +0000)]
Merge "Fixed an issue where a notification could stay userlocked" into oc-dr1-dev
am: 7b04275a68

Change-Id: I2997be04f1b6b518bc11dd291e2ae1fba55453ea

7 years agoMerge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 16:12:05 +0000 (16:12 +0000)]
Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev

7 years agoMerge "Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev am: d2eef...
Android Build Merger (Role) [Thu, 6 Jul 2017 16:10:57 +0000 (16:10 +0000)]
Merge "Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev am: d2eef601f6" into oc-dr1-dev-plus-aosp

7 years agoMerge "Wakeup packet mark/mask configuration option" into oc-dr1-dev
Lorenzo Colitti [Thu, 6 Jul 2017 16:09:49 +0000 (16:09 +0000)]
Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev
am: d2eef601f6

Change-Id: I8297ca8d29d3aab18884a35953b0021ec265ce26

7 years agoMerge "Wakeup packet mark/mask configuration option" into oc-dr1-dev
Lorenzo Colitti [Thu, 6 Jul 2017 16:09:30 +0000 (16:09 +0000)]
Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev
am: d2eef601f6

Change-Id: Ibc89ffd87fb87cd95f941b2bbd67469d961cb13e

7 years agoMerge "Fix tests?" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 16:09:00 +0000 (16:09 +0000)]
Merge "Fix tests?" into oc-dr1-dev

7 years agoMerge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 16:01:30 +0000 (16:01 +0000)]
Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev

7 years agoMerge "Don't animate grayscale if animations are off" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 15:34:48 +0000 (15:34 +0000)]
Merge "Don't animate grayscale if animations are off" into oc-dr1-dev

7 years agoMerge "Fixed an issue where a notification could stay userlocked" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 15:23:09 +0000 (15:23 +0000)]
Merge "Fixed an issue where a notification could stay userlocked" into oc-dr1-dev

7 years agoMerge "Merge "Layout updates to share sheet" into oc-dr1-dev am: 2a050dae1a" into...
Android Build Merger (Role) [Thu, 6 Jul 2017 15:20:00 +0000 (15:20 +0000)]
Merge "Merge "Layout updates to share sheet" into oc-dr1-dev am: 2a050dae1a" into oc-dr1-dev-plus-aosp

7 years agoMerge "Wakeup packet mark/mask configuration option" into oc-dr1-dev
Lorenzo Colitti [Thu, 6 Jul 2017 15:19:15 +0000 (15:19 +0000)]
Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev

7 years agoMerge "Layout updates to share sheet" into oc-dr1-dev
Jason Monk [Thu, 6 Jul 2017 15:19:02 +0000 (15:19 +0000)]
Merge "Layout updates to share sheet" into oc-dr1-dev
am: 2a050dae1a

Change-Id: I9c9a20d046c3dce3b107903229a570db59c8a51d

7 years agoMerge "Layout updates to share sheet" into oc-dr1-dev
Jason Monk [Thu, 6 Jul 2017 15:18:25 +0000 (15:18 +0000)]
Merge "Layout updates to share sheet" into oc-dr1-dev
am: 2a050dae1a

Change-Id: I1243c4def83a7b116373af01dda2cb883a036e09

7 years agoAOD: Skip window animations while dozing
Adrian Roos [Tue, 9 May 2017 20:17:54 +0000 (13:17 -0700)]
AOD: Skip window animations while dozing

Fixes: 37245619
Test: go/wm-smoke; Go to home, turn off phone, observe that during the transition to AOD the navigation bar hide animation does not play.
Change-Id: I9a2fce4295900648a680e8e7e8fee0fbb447dd3d

7 years agoMerge "Layout updates to share sheet" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 15:09:10 +0000 (15:09 +0000)]
Merge "Layout updates to share sheet" into oc-dr1-dev

7 years agoMerge "Fixed an issue where the lockscreen could be all white" into oc-dr1-dev
Selim Cinek [Thu, 6 Jul 2017 14:38:24 +0000 (14:38 +0000)]
Merge "Fixed an issue where the lockscreen could be all white" into oc-dr1-dev
am: f96da7ee6f

Change-Id: I73e4bc5115959ae38052be25effa736576eb0ba9

7 years agoMerge "Fixed an issue where the lockscreen could be all white" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 14:32:53 +0000 (14:32 +0000)]
Merge "Fixed an issue where the lockscreen could be all white" into oc-dr1-dev

7 years agoFix tests?
Jason Monk [Thu, 6 Jul 2017 13:51:47 +0000 (09:51 -0400)]
Fix tests?

Test: runtest systemui
Change-Id: Ie29ff934fbb6eeab977fd2977ea7f3a1d31170e9
Fixes: 63382815

7 years agoLockIcon: Initialize mAccessibilityController
Adrian Roos [Thu, 6 Jul 2017 13:36:32 +0000 (15:36 +0200)]
LockIcon: Initialize mAccessibilityController

Otherwise updating the clickability never happens.

Change-Id: I8a7ec61b25b0862de8cb0122017cf4064b20bcb3
Fixes: 62695092
Test: Disable security. Click on lock icon. Ensure it shows the unlock hint, and does not show that the device has been locked.

7 years agoMerge "Merge "Fix some config issues with sysui" into oc-dr1-dev am: f636e3fb52"...
Android Build Merger (Role) [Thu, 6 Jul 2017 13:23:19 +0000 (13:23 +0000)]
Merge "Merge "Fix some config issues with sysui" into oc-dr1-dev am: f636e3fb52" into oc-dr1-dev-plus-aosp

7 years agoMerge "Fix some config issues with sysui" into oc-dr1-dev
Jason Monk [Thu, 6 Jul 2017 13:21:37 +0000 (13:21 +0000)]
Merge "Fix some config issues with sysui" into oc-dr1-dev
am: f636e3fb52

Change-Id: Iac9ad5693df97185575e4d620aebf00fd19870fa

7 years agoMerge "Fix some config issues with sysui" into oc-dr1-dev
Jason Monk [Thu, 6 Jul 2017 13:20:18 +0000 (13:20 +0000)]
Merge "Fix some config issues with sysui" into oc-dr1-dev
am: f636e3fb52

Change-Id: Ib9b38c8eb8c6452e7d12f2ced2b499292c000277

7 years agoMerge "Fix some config issues with sysui" into oc-dr1-dev
Jason Monk [Thu, 6 Jul 2017 13:13:55 +0000 (13:13 +0000)]
Merge "Fix some config issues with sysui" into oc-dr1-dev

7 years agoLayout updates to share sheet
Jason Monk [Tue, 27 Jun 2017 22:37:35 +0000 (18:37 -0400)]
Layout updates to share sheet

The biggest change is that padding will only appear above/below
service section, and at the start of the non-service section. For
this a bunch of changes to how padding is needed.

Also some other dimen changes for specs.

Test: visual
Change-Id: I39747701597e620425bdcb4113d1a3585f6de137
Fixes: 37913738

7 years agoMerge "Merge "Zygote: Fix race condition on package preloads." into oc-dr1-dev am...
Android Build Merger (Role) [Thu, 6 Jul 2017 11:37:57 +0000 (11:37 +0000)]
Merge "Merge "Zygote: Fix race condition on package preloads." into oc-dr1-dev am: 84e0f453d1" into oc-dr1-dev-plus-aosp

7 years agoMerge "Zygote: Fix race condition on package preloads." into oc-dr1-dev
Narayan Kamath [Thu, 6 Jul 2017 11:36:48 +0000 (11:36 +0000)]
Merge "Zygote: Fix race condition on package preloads." into oc-dr1-dev
am: 84e0f453d1

Change-Id: I17a572fa28c1371ef51753ff236f569a018df063

7 years agoMerge "Zygote: Fix race condition on package preloads." into oc-dr1-dev
Narayan Kamath [Thu, 6 Jul 2017 11:36:41 +0000 (11:36 +0000)]
Merge "Zygote: Fix race condition on package preloads." into oc-dr1-dev
am: 84e0f453d1

Change-Id: I34dc28cd87e5111fccff05893ddf5c1155ad8746