120669 Commits

Author SHA1 Message Date
Jeff Brown
68cf8bfa79 am 00ffaf3f: (-s ours) am 96d5cd8f: am 18ec40c4: Merge "Destroy surfaces when display is removed."
* commit '00ffaf3fcb5c4fec8e6c4b6c137450c2439383aa':
2013-12-05 22:35:22 +00:00
Mathias Agopian
2b00df255d am 260290ab: (-s ours) am 6ed79d6e: am 9fb9a1c5: Merge "Fix a bug where window animation could be janky"
* commit '260290ab633c54d02a6cc32f1efb8087b4434013':
2013-12-05 22:35:17 +00:00
Alan Viverette
cab6d87a16 am 37914bb0: (-s ours) am a9b6a30f: am 93e095b7: Merge "Add copy constructors for all widget-specific LayoutParams"
* commit '37914bb0ce096b8cb5c5c60ce1362467ebe22bf8':
2013-12-05 22:35:11 +00:00
Dirk Dougherty
5ddaadeb40 am ea55d02b: (-s ours) am d76ca645: am 6e4cc12a: am ec997806: am 1153eb46: am 4e847bd1: Doc change: fix federated urls.
* commit 'ea55d02b59ab8d6e5319946d6aafb268c346cee9':
2013-12-05 22:35:06 +00:00
Alan Viverette
5f6ae10b8c am a2180eba: (-s ours) am 13bcfdca: am 7a2de061: Merge "Add API for scrolling AbsListView by a pixel amount"
* commit 'a2180eba3adf5d3ad5c3f48a583d0035173a5c1a':
2013-12-05 22:34:54 +00:00
Todd Poynor
366bb6e072 am ba813d05: (-s ours) am d159dc7c: am df89ca33: batteryservice: add battery current now and charge counter data
* commit 'ba813d059cd75f1376787afe477e18bff7593652':
2013-12-05 22:34:48 +00:00
Craig Mautner
fb2cd2d78c am cf698844: (-s ours) am 1edbc766: am 9a04435e: Merge "Compare tasks not activities."
* commit 'cf698844634fd2dfd335ece8f907abb8de5fc414':
2013-12-05 22:34:42 +00:00
Amith Yamasani
d081c81fc4 am 4500fb33: (-s ours) am 1a18832c: am d8e97493: Merge "Try again to cleanup all blocked apps"
* commit '4500fb330c85ce9accc7d7ea3c97a09d31e85356':
2013-12-05 22:34:36 +00:00
Brian Williammee
3b3152398d am 1c396eb7: (-s ours) am 58b6d489: am e2b1b8e2: Merge "Track latency of captive portal checks"
* commit '1c396eb73c6572708b437643dd4ebeee54cb8d2b':
2013-12-05 22:34:31 +00:00
Glenn Kasten
83c3dc0a39 am fa7e5d9e: (-s ours) am 2021fba4: am d8405261: Merge "Update audio comments"
* commit 'fa7e5d9eb2d6e053b5799562dc1c6c2183846cf4':
2013-12-05 22:34:24 +00:00
Dianne Hackborn
2dfb990dfe am 12f766d0: (-s ours) am 978efc21: am feca78f7: Merge "Start adding IPC calls to retrieve proc stat data."
* commit '12f766d033d71d109bf51e6bb66f53018ed81d1c':
2013-12-05 22:34:13 +00:00
Baligh Uddin
688697c747 am 37a46250: (-s ours) am 2246e8c7: (-s ours) am b83f6223: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '37a4625058d86f315fa3e9c1de9e309103fa4149':
2013-12-05 22:34:07 +00:00
Baligh Uddin
be55f4ec8e am d7f04345: (-s ours) am 45f2a494: (-s ours) am 85ba45dd: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'd7f043459d2132a14495fd069c9539826b792792':
2013-12-05 22:34:02 +00:00
Craig Mautner
6f1cdb4a14 am 86ac3aab: (-s ours) Merge "Eliminate StackBox." into klp-modular-dev
* commit '86ac3aab40ce6896f5518a9d84b9aadd0fd52b18':
  Eliminate StackBox.
2013-12-05 22:33:56 +00:00
Amith Yamasani
79fa35cd03 am 3b84092f: (-s ours) DO NOT MERGE : Move some system services to their own sub package.
* commit '3b84092f878f3d3b42c771968459de4a02eecce3':
  DO NOT MERGE : Move some system services to their own sub package.
2013-12-05 22:33:49 +00:00
Amith Yamasani
b60c1e345c am bf2c4b78: (-s ours) DO NOT MERGE: Don\'t freak out if SystemUiService isn\'t available
* commit 'bf2c4b788078cf2a2eda0e9f420f4d6225a0774d':
  DO NOT MERGE: Don't freak out if SystemUiService isn't available
2013-12-05 22:33:43 +00:00
Mike Lockwood
afac09baac am a34f0cd9: (-s ours) DO NOT MERGE: Remove obsolete "headless" support
* commit 'a34f0cd99c03c345d1dcb91c5038f558cfc1c7f1':
  DO NOT MERGE: Remove obsolete "headless" support
2013-12-05 22:33:37 +00:00
Ying Wang
41f75016ac am 7a15f932: am babea8d8: am 6e2d0c1d: Merge "wifi: Remove obsolete libwpa_client library"
* commit '7a15f93228b455a731946d4894abdc45be8b164b':
  wifi: Remove obsolete libwpa_client library
2013-12-05 21:17:08 +00:00
Ying Wang
7a15f93228 am babea8d8: am 6e2d0c1d: Merge "wifi: Remove obsolete libwpa_client library"
* commit 'babea8d8f2d4b3a40ab4e37646c26783c2288e87':
  wifi: Remove obsolete libwpa_client library
2013-12-05 20:33:43 +00:00
Ying Wang
babea8d8f2 am 6e2d0c1d: Merge "wifi: Remove obsolete libwpa_client library"
* commit '6e2d0c1d91f644ab50e0c0b7cae4306262a4ca41':
  wifi: Remove obsolete libwpa_client library
2013-12-05 12:29:12 -08:00
Alan Viverette
ad7d65daed Merge "Add stacked padding mode to LayerDrawable" 2013-12-05 19:28:27 +00:00
Alan Viverette
a812ab8786 Merge "Allow alert dialogs to inflate custom view layouts" 2013-12-05 19:28:18 +00:00
Jeff Brown
00ffaf3fcb am 96d5cd8f: am 18ec40c4: Merge "Destroy surfaces when display is removed."
* commit '96d5cd8f43704f3a664a8ee096069c8252323117':
2013-12-05 19:26:38 +00:00
Mathias Agopian
260290ab63 am 6ed79d6e: am 9fb9a1c5: Merge "Fix a bug where window animation could be janky"
* commit '6ed79d6e17d4a1442658cd3a866d0807e52b5637':
2013-12-05 19:26:25 +00:00
Alan Viverette
37914bb0ce am a9b6a30f: am 93e095b7: Merge "Add copy constructors for all widget-specific LayoutParams"
* commit 'a9b6a30f53cdb774db7c1a7ab3efb77ab9d3e53b':
2013-12-05 19:26:08 +00:00
Dirk Dougherty
ea55d02b59 am d76ca645: am 6e4cc12a: am ec997806: am 1153eb46: am 4e847bd1: Doc change: fix federated urls.
* commit 'd76ca645b757ec5684d0ca9a52cfbeb165ac5497':
2013-12-05 19:25:36 +00:00
Alan Viverette
a2180eba3a am 13bcfdca: am 7a2de061: Merge "Add API for scrolling AbsListView by a pixel amount"
* commit '13bcfdcabd83b240a1701ff5ea782bef5b9cd492':
2013-12-05 19:25:28 +00:00
Todd Poynor
ba813d059c am d159dc7c: am df89ca33: batteryservice: add battery current now and charge counter data
* commit 'd159dc7cb5f6d4f0ef99ed8eb8081392fe187a06':
2013-12-05 19:25:21 +00:00
Craig Mautner
cf69884463 am 1edbc766: am 9a04435e: Merge "Compare tasks not activities."
* commit '1edbc766d090e600858648f32c3c231aaa93b24e':
2013-12-05 19:25:13 +00:00
Amith Yamasani
4500fb330c am 1a18832c: am d8e97493: Merge "Try again to cleanup all blocked apps"
* commit '1a18832c15584785bd19efaf30e196bcae408212':
2013-12-05 19:25:04 +00:00
Brian Williammee
1c396eb73c am 58b6d489: am e2b1b8e2: Merge "Track latency of captive portal checks"
* commit '58b6d489457b69d94fc19470bb9e78b794a2d51b':
2013-12-05 19:24:57 +00:00
Glenn Kasten
fa7e5d9eb2 am 2021fba4: am d8405261: Merge "Update audio comments"
* commit '2021fba46cc34beb073535fa603c22f6daf237b2':
2013-12-05 19:24:49 +00:00
Dianne Hackborn
12f766d033 am 978efc21: am feca78f7: Merge "Start adding IPC calls to retrieve proc stat data."
* commit '978efc2162560a2ad1f4b03e7ce361490121760f':
2013-12-05 19:24:39 +00:00
Baligh Uddin
37a4625058 am 2246e8c7: (-s ours) am b83f6223: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '2246e8c76b16d877131dee9b66eaca570c8c436f':
2013-12-05 19:24:32 +00:00
Baligh Uddin
d7f043459d am 45f2a494: (-s ours) am 85ba45dd: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '45f2a4948fb0ec20491b50203d686cf9b5962d99':
2013-12-05 19:24:22 +00:00
Ying Wang
6e2d0c1d91 Merge "wifi: Remove obsolete libwpa_client library" 2013-12-05 19:13:20 +00:00
Alan Viverette
5b10a723b0 Add stacked padding mode to LayerDrawable
General cleanup of LayerDrawable for readability's sake.

BUG: 11695507
Change-Id: Id7811b3c168ef68134d53b93fe9ac36dc9440566
2013-12-05 11:12:17 -08:00
Alan Viverette
ec186706df Allow alert dialogs to inflate custom view layouts
Adds APIs to set a layout resource ID as an AlertDialog's custom view. To
make this useful for developers, also ensures that Dialog content is set
up when calls are made to Dialog.findViewById() before show().

BUG: 11136748
Change-Id: I29747a28d7e30f4e31fe474424109ff29e1eaa98
2013-12-05 11:10:31 -08:00
Dmitry Shmidt
2a69b17309 wifi: Remove obsolete libwpa_client library
Change-Id: I222c60ec65375768dc62f9219d115b5b09a374f6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-12-05 10:50:48 -08:00
Adam Powell
a93ff445c0 Merge "Add support for cross-activity scenes and transitions" 2013-12-05 18:26:37 +00:00
Adam Powell
3a621bbdc4 Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" 2013-12-05 18:06:55 +00:00
Adam Powell
cfbe9be5b3 Add support for cross-activity scenes and transitions
* Add theme attributes for specifying a top-level TransitionManager
  for an activity window.

* Add window feature for automatic content transitions. This
  automatically assigns/creates a Scene for setContentView calls.

* Add named transitions. This allows apps to define APIs for
  handshake-agreements about which exit/entrance transitions to play.

* Add new transition type for ActivityOptions. This lets the system
  use ActivityOptions to communicate transition specifics and
  arguments to the called activity.

* Have ActivityManager pass appropriate ActivityOptions through to the
  called Activity. Have the called activity call back into the caller
  to let it know which transition of a possible requested set was
  chosen.

Still to do:

* Define and pass arguments for transitions. This will require
  defining a Parcelable version of TransitionValues and deciding how
  much leeway apps should have for these things.

* Determine how to appropriately filter the ActivityOptions bundle so
  that only appropriate data reaches the target.

* Determine if generalizing the auto-Scenes functionality to
  ViewGroups is appropriate.

Change-Id: I10684b926129ab2fbc1adec9ef31767237acae79
2013-12-05 10:06:19 -08:00
Ying Wang
f254ed9a98 am ceddb389: am b33fe50a: am dcbde1b0: Merge "libcore_to_document and junit_to_document are no longer functions."
* commit 'ceddb389b4a1751399a0b1ad3198008011a5397a':
  libcore_to_document and junit_to_document are no longer functions.
2013-12-05 18:03:55 +00:00
Ying Wang
ceddb389b4 am b33fe50a: am dcbde1b0: Merge "libcore_to_document and junit_to_document are no longer functions."
* commit 'b33fe50a634e4fde635f7e662526db1c3e2cfa5c':
  libcore_to_document and junit_to_document are no longer functions.
2013-12-05 17:56:45 +00:00
Ying Wang
b33fe50a63 am dcbde1b0: Merge "libcore_to_document and junit_to_document are no longer functions."
* commit 'dcbde1b02ad69c18509afd87974c72c3a22f45dd':
  libcore_to_document and junit_to_document are no longer functions.
2013-12-05 09:47:04 -08:00
Ying Wang
dcbde1b02a Merge "libcore_to_document and junit_to_document are no longer functions." 2013-12-05 17:39:59 +00:00
John Spurlock
6c4557d09c Merge "Volume panel should not clear system ui flags." 2013-12-05 16:53:53 +00:00
Brian Carlstrom
e2aad50479 am 4a657244: am 59595f7a: am 8026b2ce: Merge "Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf."
* commit '4a657244b3de44cf28aae952b8dc76f8598c61cb':
  Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf.
2013-12-05 15:34:24 +00:00
Brian Carlstrom
4a657244b3 am 59595f7a: am 8026b2ce: Merge "Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf."
* commit '59595f7a3e8efcefc62bbcf8e085b6da6d8ea339':
  Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf.
2013-12-05 15:29:41 +00:00
Brian Carlstrom
59595f7a3e am 8026b2ce: Merge "Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf."
* commit '8026b2ce23396262ad1f1e7a75093cd0e2467d4b':
  Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf.
2013-12-05 07:25:20 -08:00