OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "fix "am start -W" hang on activity start" into nyc-dev
Chong Zhang [Mon, 25 Apr 2016 17:16:53 +0000 (17:16 +0000)]
Merge "fix "am start -W" hang on activity start" into nyc-dev
am: 5e40748

* commit '5e40748d3f32c0d5843855cac169e82dd15a0904':
  fix "am start -W" hang on activity start

Change-Id: I3ce58ac5199653a4ef889c6deac97f012a33303e

8 years agoMerge "Return null when user is locked" into nyc-dev
Fyodor Kupolov [Mon, 25 Apr 2016 17:16:50 +0000 (17:16 +0000)]
Merge "Return null when user is locked" into nyc-dev
am: 6eb8c15

* commit '6eb8c15b7e07e320243fbb34999f4a34fa729ed0':
  Return null when user is locked

Change-Id: If1dccaed8f2514a92edb90c17db10e02fc619272

8 years agoMerge "Strings for post-upgrade." into nyc-dev
Jeff Sharkey [Mon, 25 Apr 2016 17:16:46 +0000 (17:16 +0000)]
Merge "Strings for post-upgrade." into nyc-dev
am: 5dc3304

* commit '5dc3304531b7612f1181e122a66eaf097339ae30':
  Strings for post-upgrade.

Change-Id: I49394c727f6d5bfbed43dea1de9c40031c379b02

8 years agoMerge "Fixing animation regression due to ag/957220." into nyc-dev
Winson [Mon, 25 Apr 2016 17:16:42 +0000 (17:16 +0000)]
Merge "Fixing animation regression due to ag/957220." into nyc-dev
am: de91709

* commit 'de91709935b687cf747b25a48d22e9aa396bf462':
  Fixing animation regression due to ag/957220.

Change-Id: I9c2356788cf01153b388097525963b06dcb681fd

8 years agoMerge "Disable StrictMode policy when setting up profile support" into nyc-dev
Calin Juravle [Mon, 25 Apr 2016 17:16:37 +0000 (17:16 +0000)]
Merge "Disable StrictMode policy when setting up profile support" into nyc-dev
am: 096e2dc

* commit '096e2dcf855714577bb86eaa4869ff46b5980a07':
  Disable StrictMode policy when setting up profile support

Change-Id: I430da856430046c5e2751232b427505962615b33

8 years agoMerge "fix "am start -W" hang on activity start" into nyc-dev
Chong Zhang [Mon, 25 Apr 2016 17:08:05 +0000 (17:08 +0000)]
Merge "fix "am start -W" hang on activity start" into nyc-dev

8 years agoMerge "Return null when user is locked" into nyc-dev
Fyodor Kupolov [Mon, 25 Apr 2016 17:03:34 +0000 (17:03 +0000)]
Merge "Return null when user is locked" into nyc-dev

8 years agoMerge "Strings for post-upgrade." into nyc-dev
Jeff Sharkey [Mon, 25 Apr 2016 16:34:11 +0000 (16:34 +0000)]
Merge "Strings for post-upgrade." into nyc-dev

8 years agoMerge "Fixing animation regression due to ag/957220." into nyc-dev
Winson Chung [Mon, 25 Apr 2016 16:25:49 +0000 (16:25 +0000)]
Merge "Fixing animation regression due to ag/957220." into nyc-dev

8 years agoFixing animation regression due to ag/957220.
Winson [Sat, 23 Apr 2016 23:06:50 +0000 (16:06 -0700)]
Fixing animation regression due to ag/957220.

- Ensure we clear deferred relayouts after finishing all animations in
  case they trigger a deferred layout in the animation-end callback.

Bug: 28287904
Change-Id: I6d71328fb3dc4595ea67ee18cfa57d85d741e6c6

8 years agoMerge "Disable StrictMode policy when setting up profile support" into nyc-dev
TreeHugger Robot [Mon, 25 Apr 2016 15:54:36 +0000 (15:54 +0000)]
Merge "Disable StrictMode policy when setting up profile support" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 15:15:49 +0000 (15:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 4316b8a  -s ours

* commit '4316b8a09d591b64f5cb944417573fef47fc453c':
  Import translations. DO NOT MERGE

Change-Id: I134017901ce91019dcd7eee5ed046654dfec802a

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 15:15:46 +0000 (15:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 779722d  -s ours

* commit '779722d7ed84aa0d7a03a3aec93690de9c3dcb7c':
  Import translations. DO NOT MERGE

Change-Id: Ia80be740114d55c73317a1366cd9282dc42be0ce

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 15:15:43 +0000 (15:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 3496262  -s ours

* commit '3496262a987867f90260b467c366eb7e6be42333':
  Import translations. DO NOT MERGE

Change-Id: I34fabdae2324910b66f662a0bffd2788d884ff3a

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 15:15:39 +0000 (15:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: b6a186c  -s ours

* commit 'b6a186ce5226c9f69b625f1fd016a5a7186bc2ff':
  Import translations. DO NOT MERGE

Change-Id: Ia5432922cf53443a67610b3ea378013ca1cd9649

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 15:15:34 +0000 (15:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: c8ad9db  -s ours

* commit 'c8ad9db8b0ce8d8a3301b96ba00f91af369fe38e':
  Import translations. DO NOT MERGE

Change-Id: I66dc9779637507b466e97126a6607229e5c11e66

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 15:09:04 +0000 (15:09 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 15:08:46 +0000 (15:08 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 15:08:30 +0000 (15:08 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 15:08:08 +0000 (15:08 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 15:07:50 +0000 (15:07 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "PixelCopy fixes" into nyc-dev
John Reck [Mon, 25 Apr 2016 15:05:03 +0000 (15:05 +0000)]
Merge "PixelCopy fixes" into nyc-dev
am: a5bbbe5

* commit 'a5bbbe55b74d3a835b64fa18959f487da2df967e':
  PixelCopy fixes

Change-Id: I4a49425cea5316ac4c977432c60caf9a6f667b76

8 years agoMerge "PixelCopy fixes" into nyc-dev
John Reck [Mon, 25 Apr 2016 14:55:27 +0000 (14:55 +0000)]
Merge "PixelCopy fixes" into nyc-dev

8 years agoDisable StrictMode policy when setting up profile support
Calin Juravle [Fri, 22 Apr 2016 16:43:07 +0000 (17:43 +0100)]
Disable StrictMode policy when setting up profile support

Bug: 28304158
Change-Id: Iedf8714bd4f3526823b3060b30e0f11c6c0abcea

8 years agoMerge "Make "work mode on dialog" show personal challenge in unified work lock" into...
Ricky Wai [Mon, 25 Apr 2016 13:20:37 +0000 (13:20 +0000)]
Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev
am: 4ace836

* commit '4ace8366619d04d326505ad689c5d43707f2aaea':
  Make "work mode on dialog" show personal challenge in unified work lock

Change-Id: I2b6fe365bf3556d9fba5ac3c2c7580ded28dc644

8 years agoMerge "Make "work mode on dialog" show personal challenge in unified work lock" into...
Ricky Wai [Mon, 25 Apr 2016 13:11:44 +0000 (13:11 +0000)]
Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 12:54:26 +0000 (12:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 90edb46  -s ours

* commit '90edb46d017f793401f65c64368a7a4cf6f881f9':
  Import translations. DO NOT MERGE

Change-Id: I117fb5328c018acba51075910c78af1ac4fa9035

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 12:49:00 +0000 (12:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 25 Apr 2016 12:12:11 +0000 (05:12 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 25 Apr 2016 11:58:49 +0000 (04:58 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 25 Apr 2016 11:54:12 +0000 (04:54 -0700)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Handle dalvik.vm.usejitprofiles property" am: 028a233
Calin Juravle [Mon, 25 Apr 2016 11:52:09 +0000 (11:52 +0000)]
Merge "Handle dalvik.vm.usejitprofiles property" am: 028a233
am: a483833

* commit 'a4838330667a0db03510ac725c1704848e4306e1':
  Handle dalvik.vm.usejitprofiles property

Change-Id: Ia196229732c57f9c2a1cbf5098e78402409c6dec

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 25 Apr 2016 11:49:48 +0000 (04:49 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 25 Apr 2016 11:45:05 +0000 (04:45 -0700)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Handle dalvik.vm.usejitprofiles property"
Calin Juravle [Mon, 25 Apr 2016 11:15:26 +0000 (11:15 +0000)]
Merge "Handle dalvik.vm.usejitprofiles property"
am: 028a233

* commit '028a23367c1a299cae6fa1b96ff53e59d54b3ee6':
  Handle dalvik.vm.usejitprofiles property

Change-Id: I43f07fab627f18ed3178503b2f73dab584a8cae1

8 years agoMerge "Handle dalvik.vm.usejitprofiles property"
Calin Juravle [Mon, 25 Apr 2016 11:09:00 +0000 (11:09 +0000)]
Merge "Handle dalvik.vm.usejitprofiles property"

8 years agoMake "work mode on dialog" show personal challenge in unified work lock
Ricky Wai [Fri, 15 Apr 2016 16:20:12 +0000 (17:20 +0100)]
Make "work mode on dialog" show personal challenge in unified work lock

Bug: 28183335
Change-Id: Ib212b283b9561f88899f6e7ea130944391b6e558

8 years agoMerge "Regenerate ApplicationInfo if package suspend state is changed." into nyc-dev
Rubin Xu [Mon, 25 Apr 2016 10:19:10 +0000 (10:19 +0000)]
Merge "Regenerate ApplicationInfo if package suspend state is changed." into nyc-dev
am: 0c9c09c

* commit '0c9c09ccff72c9a017e6c7da3aef8738eea5f176':
  Regenerate ApplicationInfo if package suspend state is changed.

Change-Id: I4d519180d99f4d1cbac35d0167e99217da4da9f8

8 years agoMerge "Regenerate ApplicationInfo if package suspend state is changed." into nyc-dev
Rubin Xu [Mon, 25 Apr 2016 10:12:01 +0000 (10:12 +0000)]
Merge "Regenerate ApplicationInfo if package suspend state is changed." into nyc-dev

8 years agoMerge "Avoid instantiations of Boolean that are immediately unboxed." into nyc-dev...
Tobias Thierer [Mon, 25 Apr 2016 09:51:41 +0000 (09:51 +0000)]
Merge "Avoid instantiations of Boolean that are immediately unboxed." into nyc-dev-plus-aosp

8 years agoAvoid instantiations of Boolean that are immediately unboxed.
Tobias Thierer [Thu, 21 Apr 2016 16:51:41 +0000 (17:51 +0100)]
Avoid instantiations of Boolean that are immediately unboxed.

Replaced Boolean.valueOf() -> parseBoolean() across frameworks/base
(not including Am.java, which I'm leaving for a separate change).

Also fixed a couple of other valueOf()s in SyncStorageEngine.

Bug: 28289401
(cherry-picked from commit ca0182073530a237babe65b9ec7a9b41e667f8d1)
Change-Id: I2c6fb39a465885e7e625ed8894b1b9f8a30da5bc

8 years agoMerge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7" am: 94adc6c
Neil Fuller [Mon, 25 Apr 2016 09:43:55 +0000 (09:43 +0000)]
Merge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7" am: 94adc6c
am: b088673

* commit 'b0886738b65ce4e7dc9788d7ec92ee8980a45b58':
  Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7

Change-Id: Id4b3d72d2b4e4c37ae3ad982e742983be4b9cd91

8 years agoMerge "Merge "Avoid instantiations of Boolean that are immediately unboxed." am:...
Android Build Merger (Role) [Mon, 25 Apr 2016 09:40:11 +0000 (09:40 +0000)]
Merge "Merge "Avoid instantiations of Boolean that are immediately unboxed." am: 823e05b am: 71502c44  -s ours" into nyc-dev-plus-aosp

8 years agoMerge "Avoid instantiations of Boolean that are immediately unboxed." am: 823e05b
Tobias Thierer [Mon, 25 Apr 2016 09:39:37 +0000 (09:39 +0000)]
Merge "Avoid instantiations of Boolean that are immediately unboxed." am: 823e05b
am: 71502c44  -s ours

* commit '71502c44faaf5974442f540fc616499ac5505776':
  Avoid instantiations of Boolean that are immediately unboxed.

Change-Id: I4cbaea450ecf022fcec65a2679db99917ff1b1bf

8 years agoMerge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev
Clara Bayarri [Mon, 25 Apr 2016 09:39:35 +0000 (09:39 +0000)]
Merge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev
am: f48f390

* commit 'f48f390a60694df6f4b72bd0ac462dd19c5e1191':
  Improve KeyboardShortcutInfo documentation for Modifiers

Change-Id: I36a85346b9b5a8606b75cf670ddbc67ab9831377

8 years agoMerge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7"
Shubham Ajmera [Mon, 25 Apr 2016 09:39:31 +0000 (09:39 +0000)]
Merge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7"
am: 94adc6c

* commit '94adc6ce96c4405134141e4e7a7ff8512e2dda1b':
  Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7

Change-Id: Ie844dfe438d37abd1f708b149be51a611b7e7044

8 years agoMerge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7"
Neil Fuller [Mon, 25 Apr 2016 09:31:40 +0000 (09:31 +0000)]
Merge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7"

8 years agoMerge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev
Clara Bayarri [Mon, 25 Apr 2016 09:31:04 +0000 (09:31 +0000)]
Merge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev

8 years agoMerge "Avoid instantiations of Boolean that are immediately unboxed."
Tobias Thierer [Mon, 25 Apr 2016 09:14:15 +0000 (09:14 +0000)]
Merge "Avoid instantiations of Boolean that are immediately unboxed."
am: 823e05b

* commit '823e05b2db229549c33892a0aa303fd7fb10a214':
  Avoid instantiations of Boolean that are immediately unboxed.

Change-Id: I170bf470d63faec93c228ae897796a2e6067da7e

8 years agoMerge "Avoid instantiations of Boolean that are immediately unboxed."
Tobias Thierer [Mon, 25 Apr 2016 09:08:43 +0000 (09:08 +0000)]
Merge "Avoid instantiations of Boolean that are immediately unboxed."

8 years agoMerge "Add state and callback logs for IpManager dump" into nyc-dev
Erik Kline [Mon, 25 Apr 2016 08:03:54 +0000 (08:03 +0000)]
Merge "Add state and callback logs for IpManager dump" into nyc-dev
am: 7587ba8

* commit '7587ba86086be9bd56d13fe28904b46ae7d3c521':
  Add state and callback logs for IpManager dump

Change-Id: Id40843ac659ea8e3d0319e0cf1b8a61d2895e511

8 years agoMerge "Add state and callback logs for IpManager dump" into nyc-dev
Erik Kline [Mon, 25 Apr 2016 07:55:58 +0000 (07:55 +0000)]
Merge "Add state and callback logs for IpManager dump" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 25 Apr 2016 05:31:19 +0000 (22:31 -0700)]
Import translations. DO NOT MERGE

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

8 years agoAdd state and callback logs for IpManager dump
Erik Kline [Fri, 22 Apr 2016 07:41:26 +0000 (16:41 +0900)]
Add state and callback logs for IpManager dump

Bug: 27605330
Change-Id: I2e659d08fa9acd57a71901f28c85a92c0876c663

8 years agoMerge "Fix unexpected truncation again." into nyc-dev
Seigo Nonaka [Mon, 25 Apr 2016 03:42:38 +0000 (03:42 +0000)]
Merge "Fix unexpected truncation again." into nyc-dev
am: ab8913e

* commit 'ab8913e364d296fdb62e6b2572d102063bff42cb':
  Fix unexpected truncation again.

Change-Id: I62bd788fccf05f4ca4c8ef5879576d48fd083086

8 years agoMerge "Fix unexpected truncation again." into nyc-dev
Seigo Nonaka [Mon, 25 Apr 2016 03:36:28 +0000 (03:36 +0000)]
Merge "Fix unexpected truncation again." into nyc-dev

8 years agoMerge "Fixed the paddings in inbox style to match the rest of the templates" into...
Selim Cinek [Sun, 24 Apr 2016 14:51:34 +0000 (14:51 +0000)]
Merge "Fixed the paddings in inbox style to match the rest of the templates" into nyc-dev
am: 14d8be7

* commit '14d8be728bbca1e7d721479fa1476e23e1b7accf':
  Fixed the paddings in inbox style to match the rest of the templates

Change-Id: Ia8e3f178eae3e6be06f6b557c345866261a9eac8

8 years agoMerge "Fixed the paddings in inbox style to match the rest of the templates" into...
TreeHugger Robot [Sun, 24 Apr 2016 14:44:26 +0000 (14:44 +0000)]
Merge "Fixed the paddings in inbox style to match the rest of the templates" into nyc-dev

8 years agofix "am start -W" hang on activity start
Chong Zhang [Sat, 23 Apr 2016 21:33:55 +0000 (14:33 -0700)]
fix "am start -W" hang on activity start

Normally launch time counts from the point when the activity is
resumed, to when the first window is drawn. However the activity
could become visible before it is resumed, due to some other
activity in the same task being launched. In this case we still
need to report launch time to unblock
ActivityStarter.startActivityMayWait().

bug: 28333487
Change-Id: I445b602f495ed0c3cb669e2d81a137280317534f

8 years agoMerge "Make AbsSavedState read using given ClassLoader" into nyc-dev
Chris Banes [Sat, 23 Apr 2016 07:09:22 +0000 (07:09 +0000)]
Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev
am: b02d51b

* commit 'b02d51b3d31b1a49ddc7c7e7db97b576d6e4f78f':
  Make AbsSavedState read using given ClassLoader

Change-Id: If0e2679ca978a0423ff26e7b0f416d09c50ab70b

8 years agoMerge "Make AbsSavedState read using given ClassLoader" into nyc-dev
Chris Banes [Sat, 23 Apr 2016 07:04:20 +0000 (07:04 +0000)]
Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev

8 years agoMerge "Fix content description for notification icons" into nyc-dev
Adrian Roos [Sat, 23 Apr 2016 01:51:02 +0000 (01:51 +0000)]
Merge "Fix content description for notification icons" into nyc-dev
am: eefff37

* commit 'eefff3742de62101341128a32b227a25ed22df06':
  Fix content description for notification icons

Change-Id: I35b24b57ffe34f81007cf6fb7ae860998b6ca65c

8 years agoMerge "Fix content description for notification icons" into nyc-dev
TreeHugger Robot [Sat, 23 Apr 2016 01:45:00 +0000 (01:45 +0000)]
Merge "Fix content description for notification icons" into nyc-dev

8 years agoFixed the paddings in inbox style to match the rest of the templates
Selim Cinek [Thu, 21 Apr 2016 23:40:47 +0000 (16:40 -0700)]
Fixed the paddings in inbox style to match the rest of the templates

Change-Id: Ib7701ac29d5f8a123441fbf6d95a5b0b9cadfb4e
Fixes: 27998488

8 years agoMerge "Fix a regression in assist when context is disabled" into nyc-dev
Amith Yamasani [Sat, 23 Apr 2016 01:02:02 +0000 (01:02 +0000)]
Merge "Fix a regression in assist when context is disabled" into nyc-dev
am: c3c45fa

* commit 'c3c45fa2e0c5779e3e847dd4878c2a9d1ba2fb36':
  Fix a regression in assist when context is disabled

Change-Id: Ib12c5e865814f8b3c54c3e862af2191315bbc6e5

8 years agoMerge "Fix a regression in assist when context is disabled" into nyc-dev
TreeHugger Robot [Sat, 23 Apr 2016 00:56:10 +0000 (00:56 +0000)]
Merge "Fix a regression in assist when context is disabled" into nyc-dev

8 years agoMerge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev
Adam Lesinski [Sat, 23 Apr 2016 00:23:56 +0000 (00:23 +0000)]
Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev
am: 1a8a717

* commit '1a8a717ab517e7b5ace00bb4d3370e0f3a2677b2':
  BatteryStats: Fix up semantics of SamplingTimer

Change-Id: Iaab0fd5bf59399a3ef2bfe2eb3904ec13691e186

8 years agoMerge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev
Adam Lesinski [Sat, 23 Apr 2016 00:20:09 +0000 (00:20 +0000)]
Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev

8 years agoMerge "PIP: Changed the wording and background of the PIP onboarding screen" into...
Jaewan Kim [Sat, 23 Apr 2016 00:13:14 +0000 (00:13 +0000)]
Merge "PIP: Changed the wording and background of the PIP onboarding screen" into nyc-dev
am: b27a5fd

* commit 'b27a5fd45b2ae461cfa61dfff52e897d236d0d26':
  PIP: Changed the wording and background of the PIP onboarding screen

Change-Id: I9eeaf9e51346ad900945a927c1c05816d9172de4

8 years agoFix content description for notification icons
Adrian Roos [Sat, 23 Apr 2016 00:09:27 +0000 (17:09 -0700)]
Fix content description for notification icons

Change-Id: Icb4c6d8a77211d0c8922e28958609a332b19dfcc
Fixes: 27552350

8 years agoMerge "PIP: Changed the wording and background of the PIP onboarding screen" into...
Jaewan Kim [Sat, 23 Apr 2016 00:04:54 +0000 (00:04 +0000)]
Merge "PIP: Changed the wording and background of the PIP onboarding screen" into nyc-dev

8 years agoPIP: Changed the wording and background of the PIP onboarding screen
Jaewan Kim [Thu, 21 Apr 2016 12:16:28 +0000 (21:16 +0900)]
PIP: Changed the wording and background of the PIP onboarding screen

Bug: 28300868
Change-Id: I73e465ddac5520e0b70098bf6a39fb85d59ad0f9

8 years agoMerge "Raise native-crash socket timeout" into nyc-dev
Christopher Tate [Fri, 22 Apr 2016 23:44:54 +0000 (23:44 +0000)]
Merge "Raise native-crash socket timeout" into nyc-dev
am: aa1b2e2

* commit 'aa1b2e2d4e47ae186df31ffe10f1ed05b951b753':
  Raise native-crash socket timeout

Change-Id: I7e763182c48f7ec1fd36196e4ecf991cd602e500

8 years agoMerge "Show a toast when details cannot be added to zip file." into nyc-dev
Felipe Leme [Fri, 22 Apr 2016 23:34:16 +0000 (23:34 +0000)]
Merge "Show a toast when details cannot be added to zip file." into nyc-dev
am: f39f044

* commit 'f39f04407e6c50d57aaa2358b2f46bc79a94cf4f':
  Show a toast when details cannot be added to zip file.

Change-Id: I09e6bece0225d01cf0eaafa8e64e88bfe40a7f0e

8 years agoMerge "Added title and button for Data Saver\'s 1st-time dialog." into nyc-dev
Felipe Leme [Fri, 22 Apr 2016 23:34:13 +0000 (23:34 +0000)]
Merge "Added title and button for Data Saver\'s 1st-time dialog." into nyc-dev
am: 19fa93f

* commit '19fa93f64329e52ee69d06feffc979723210edd4':
  Added title and button for Data Saver's 1st-time dialog.

Change-Id: I18c0c3c623ec60e72e394c3d3a764e76991207a9

8 years agoMerge "Rename GET_PASSWORD_PRIVILEGED and make it signature." into nyc-dev
Carlos Valdivia [Fri, 22 Apr 2016 23:34:09 +0000 (23:34 +0000)]
Merge "Rename GET_PASSWORD_PRIVILEGED and make it signature." into nyc-dev
am: ffcba67

* commit 'ffcba67bf9d25d9b8131f0aab9d5c8a4df492b69':
  Rename GET_PASSWORD_PRIVILEGED and make it signature.

Change-Id: Id79e67c8968bfaa87a5e43311ccf7dce99e84036

8 years agoMerge "Disable view recycling to avoid passing wrong type of view to Item.bindView...
Garfield, Tan [Fri, 22 Apr 2016 23:34:04 +0000 (23:34 +0000)]
Merge "Disable view recycling to avoid passing wrong type of view to Item.bindView()." into nyc-dev
am: a5dd3f3

* commit 'a5dd3f32403deb01ad260d50468f4daf8988ab01':
  Disable view recycling to avoid passing wrong type of view to Item.bindView().

Change-Id: I7848f1888db79bfdd2744d88b10ab797d5dae47f

8 years agoMerge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev
Ta-wei Yen [Fri, 22 Apr 2016 23:33:59 +0000 (23:33 +0000)]
Merge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev
am: 8431a48

* commit '8431a48f779939a9c49538d054539321f9421e6c':
  Rename _BOOLEAN visual voicemail config keys to _BOOL

Change-Id: I20ec57dbcaad08e02a9bcea40f52f077eff0e730

8 years agoFixing issue with swipe-dismiss animation clobbering home animation.
Winson [Fri, 22 Apr 2016 23:33:54 +0000 (23:33 +0000)]
Fixing issue with swipe-dismiss animation clobbering home animation.
am: eca47ef

* commit 'eca47ef813c49c8d8cee2cdc93c296bbc59ed73b':
  Fixing issue with swipe-dismiss animation clobbering home animation.

Change-Id: I7b18f4c0eaac8acbbac4b4d6ce4ad2b189095456

8 years agoMerge "Force a relayout when task is resized while not drag resizing." into nyc-dev
Chong Zhang [Fri, 22 Apr 2016 23:33:48 +0000 (23:33 +0000)]
Merge "Force a relayout when task is resized while not drag resizing." into nyc-dev
am: b6cd42a

* commit 'b6cd42a925136f6354555c9c1033d20fbaadd139':
  Force a relayout when task is resized while not drag resizing.

Change-Id: I789fcdd5a3b9ce0499d484d75dccf72d5a60fc43

8 years agoPixelCopy fixes
John Reck [Tue, 19 Apr 2016 14:51:13 +0000 (07:51 -0700)]
PixelCopy fixes

Bug: 27708453

Fixes some issues with camera sources. Previously
it was using GL_TEXTURE_2D target which doesn't
work properly if the source is YUV. It is critical
to ensure GL_TEXTURE_EXTERNAL_OES is used throughout
so the right sampler is used.

Change-Id: I0dcd8941ba08331f24809467b0e828663a38e93b

8 years agoMerge "Raise native-crash socket timeout" into nyc-dev
Chris Tate [Fri, 22 Apr 2016 23:31:02 +0000 (23:31 +0000)]
Merge "Raise native-crash socket timeout" into nyc-dev

8 years agoMerge "Show a toast when details cannot be added to zip file." into nyc-dev
Felipe Leme [Fri, 22 Apr 2016 23:08:04 +0000 (23:08 +0000)]
Merge "Show a toast when details cannot be added to zip file." into nyc-dev

8 years agoMerge "Added title and button for Data Saver's 1st-time dialog." into nyc-dev
Felipe Leme [Fri, 22 Apr 2016 23:02:15 +0000 (23:02 +0000)]
Merge "Added title and button for Data Saver's 1st-time dialog." into nyc-dev

8 years agoAdded title and button for Data Saver's 1st-time dialog.
Felipe Leme [Fri, 22 Apr 2016 22:46:28 +0000 (15:46 -0700)]
Added title and button for Data Saver's 1st-time dialog.

BUG: 28098106
Change-Id: Icd3d2ee1b62abac738a7ff1c601bf91f6eedfd62

8 years agoMerge "Rename GET_PASSWORD_PRIVILEGED and make it signature." into nyc-dev
Carlos Valdivia [Fri, 22 Apr 2016 22:51:50 +0000 (22:51 +0000)]
Merge "Rename GET_PASSWORD_PRIVILEGED and make it signature." into nyc-dev

8 years agoMerge "Disable view recycling to avoid passing wrong type of view to Item.bindView...
Garfield Tan [Fri, 22 Apr 2016 22:47:37 +0000 (22:47 +0000)]
Merge "Disable view recycling to avoid passing wrong type of view to Item.bindView()." into nyc-dev

8 years agoMerge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev
Ta-wei Yen [Fri, 22 Apr 2016 22:43:57 +0000 (22:43 +0000)]
Merge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev

8 years agoFix a regression in assist when context is disabled
Amith Yamasani [Fri, 22 Apr 2016 22:43:21 +0000 (15:43 -0700)]
Fix a regression in assist when context is disabled

Fixes: 28293783
 CTS: DisableContextTest#testContextAndScreenshotOff failure

When assist context is disabled, make sure that the handleAssist() is
still called with no data.

Change-Id: I569dd9f6de503e62fb04c590214df0f2ce3aa4f3

8 years agoFixing issue with swipe-dismiss animation clobbering home animation.
Winson [Thu, 21 Apr 2016 23:48:50 +0000 (16:48 -0700)]
Fixing issue with swipe-dismiss animation clobbering home animation.

- Finish all dismiss animations when a dismiss-to-home animation is
  started, and prevent lingering deferred layout animation requests
  from running as they will be overwritten anyways.

Bug: 28287904
Change-Id: Ie40c66c0f25705b56f6808607d2b7b8ae4e5a112

8 years agoRaise native-crash socket timeout
Christopher Tate [Fri, 22 Apr 2016 22:27:10 +0000 (15:27 -0700)]
Raise native-crash socket timeout

Stack unwinding can sometimes legitimately take more than 2 seconds.

Bug 28210681

Change-Id: If6fb30c5111e9c85ce98d36a97faa0b5f21bc04d

8 years agoMerge "Force a relayout when task is resized while not drag resizing." into nyc-dev
Chong Zhang [Fri, 22 Apr 2016 22:25:26 +0000 (22:25 +0000)]
Merge "Force a relayout when task is resized while not drag resizing." into nyc-dev

8 years agoMerge "BatteryStats: use the same timestamp for comparing intervals" into nyc-dev
Adam Lesinski [Fri, 22 Apr 2016 22:24:39 +0000 (22:24 +0000)]
Merge "BatteryStats: use the same timestamp for comparing intervals" into nyc-dev
am: 6a4d9a3

* commit '6a4d9a3c9f7cbd30a7093f5088a72271a5e504c7':
  BatteryStats: use the same timestamp for comparing intervals

Change-Id: I0c32c75176bd1e154ed0286f8426807d0221204a

8 years agoMerge "Cleanup of the PackageInstaller API - Frameworks" into nyc-dev
Svet Ganov [Fri, 22 Apr 2016 22:24:36 +0000 (22:24 +0000)]
Merge "Cleanup of the PackageInstaller API - Frameworks" into nyc-dev
am: c947ebd

* commit 'c947ebd66d397782af0870df457ccc4fe83c77cc':
  Cleanup of the PackageInstaller API - Frameworks

Change-Id: I50e4c8357bb0c5abab9c37b6a39628f6e3e0ea1b

8 years agoMerge changes Ia8a90434,I35f484c7,I2e87e764 into nyc-dev
Winson [Fri, 22 Apr 2016 22:24:34 +0000 (22:24 +0000)]
Merge changes Ia8a90434,I35f484c7,I2e87e764 into nyc-dev
am: dddfff3

* commit 'dddfff3cddf8c12aba0335eb853f177abb0a68b0':
  Tweaks to make overview animations to match spec.
  Closing system windows when dismissing recents to app or home.
  Caching the display rect to reduce binder calls.

Change-Id: I62e383c2b2f6b029049e02f3a80b298833e664ea

8 years agoShow a toast when details cannot be added to zip file.
Felipe Leme [Fri, 22 Apr 2016 00:30:47 +0000 (17:30 -0700)]
Show a toast when details cannot be added to zip file.

BUG: 28291423
Change-Id: I7febf66ef23f38b41fb1909324ee2260444518f6

8 years agoMerge "BatteryStats: use the same timestamp for comparing intervals" into nyc-dev
Adam Lesinski [Fri, 22 Apr 2016 22:20:35 +0000 (22:20 +0000)]
Merge "BatteryStats: use the same timestamp for comparing intervals" into nyc-dev

8 years agoMerge "Cleanup of the PackageInstaller API - Frameworks" into nyc-dev
Svetoslav Ganov [Fri, 22 Apr 2016 22:18:27 +0000 (22:18 +0000)]
Merge "Cleanup of the PackageInstaller API - Frameworks" into nyc-dev

8 years agoMerge changes Ia8a90434,I35f484c7,I2e87e764 into nyc-dev
Winson Chung [Fri, 22 Apr 2016 22:15:45 +0000 (22:15 +0000)]
Merge changes Ia8a90434,I35f484c7,I2e87e764 into nyc-dev

* changes:
  Tweaks to make overview animations to match spec.
  Closing system windows when dismissing recents to app or home.
  Caching the display rect to reduce binder calls.

8 years agoMerge "Fix black flicker when closing IME" into nyc-dev
Jorim Jaggi [Fri, 22 Apr 2016 22:14:14 +0000 (22:14 +0000)]
Merge "Fix black flicker when closing IME" into nyc-dev
am: ce83dcf

* commit 'ce83dcf4f7ed2082c72b062c7388a4314419e225':
  Fix black flicker when closing IME

Change-Id: Ib6be479dd0e40371c25845a958313e65234f9832