OSDN Git Service

android-x86/frameworks-base.git
11 years agoMerge "Save Scroller position"
Fabrice Di Meglio [Thu, 13 Jun 2013 00:54:36 +0000 (00:54 +0000)]
Merge "Save Scroller position"

11 years agoam 80d56531: am 95793530: am 2b336ce4: am 94e207b9: am 3574bef4: am 47f5c410: am...
Dirk Dougherty [Thu, 13 Jun 2013 00:47:59 +0000 (17:47 -0700)]
am 80d56531: am 95793530: am 2b336ce4: am 94e207b9: am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API.

* commit '80d56531103249f103d7cb680cd431b059ff1d43':
  Doc change: Add docs for GP Purchase Status API.

11 years agoam 95793530: am 2b336ce4: am 94e207b9: am 3574bef4: am 47f5c410: am 57bb89f0: Doc...
Dirk Dougherty [Thu, 13 Jun 2013 00:45:53 +0000 (17:45 -0700)]
am 95793530: am 2b336ce4: am 94e207b9: am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API.

* commit '9579353081f4857c6a9672675dca22182b588e31':
  Doc change: Add docs for GP Purchase Status API.

11 years agoam 2b336ce4: am 94e207b9: am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add...
Dirk Dougherty [Thu, 13 Jun 2013 00:43:07 +0000 (17:43 -0700)]
am 2b336ce4: am 94e207b9: am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API.

* commit '2b336ce4d8f740715a5b2f2cc8fb07a99300ce73':
  Doc change: Add docs for GP Purchase Status API.

11 years agoSave Scroller position
Fabrice Di Meglio [Wed, 12 Jun 2013 23:01:48 +0000 (16:01 -0700)]
Save Scroller position

- add SaveState with scroll position and use it during the first layout

Change-Id: I0806ddb9c52d70d32055f4b474d21f6e2e5a4ea8

11 years agoam 94e207b9: am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purch...
Dirk Dougherty [Thu, 13 Jun 2013 00:40:06 +0000 (17:40 -0700)]
am 94e207b9: am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API.

* commit '94e207b95799125dcc6ea65eb68697a6568579a3':
  Doc change: Add docs for GP Purchase Status API.

11 years agoam 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status...
Dirk Dougherty [Thu, 13 Jun 2013 00:37:26 +0000 (17:37 -0700)]
am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API.

* commit '3574bef4625402a99224a9c1051b295ed9fa0645':
  Doc change: Add docs for GP Purchase Status API.

11 years agoMerge "Overdraw avoidance and merging of clipped ops"
Chris Craik [Thu, 13 Jun 2013 00:37:02 +0000 (00:37 +0000)]
Merge "Overdraw avoidance and merging of clipped ops"

11 years agoMerge "Remove crash workarounds, add logging"
Chris Craik [Thu, 13 Jun 2013 00:36:37 +0000 (00:36 +0000)]
Merge "Remove crash workarounds, add logging"

11 years agoam 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API.
Dirk Dougherty [Thu, 13 Jun 2013 00:35:17 +0000 (17:35 -0700)]
am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API.

* commit '47f5c4102d096c56f9ebc71bdb351b58cfb8de42':
  Doc change: Add docs for GP Purchase Status API.

11 years agoam 57bb89f0: Doc change: Add docs for GP Purchase Status API.
Dirk Dougherty [Thu, 13 Jun 2013 00:33:37 +0000 (17:33 -0700)]
am 57bb89f0: Doc change: Add docs for GP Purchase Status API.

* commit '57bb89f0b267140ae7f50e31ec0e3023e8836639':
  Doc change: Add docs for GP Purchase Status API.

11 years agoMerge "Fix bug #9302365 HorizontalScrollView is not RTL aware"
Fabrice Di Meglio [Thu, 13 Jun 2013 00:27:13 +0000 (00:27 +0000)]
Merge "Fix bug #9302365 HorizontalScrollView is not RTL aware"

11 years agoam 18c3bbfb: am a37c3f18: Merge "Fix logspam when battery sysfs file not available...
Jeff Brown [Thu, 13 Jun 2013 00:05:10 +0000 (17:05 -0700)]
am 18c3bbfb: am a37c3f18: Merge "Fix logspam when battery sysfs file not available." into jb-mr2-dev

* commit '18c3bbfb7840f465ffa292f49d98c3b617dea1e5':
  Fix logspam when battery sysfs file not available.

11 years agoam a37c3f18: Merge "Fix logspam when battery sysfs file not available." into jb-mr2-dev
Jeff Brown [Thu, 13 Jun 2013 00:02:43 +0000 (17:02 -0700)]
am a37c3f18: Merge "Fix logspam when battery sysfs file not available." into jb-mr2-dev

* commit 'a37c3f18e64f45d19a019ab47429413481fded9f':
  Fix logspam when battery sysfs file not available.

11 years agoMerge "Fix logspam when battery sysfs file not available." into jb-mr2-dev
Jeff Brown [Wed, 12 Jun 2013 23:59:01 +0000 (23:59 +0000)]
Merge "Fix logspam when battery sysfs file not available." into jb-mr2-dev

11 years agoFix bug #9302365 HorizontalScrollView is not RTL aware
Fabrice Di Meglio [Wed, 12 Jun 2013 02:13:54 +0000 (19:13 -0700)]
Fix bug #9302365 HorizontalScrollView is not RTL aware

- make FrameLayout capable of forcing a Gravity.LEFT (when there will be
only one child with Gravity.RIGHT and wider than its parent like for
HorizontalScrollView)
- fix onLayout() so that it is forcing Gravity.LEFT if needed and
setting correctly the initial mScrollX
- also add restore/save from an instance state (by saving if the layout
is RTL and the scroll position)

Change-Id: Ida7ff4654c6a54a1696c2575af46f044dd1aabc8

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 12 Jun 2013 23:44:07 +0000 (23:44 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 12 Jun 2013 23:40:14 +0000 (23:40 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 12 Jun 2013 23:39:45 +0000 (23:39 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoRemove crash workarounds, add logging
Chris Craik [Wed, 12 Jun 2013 23:23:00 +0000 (16:23 -0700)]
Remove crash workarounds, add logging

bug:9321162
Change-Id: I748c27f979af1a303be01db29aedcbad6d608c38

11 years agoam ac6c8621: am 30af45f4: Merge "Allow carrier provisioning to turn toggle radio...
Wink Saville [Wed, 12 Jun 2013 23:19:50 +0000 (16:19 -0700)]
am ac6c8621: am 30af45f4: Merge "Allow carrier provisioning to turn toggle radio power." into jb-mr2-dev

* commit 'ac6c862196a62855e5c48d78b2a509943ec300b5':
  Allow carrier provisioning to turn toggle radio power.

11 years agoam 30af45f4: Merge "Allow carrier provisioning to turn toggle radio power." into...
Wink Saville [Wed, 12 Jun 2013 23:16:45 +0000 (16:16 -0700)]
am 30af45f4: Merge "Allow carrier provisioning to turn toggle radio power." into jb-mr2-dev

* commit '30af45f47fd71feee0f9e5f8e049ba0380bc7793':
  Allow carrier provisioning to turn toggle radio power.

11 years agoMerge "Allow carrier provisioning to turn toggle radio power." into jb-mr2-dev
Wink Saville [Wed, 12 Jun 2013 23:13:06 +0000 (23:13 +0000)]
Merge "Allow carrier provisioning to turn toggle radio power." into jb-mr2-dev

11 years agoMerge "Centralize all system InputEventReceiver monitors."
Craig Mautner [Wed, 12 Jun 2013 23:07:39 +0000 (23:07 +0000)]
Merge "Centralize all system InputEventReceiver monitors."

11 years agoMerge "Revert "Generate PDF from Canvas.""
Svetoslav Ganov [Wed, 12 Jun 2013 23:07:13 +0000 (23:07 +0000)]
Merge "Revert "Generate PDF from Canvas.""

11 years agoRevert "Generate PDF from Canvas."
Svetoslav Ganov [Wed, 12 Jun 2013 23:06:46 +0000 (23:06 +0000)]
Revert "Generate PDF from Canvas."

This reverts commit 923c633ccfda45312fec5a3484b6cc1308cc71ab

Change-Id: Ie49f593ec702c1ecf96a5cc1fafa680c1db08747

11 years agoDoc change: Add docs for GP Purchase Status API.
Dirk Dougherty [Wed, 12 Jun 2013 03:10:54 +0000 (20:10 -0700)]
Doc change: Add docs for GP Purchase Status API.

Change-Id: I6f5feb51f1ad06200bb512bcb54eab2f94f40e00

11 years agoMerge "Fix possible NPE in PointerLocationView"
Michael Wright [Wed, 12 Jun 2013 23:03:08 +0000 (23:03 +0000)]
Merge "Fix possible NPE in PointerLocationView"

11 years agoFix logspam when battery sysfs file not available.
Jeff Brown [Wed, 12 Jun 2013 22:57:38 +0000 (15:57 -0700)]
Fix logspam when battery sysfs file not available.

This was a regression caused by a recent change to use String8
instead of char*.  We missed the implicit null check here.

Bug: 9377604
Change-Id: I7eff138096622c47b5d45678010373dc82138384

11 years agoOverdraw avoidance and merging of clipped ops
Chris Craik [Fri, 31 May 2013 18:38:03 +0000 (11:38 -0700)]
Overdraw avoidance and merging of clipped ops

bug:8951267

If an opaque op, or group of opaque ops covers the invalidate region,
skip draw operations that precede it.

Clipped operations may now be merged, but only if they share a
clipRect - this is a very case for e.g. ListView, where all background
elements may now be a part of the same MergingDrawBatch.

It is this more aggressive merging that groups together clipped
background elements in the ListView case, enabling the overdraw
avoidance skipping the window background.

Change-Id: Ib0961977e272c5ac37f59e4c67d828467422d259

11 years agoam 414fec25: (-s ours) am 909b6db6: Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Wed, 12 Jun 2013 21:30:13 +0000 (14:30 -0700)]
am 414fec25: (-s ours) am 909b6db6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '414fec25225acc5b6fc40c1ce92a84ae95b3fce2':
  Import translations. DO NOT MERGE

11 years agoam 05cb82ca: (-s ours) am 96acc0e5: Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Jun 2013 21:30:10 +0000 (14:30 -0700)]
am 05cb82ca: (-s ours) am 96acc0e5: Import translations. DO NOT MERGE

* commit '05cb82caeed3d1b710c74cbba5ac97ee61c1d8ae':
  Import translations. DO NOT MERGE

11 years agoGenerate PDF from Canvas.
Svetoslav Ganov [Mon, 10 Jun 2013 15:47:27 +0000 (08:47 -0700)]
Generate PDF from Canvas.

This change adds simple APIs that enable an Android application
to generate a PDF document by drawing content on a canvas.

Change-Id: Iddcd126b3af37c73d99262f6b276caa07b998c1d

11 years agoMerge "Allow adding headers and footers to ListView after setAdapter()."
Alan Viverette [Wed, 12 Jun 2013 21:12:53 +0000 (21:12 +0000)]
Merge "Allow adding headers and footers to ListView after setAdapter()."

11 years agoam 909b6db6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 12 Jun 2013 20:17:49 +0000 (13:17 -0700)]
am 909b6db6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '909b6db6a327c2102bbcaa56720428319d0d4e94':
  Import translations. DO NOT MERGE

11 years agoam 96acc0e5: Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Jun 2013 20:17:47 +0000 (13:17 -0700)]
am 96acc0e5: Import translations. DO NOT MERGE

* commit '96acc0e5f16ef575e306eb8217484a5f3471f917':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 12 Jun 2013 20:16:34 +0000 (20:16 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoAllow adding headers and footers to ListView after setAdapter().
Alan Viverette [Wed, 12 Jun 2013 19:56:29 +0000 (12:56 -0700)]
Allow adding headers and footers to ListView after setAdapter().

Bug: 6110394
Change-Id: I0238ff91b6ae3159b2350d5210545425ac7340f3

11 years agoMerge "Add getters for ListView header & footer divider drawing attrs."
Alan Viverette [Wed, 12 Jun 2013 19:49:12 +0000 (19:49 +0000)]
Merge "Add getters for ListView header & footer divider drawing attrs."

11 years agoMerge "Clean up FastScroller. Expand overlay to fit text content."
Alan Viverette [Wed, 12 Jun 2013 19:48:53 +0000 (19:48 +0000)]
Merge "Clean up FastScroller. Expand overlay to fit text content."

11 years agoMerge "Improve process tracking."
Dianne Hackborn [Wed, 12 Jun 2013 19:40:17 +0000 (19:40 +0000)]
Merge "Improve process tracking."

11 years agoFix possible NPE in PointerLocationView
Michael Wright [Wed, 12 Jun 2013 03:50:19 +0000 (20:50 -0700)]
Fix possible NPE in PointerLocationView

Change-Id: I36577d6882db898ff4d4d9090454cdf71a440fd5

11 years agoMerge "Organize the imports in systemui."
John Spurlock [Wed, 12 Jun 2013 18:51:35 +0000 (18:51 +0000)]
Merge "Organize the imports in systemui."

11 years agoOrganize the imports in systemui.
John Spurlock [Wed, 12 Jun 2013 16:41:00 +0000 (12:41 -0400)]
Organize the imports in systemui.

To follow android conventions, more importantly to remove the
unused.

Change-Id: I75881718e84360a579a3b02c26489ad250bc9227

11 years agoImprove process tracking.
Dianne Hackborn [Wed, 12 Jun 2013 00:10:32 +0000 (17:10 -0700)]
Improve process tracking.

We now keep track of when each process is running, batched
by the current memory status of the device.  In addition,
the stats are organized by package first, and then processes
associated with each package inside of that.  Finally, we
also keep track of the overall time spent in each memory
status.

This should start to actually get us to some information
we can reach some conclusions about.  The total time spent
in each memory status gives us some indication of how much
we are running while memory is low; the new package organization
batched by memory status lets us see what packages have
what processes running when memory is low.

Change-Id: I389d62d39d115a846126cf354e4c20070d8f1180

11 years agoMerge "Remove only file in systemui with windows line endings."
John Spurlock [Wed, 12 Jun 2013 18:45:05 +0000 (18:45 +0000)]
Merge "Remove only file in systemui with windows line endings."

11 years agoMerge "ArrayMap is great, so how about ArraySet!"
Dianne Hackborn [Wed, 12 Jun 2013 18:35:49 +0000 (18:35 +0000)]
Merge "ArrayMap is great, so how about ArraySet!"

11 years agoCentralize all system InputEventReceiver monitors.
Craig Mautner [Fri, 7 Jun 2013 17:35:44 +0000 (10:35 -0700)]
Centralize all system InputEventReceiver monitors.

Implement all system level InputEvent monitors as new
InputEventListeners. Only one InputChannel required and monitoring
can be enabled or disabled by registering with WindowManagerService.

Change-Id: I64714ab858342ed183c62b421098478ffb6637bc

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Jun 2013 17:39:43 +0000 (10:39 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Jun 2013 17:38:17 +0000 (10:38 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Jun 2013 17:09:33 +0000 (10:09 -0700)]
Import translations. DO NOT MERGE

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

11 years agoRemove only file in systemui with windows line endings.
John Spurlock [Wed, 12 Jun 2013 16:54:06 +0000 (12:54 -0400)]
Remove only file in systemui with windows line endings.

Change-Id: I7b0e8b58a7c14afa6d2e7c1ce97ebacc5ffbb538

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Jun 2013 16:52:55 +0000 (09:52 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Jun 2013 16:50:05 +0000 (09:50 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam fabda589: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do...
The Android Open Source Project [Wed, 12 Jun 2013 14:25:57 +0000 (07:25 -0700)]
am fabda589: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

* commit 'fabda5894c2793b37650ce3bc1697effd86af88b':
  Need to explicitly disable scan-always when turning off wifi
  Let RemoteControlDisplay know more about playback position
  Unhide MediaExtractor.getPsshInfo()

11 years agoReconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
The Android Open Source Project [Wed, 12 Jun 2013 14:23:31 +0000 (07:23 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

Change-Id: Ife328fef3a7cc1a88562fd88a85daa626b19c930

11 years agomerge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Wed, 12 Jun 2013 12:55:58 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev

11 years agoMerge "WebViewChromium: don't use a separate class loader."
Torne (Richard Coles) [Wed, 12 Jun 2013 12:25:42 +0000 (12:25 +0000)]
Merge "WebViewChromium: don't use a separate class loader."

11 years agoNeed to explicitly disable scan-always when turning off wifi
Christopher Tate [Mon, 10 Jun 2013 23:55:02 +0000 (16:55 -0700)]
Need to explicitly disable scan-always when turning off wifi

... when you want wifi to be really most sincerely off, because
settings restore is about to rewrite the conf file.

Bug 9032154

Change-Id: I6a3a34ac3f14ec43aa9d9cc0159fca6168ccd0a2

11 years agoLet RemoteControlDisplay know more about playback position
Jean-Michel Trivi [Fri, 7 Jun 2013 22:48:22 +0000 (15:48 -0700)]
Let RemoteControlDisplay know more about playback position

The BT stack needs to differentiate between applications that use
 the new RemoteControlClient APIs to pass a playback position but
 don't have one yet, and applications that use the legacy API and
 will never pass a position.

Bug 9294855

Change-Id: I05cba82a073e6e0aaea1d8bbf9cc8c99da715f58

11 years agoUnhide MediaExtractor.getPsshInfo()
Marco Nelissen [Mon, 10 Jun 2013 22:06:28 +0000 (15:06 -0700)]
Unhide MediaExtractor.getPsshInfo()

b/9373882

Change-Id: I2af42656d6a7eb19e8e9ec798b615dab0d9d33cb

11 years agoAdd getters for ListView header & footer divider drawing attrs.
Alan Viverette [Wed, 12 Jun 2013 00:50:56 +0000 (17:50 -0700)]
Add getters for ListView header & footer divider drawing attrs.

Bug: 6104055
Change-Id: I874d631ec6fbb0e99790a3f37d00d589c1d63d34

11 years agoMerge "Avoid 9patch cache lookups when possible"
Romain Guy [Wed, 12 Jun 2013 00:23:27 +0000 (00:23 +0000)]
Merge "Avoid 9patch cache lookups when possible"

11 years agoAvoid 9patch cache lookups when possible
Romain Guy [Tue, 11 Jun 2013 23:19:24 +0000 (16:19 -0700)]
Avoid 9patch cache lookups when possible

This optimization saves up to 0.3ms per frame on the Play Store's
front page, on a Nexus 4 device.

Change-Id: Iaa4ef33c6e3b37e175efd5b9eea9ef59b43f14f3

11 years agoMerge "Fix build."
Dianne Hackborn [Wed, 12 Jun 2013 00:14:45 +0000 (00:14 +0000)]
Merge "Fix build."

11 years agoFix build.
Dianne Hackborn [Wed, 12 Jun 2013 00:13:52 +0000 (17:13 -0700)]
Fix build.

Change-Id: I166c744e0f6bf62ac06b4797b87e064e14d0b85e

11 years agoMerge "Explicit locale when formatting machine strings."
Jeff Sharkey [Tue, 11 Jun 2013 23:52:17 +0000 (23:52 +0000)]
Merge "Explicit locale when formatting machine strings."

11 years agoMerge "Add new API to retrieve a dumpsys of a single package."
Dianne Hackborn [Tue, 11 Jun 2013 23:33:32 +0000 (23:33 +0000)]
Merge "Add new API to retrieve a dumpsys of a single package."

11 years agoMerge "Fix build break due to javadoc linking error"
Igor Murashkin [Tue, 11 Jun 2013 22:59:05 +0000 (22:59 +0000)]
Merge "Fix build break due to javadoc linking error"

11 years agoMerge "Fix build"
Glenn Kasten [Tue, 11 Jun 2013 22:41:14 +0000 (22:41 +0000)]
Merge "Fix build"

11 years agoam 1bc14ed9: am 76b76666: Merge "Need to explicitly disable scan-always when turning...
Christopher Tate [Tue, 11 Jun 2013 22:37:12 +0000 (15:37 -0700)]
am 1bc14ed9: am 76b76666: Merge "Need to explicitly disable scan-always when turning off wifi" into jb-mr2-dev

* commit '1bc14ed9c3bb0fae28c2cdf9319b2f5f892409eb':
  Need to explicitly disable scan-always when turning off wifi

11 years agoam 799f031a: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do...
The Android Open Source Project [Tue, 11 Jun 2013 22:37:06 +0000 (15:37 -0700)]
am 799f031a: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

* commit '799f031a64d3930b85b9232bac344b1f9f216717':
  Import translations. DO NOT MERGE
  Do not allow 0 or smaller periodicity for syncs. b/9295383
  Save Notification large icon to extras.
  Workaround possible use after delete
  Do not block notifications or toasts for SYSTEM_UID or PHONE_UID.
  Don't orphan footers with transient state Bug #8725945
  Avoid logging sensitive data.

11 years agoFix build
Glenn Kasten [Tue, 11 Jun 2013 22:36:06 +0000 (15:36 -0700)]
Fix build

Change-Id: Iacac057570e9fcfe850ee597c0a26b2d06ab7910

11 years agoFix build break due to javadoc linking error
Igor Murashkin [Tue, 11 Jun 2013 22:25:20 +0000 (15:25 -0700)]
Fix build break due to javadoc linking error

Change-Id: I9da1cb03afef25c11844ec863200f7b5b009e77a

11 years agoMerge "Don't wait for the MountService to be ready when encrypting"
Ken Sumrall [Tue, 11 Jun 2013 22:07:27 +0000 (22:07 +0000)]
Merge "Don't wait for the MountService to be ready when encrypting"

11 years agoam 76b76666: Merge "Need to explicitly disable scan-always when turning off wifi...
Christopher Tate [Tue, 11 Jun 2013 22:07:00 +0000 (15:07 -0700)]
am 76b76666: Merge "Need to explicitly disable scan-always when turning off wifi" into jb-mr2-dev

* commit '76b76666f5c28751db6ed8791fd54ec430d4361a':
  Need to explicitly disable scan-always when turning off wifi

11 years agoMerge "Need to explicitly disable scan-always when turning off wifi" into jb-mr2-dev
Christopher Tate [Tue, 11 Jun 2013 22:04:38 +0000 (22:04 +0000)]
Merge "Need to explicitly disable scan-always when turning off wifi" into jb-mr2-dev

11 years agoReconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
The Android Open Source Project [Tue, 11 Jun 2013 21:56:51 +0000 (14:56 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

Change-Id: I7100db02d39d7d91bb3c2b8eea070a48a8f7c139

11 years agoArrayMap is great, so how about ArraySet!
Dianne Hackborn [Mon, 10 Jun 2013 22:59:15 +0000 (15:59 -0700)]
ArrayMap is great, so how about ArraySet!

Also a few little tweaks to the ArrayMap implementation.  Note that
these are fairly parallel implementations; I looked at what I could
abstract out as a base class, but there isn't really all that much without
making the resulting code more general and thus slower.  If we kept
the data structure for ArraySet the same as map, where the array has
two values per entry, then they could probably share a lot of code.
I couldn't really bring myself to do that at this point, though...

Change-Id: I9e0dd8baa8e1febcc1033ecef61623ad59ce4aae

11 years agoExplicit locale when formatting machine strings.
Jeff Sharkey [Tue, 11 Jun 2013 21:13:09 +0000 (14:13 -0700)]
Explicit locale when formatting machine strings.

Bug: 9390451
Change-Id: I3581c53407554a1dffd541fb42b06d68f20a7be0

11 years agoAdd new API to retrieve a dumpsys of a single package.
Dianne Hackborn [Tue, 11 Jun 2013 21:26:53 +0000 (14:26 -0700)]
Add new API to retrieve a dumpsys of a single package.

Adds a platform API, and pm command.  Fixes some issues with
dumping per-package data in package manager, makes battery
stats able to dump per-package state.

Change-Id: I76ee6d059f0ba17f7a7061886792b1b716d46d2d

11 years agoam 4a9fcaf4: am cd5b3310: Merge "Add LTE overlays for signal strength indicators...
Daniel Sandler [Tue, 11 Jun 2013 21:13:58 +0000 (14:13 -0700)]
am 4a9fcaf4: am cd5b3310: Merge "Add LTE overlays for signal strength indicators." into jb-mr2-dev

* commit '4a9fcaf49f6da3f28334bb8e5eddea51c0b6fc59':
  Add LTE overlays for signal strength indicators.

11 years agoam 36e90664: am bcc6ae88: Merge "Let RemoteControlDisplay know more about playback...
Zhihai Xu [Tue, 11 Jun 2013 21:13:56 +0000 (14:13 -0700)]
am 36e90664: am bcc6ae88: Merge "Let RemoteControlDisplay know more about playback position" into jb-mr2-dev

* commit '36e90664c7b74bd90b56b17afb407729f7949108':
  Let RemoteControlDisplay know more about playback position

11 years agoam 994c7b47: am 276c72b7: am 8f678878: am 6e15b52e: am 7728e1d6: replace obsolete...
Scott Main [Tue, 11 Jun 2013 21:13:53 +0000 (14:13 -0700)]
am 994c7b47: am 276c72b7: am 8f678878: am 6e15b52e: am 7728e1d6: replace obsolete links. bug: 9380063

* commit '994c7b4768b661f86542a1096b199f772e8a94a2':
  replace obsolete links. bug: 9380063

11 years agoam 3826e8bd: am 37490462: Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-dev
Marco Nelissen [Tue, 11 Jun 2013 21:13:51 +0000 (14:13 -0700)]
am 3826e8bd: am 37490462: Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-dev

* commit '3826e8bd6e30dbda90f330e4b3facbccc8c4bb9e':
  Unhide MediaExtractor.getPsshInfo()

11 years agoam be173f6a: am 8fb120b6: Merge "add ViewGroup\'s layoutMode attribute to public...
Scott Main [Tue, 11 Jun 2013 21:13:48 +0000 (14:13 -0700)]
am be173f6a: am 8fb120b6: Merge "add ViewGroup\'s layoutMode attribute to public resources bug: 9359960" into jb-mr2-dev

* commit 'be173f6a16619ed82469bda7cf0df7c3763d3c81':
  add ViewGroup's layoutMode attribute to public resources bug: 9359960

11 years agoam 2ccb564d: am 938e8b67: am d731c902: am f0380a26: am 343f581d: Merge "fix typo...
Scott Main [Tue, 11 Jun 2013 21:13:46 +0000 (14:13 -0700)]
am 2ccb564d: am 938e8b67: am d731c902: am f0380a26: am 343f581d: Merge "fix typo and clarify class references in database lesson bug: 9372560" into jb-mr1.1-ub-dev

* commit '2ccb564d8066972847d8a5e4b8820c72638134b1':
  fix typo and clarify class references in database lesson bug: 9372560

11 years agoam 26560925: (-s ours) am ebb17713: Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Tue, 11 Jun 2013 21:13:43 +0000 (14:13 -0700)]
am 26560925: (-s ours) am ebb17713: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '26560925f7326f8144d5b58419adb6b24bb9a0fd':
  Import translations. DO NOT MERGE

11 years agoam c8aa0b49: am 58100fb8: Merge "Do not allow 0 or smaller periodicity for syncs...
Ashish Sharma [Tue, 11 Jun 2013 21:13:40 +0000 (14:13 -0700)]
am c8aa0b49: am 58100fb8: Merge "Do not allow 0 or smaller periodicity for syncs. b/9295383" into jb-mr2-dev

* commit 'c8aa0b49a6aa766c905e7da516c24af1c34710e3':
  Do not allow 0 or smaller periodicity for syncs. b/9295383

11 years agoam 46ae4122: am a9221987: Merge "Save Notification large icon to extras." into jb...
John Spurlock [Tue, 11 Jun 2013 21:13:37 +0000 (14:13 -0700)]
am 46ae4122: am a9221987: Merge "Save Notification large icon to extras." into jb-mr2-dev

* commit '46ae41221f18235f72c7de47ca124254a89dc1f4':
  Save Notification large icon to extras.

11 years agoam 26bc073d: am fe7c2220: Merge "add NA message for any "signature" level permissions...
Scott Main [Tue, 11 Jun 2013 21:13:35 +0000 (14:13 -0700)]
am 26bc073d: am fe7c2220: Merge "add NA message for any "signature" level permissions" into jb-mr2-dev

* commit '26bc073dfa32c8122ce194cfc39e2dfc44370fcd':
  add NA message for any "signature" level permissions

11 years agoam 8cb26c09: am cb5d644f: Merge "Workaround possible use after delete" into jb-mr2-dev
Chris Craik [Tue, 11 Jun 2013 21:13:32 +0000 (14:13 -0700)]
am 8cb26c09: am cb5d644f: Merge "Workaround possible use after delete" into jb-mr2-dev

* commit '8cb26c099dc6357340141c9d81a1131ee404ae41':
  Workaround possible use after delete

11 years agoam 0a2ff8db: am 4e5694aa: Merge "Do not block notifications or toasts for SYSTEM_UID...
Daniel Sandler [Tue, 11 Jun 2013 21:13:28 +0000 (14:13 -0700)]
am 0a2ff8db: am 4e5694aa: Merge "Do not block notifications or toasts for SYSTEM_UID or PHONE_UID." into jb-mr2-dev

* commit '0a2ff8db4339261d701ad542ac770fb92bf2127b':
  Do not block notifications or toasts for SYSTEM_UID or PHONE_UID.

11 years agoam cd5b3310: Merge "Add LTE overlays for signal strength indicators." into jb-mr2-dev
Daniel Sandler [Tue, 11 Jun 2013 21:11:29 +0000 (14:11 -0700)]
am cd5b3310: Merge "Add LTE overlays for signal strength indicators." into jb-mr2-dev

* commit 'cd5b3310e23b918fe7f49352e28f7d1b69ca859c':
  Add LTE overlays for signal strength indicators.

11 years agoam bcc6ae88: Merge "Let RemoteControlDisplay know more about playback position" into...
Zhihai Xu [Tue, 11 Jun 2013 21:11:19 +0000 (14:11 -0700)]
am bcc6ae88: Merge "Let RemoteControlDisplay know more about playback position" into jb-mr2-dev

* commit 'bcc6ae88f97caa7591a7507a90ec1152ee7cab7a':
  Let RemoteControlDisplay know more about playback position

11 years agoam 276c72b7: am 8f678878: am 6e15b52e: am 7728e1d6: replace obsolete links. bug:...
Scott Main [Tue, 11 Jun 2013 21:10:29 +0000 (14:10 -0700)]
am 276c72b7: am 8f678878: am 6e15b52e: am 7728e1d6: replace obsolete links. bug: 9380063

* commit '276c72b714f0dc1b5aa49cf78924cd2af09b4c8b':
  replace obsolete links. bug: 9380063

11 years agoam 37490462: Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-dev
Marco Nelissen [Tue, 11 Jun 2013 21:10:26 +0000 (14:10 -0700)]
am 37490462: Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-dev

* commit '374904621a79eb12416da4a26be515ae9a2d243a':
  Unhide MediaExtractor.getPsshInfo()

11 years agoam 8fb120b6: Merge "add ViewGroup\'s layoutMode attribute to public resources bug...
Scott Main [Tue, 11 Jun 2013 21:10:18 +0000 (14:10 -0700)]
am 8fb120b6: Merge "add ViewGroup\'s layoutMode attribute to public resources bug: 9359960" into jb-mr2-dev

* commit '8fb120b67d785dc5ab0ebdb8efd7988da1a94365':
  add ViewGroup's layoutMode attribute to public resources bug: 9359960

11 years agoam 938e8b67: am d731c902: am f0380a26: am 343f581d: Merge "fix typo and clarify class...
Scott Main [Tue, 11 Jun 2013 21:10:16 +0000 (14:10 -0700)]
am 938e8b67: am d731c902: am f0380a26: am 343f581d: Merge "fix typo and clarify class references in database lesson bug: 9372560" into jb-mr1.1-ub-dev

* commit '938e8b67c2c9d0e4c797a317a10148be42aa80ec':
  fix typo and clarify class references in database lesson bug: 9372560

11 years agoam ebb17713: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Tue, 11 Jun 2013 21:10:03 +0000 (14:10 -0700)]
am ebb17713: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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