OSDN Git Service

android-x86/frameworks-base.git
10 years agoRemove deprecated BufferQueue constructor
Dan Stoza [Wed, 12 Mar 2014 22:39:33 +0000 (15:39 -0700)]
Remove deprecated BufferQueue constructor

Bug: 13415624
Change-Id: Ib9788bca98fca22e0e4d81756d4aa3b29d5d5af2

10 years agoam 578e1938: am 3ce589e5: am 2d8a3908: Fix power manager display wake lock bugs.
Jeff Brown [Wed, 12 Mar 2014 20:34:48 +0000 (20:34 +0000)]
am 578e1938: am 3ce589e5: am 2d8a3908: Fix power manager display wake lock bugs.

* commit '578e19381c2329511187083045d3ad5509428730':
  Fix power manager display wake lock bugs.

10 years agoam 1c65e293: am ec463b96: resolved conflicts for merge of cc9894c8 to klp-modular...
Jeff Brown [Wed, 12 Mar 2014 20:34:42 +0000 (20:34 +0000)]
am 1c65e293: am ec463b96: resolved conflicts for merge of cc9894c8 to klp-modular-dev-plus-aosp

* commit '1c65e293bd9646e8ca0dd6447c0bcb0889305273':
  Retain display when creating specialized contexts. (DO NOT MERGE)

10 years agoMerge "Cleanup ContextThemeWrapper"
Fabrice Di Meglio [Wed, 12 Mar 2014 20:02:47 +0000 (20:02 +0000)]
Merge "Cleanup ContextThemeWrapper"

10 years agoam c65caed6: am c48701a1: am 641d8aff: Merge "Fix possible invalid pointer index...
Justin Koh [Wed, 12 Mar 2014 19:57:14 +0000 (19:57 +0000)]
am c65caed6: am c48701a1: am 641d8aff: Merge "Fix possible invalid pointer index in swipe dismiss." into klp-modular-dev

* commit 'c65caed6dabe9eed3551c412427df81cd881496a':
  Fix possible invalid pointer index in swipe dismiss.

10 years agoam c32a98b8: am f978f16e: resolved conflicts for merge of c76345a3 to klp-modular...
Deepanshu Gupta [Wed, 12 Mar 2014 19:56:58 +0000 (19:56 +0000)]
am c32a98b8: am f978f16e: resolved conflicts for merge of c76345a3 to klp-modular-dev-plus-aosp

* commit 'c32a98b8cc09687a031ed969e39df593bf483459':
  Fix the delegate method signatures in LayoutLib

10 years agoam 81686bd9: (-s ours) am a54f852d: am ed28fc89: Utilize new Android LED constants...
Michael Wright [Wed, 12 Mar 2014 19:56:32 +0000 (19:56 +0000)]
am 81686bd9: (-s ours) am a54f852d: am ed28fc89: Utilize new Android LED constants. DO NOT MERGE

* commit '81686bd93c15f0129de27e1b2a2e025e0b4112b4':
  Utilize new Android LED constants. DO NOT MERGE

10 years agoMerge "Force shadow casters above the Z=0 plane"
Chris Craik [Wed, 12 Mar 2014 19:22:28 +0000 (19:22 +0000)]
Merge "Force shadow casters above the Z=0 plane"

10 years agoForce shadow casters above the Z=0 plane
Chris Craik [Wed, 12 Mar 2014 00:42:29 +0000 (17:42 -0700)]
Force shadow casters above the Z=0 plane

Change-Id: Ifee75414829d4bfb3c7aa6219f1f9bcfd50ff0c6

10 years agoMerge "MTP: Add support for battery level device property"
Mike Lockwood [Wed, 12 Mar 2014 17:58:04 +0000 (17:58 +0000)]
Merge "MTP: Add support for battery level device property"

10 years agoMerge "Insulate SystemUI from IDs in inflated notification views."
Dan Sandler [Wed, 12 Mar 2014 17:18:42 +0000 (17:18 +0000)]
Merge "Insulate SystemUI from IDs in inflated notification views."

10 years agoMerge "Fix orthographic shadows projection, simplify shadow reordering"
Chris Craik [Wed, 12 Mar 2014 17:03:00 +0000 (17:03 +0000)]
Merge "Fix orthographic shadows projection, simplify shadow reordering"

10 years agoFix orthographic shadows projection, simplify shadow reordering
Chris Craik [Tue, 11 Mar 2014 19:20:17 +0000 (12:20 -0700)]
Fix orthographic shadows projection, simplify shadow reordering

Separate matrix passed to shadow system into two parts, one for
transforming the polygon XY points (using the actual draw matrix) and
a separate one which respects correct 4x4 3d rotations and
translations for determining Z values.

Change-Id: I7e30a84774a8709df6b2241e8f51fc5583648fe8

10 years agoMTP: Add support for battery level device property
Mike Lockwood [Fri, 7 Mar 2014 21:29:08 +0000 (13:29 -0800)]
MTP: Add support for battery level device property

Bug: 7342482

Change-Id: I810e55fe9695e2206816f57334ad14f65e9c641d

10 years agoam c770e064: am dd0db799: am 5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category...
Jose Lima [Wed, 12 Mar 2014 15:19:37 +0000 (15:19 +0000)]
am c770e064: am dd0db799: am 5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev

* commit 'c770e064effb79c33472f54652bd95aa14a8d6ec':
  Added LEANBACK_LAUNCHER Intent category

10 years agoam 31734c35: (-s ours) am ee142967: am e5098b50: am e8af5e10: am 6d9ed0c3: Merge...
Robert Greenwalt [Wed, 12 Mar 2014 15:19:33 +0000 (15:19 +0000)]
am 31734c35: (-s ours) am ee142967: am e5098b50: am e8af5e10: am 6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev

* commit '31734c35bf3ebcbeaa14721aefd51df11c796345':
  DO NOT MERGE Debounce wifi country code Info

10 years agoam 42703d11: (-s ours) am cb714ae6: am 74f36d31: am c48c9626: am 82ec1442: Merge...
Zhihai Xu [Wed, 12 Mar 2014 15:19:30 +0000 (15:19 +0000)]
am 42703d11: (-s ours) am cb714ae6: am 74f36d31: am c48c9626: am 82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev

* commit '42703d1199ea4770f505db0d5d8c9eb7d076e0d4':
  DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""

10 years agoam 58795020: (-s ours) am dbba6f07: am 2e76f5d8: am 5f683ca8: am 5243a760: Merge...
Vinit Deshapnde [Wed, 12 Mar 2014 15:19:27 +0000 (15:19 +0000)]
am 58795020: (-s ours) am dbba6f07: am 2e76f5d8: am 5f683ca8: am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev

* commit '58795020ef98789f5c5b942417ad0f23b6771221':
  DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi

10 years agoam 2fcac8ba: am b41c951f: am cb5f813b: am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos...
John Spurlock [Wed, 12 Mar 2014 15:19:23 +0000 (15:19 +0000)]
am 2fcac8ba: am b41c951f: am cb5f813b: am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs

* commit '2fcac8ba6fe870d78eca7b75c0e846a229f08819':
  Fix doc typos in Vibrator.java

10 years agoam 41b60030: am 60d18cea: am 21207588: am 790c5a4c: am 29de5063: Merge "fix some...
Scott Main [Wed, 12 Mar 2014 15:19:19 +0000 (15:19 +0000)]
am 41b60030: am 60d18cea: am 21207588: am 790c5a4c: am 29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs

* commit '41b600304e6a2d007711ec814647e4dddbdd96ca':
  fix some typos for GoogleApiClient doc

10 years agoam 6fc25fb7: am a17a7000: am 2ada4e31: am 7b0c111b: am 69e49a81: Merge "fix typos...
Scott Main [Wed, 12 Mar 2014 15:19:14 +0000 (15:19 +0000)]
am 6fc25fb7: am a17a7000: am 2ada4e31: am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs

* commit '6fc25fb727e788ea6f33e6cd8a0421750be2ef9a':
  fix typos

10 years agoMerge "Add APIs for better interoperability with Java 1.7"
Neil Fuller [Wed, 12 Mar 2014 11:46:10 +0000 (11:46 +0000)]
Merge "Add APIs for better interoperability with Java 1.7"

10 years agoam 3ce589e5: am 2d8a3908: Fix power manager display wake lock bugs.
Jeff Brown [Wed, 12 Mar 2014 09:03:17 +0000 (09:03 +0000)]
am 3ce589e5: am 2d8a3908: Fix power manager display wake lock bugs.

* commit '3ce589e59507193ce15a76fa135bf2efc7bca7c6':
  Fix power manager display wake lock bugs.

10 years agoam 2d8a3908: Fix power manager display wake lock bugs.
Jeff Brown [Wed, 12 Mar 2014 08:57:51 +0000 (08:57 +0000)]
am 2d8a3908: Fix power manager display wake lock bugs.

* commit '2d8a3908d2b0a74ccdecd97e86e7bfda1caa218e':
  Fix power manager display wake lock bugs.

10 years agoFix power manager display wake lock bugs.
Jeff Brown [Wed, 12 Mar 2014 06:02:35 +0000 (23:02 -0700)]
Fix power manager display wake lock bugs.

Under certain circumstances, the power manager might continue to
hold the display wakelock long after the display had been turned
off due to the mDisplayReady flag having an incorrect value.

1. An inverted conditional caused DisplayPowerState to incorrectly
signal the screen on ready state.

2. The DisplayPowerController failed to clear the block screen on
flag in the case where the screen was turned off before it became
unblocked from turning on.  This could happen when the display was
rapidly turned on-off-on-off.

Bug: 13248135
Change-Id: I8faa3034695c83c8cd35613d81acccf40d22128d

10 years agoInsulate SystemUI from IDs in inflated notification views.
Dan Sandler [Wed, 12 Mar 2014 04:53:21 +0000 (00:53 -0400)]
Insulate SystemUI from IDs in inflated notification views.

We use the hidden View.setIsRootNamespace() in the same way
that AppWidgetHostView does: to block recursive ID search
traversals from traveling into notification views, which
might have children with IDs that collide with SystemUI's
own views. (Views inside notifications can still be located
by ID, but you need to start your search inside the
inflated notification row.)

Bug: 13421971
Change-Id: If8b81b9d0ed4b0eb6fa1e028275caa0b932f5759

10 years agoam ec463b96: resolved conflicts for merge of cc9894c8 to klp-modular-dev-plus-aosp
Jeff Brown [Wed, 12 Mar 2014 04:05:24 +0000 (04:05 +0000)]
am ec463b96: resolved conflicts for merge of cc9894c8 to klp-modular-dev-plus-aosp

* commit 'ec463b96e188f2c68cbef2362e570118a3a460ed':
  Retain display when creating specialized contexts. (DO NOT MERGE)

10 years agoresolved conflicts for merge of cc9894c8 to klp-modular-dev-plus-aosp
Jeff Brown [Wed, 12 Mar 2014 04:01:49 +0000 (21:01 -0700)]
resolved conflicts for merge of cc9894c8 to klp-modular-dev-plus-aosp

Change-Id: I0fa4486ed300a35de3af8748e01300b01f03ec01

10 years agoMerge "Retain display when creating specialized contexts."
Jeff Brown [Wed, 12 Mar 2014 03:43:17 +0000 (03:43 +0000)]
Merge "Retain display when creating specialized contexts."

10 years agoMerge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp...
Jeff Brown [Wed, 12 Mar 2014 03:42:20 +0000 (03:42 +0000)]
Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-modular-dev

10 years agoRetain display when creating specialized contexts. (DO NOT MERGE)
Jeff Brown [Tue, 11 Mar 2014 04:24:37 +0000 (21:24 -0700)]
Retain display when creating specialized contexts. (DO NOT MERGE)

Fixed a bug that cause Context.createPackageContext() to discard
display information.  Likewise also fixes issues where the
activity token, override configuration, user handle, and
restriction state might be discarded.

As part of this change, reworked how Contexts are created to make
initialization easier to understand and less error-prone.
The init() methods have been removed and most of the state is
now stored in final variables.

Bug: 12015587
Change-Id: If795851f1cd078bef889b76a52e00d9b3c06ab11

10 years agoRetain display when creating specialized contexts.
Jeff Brown [Tue, 11 Mar 2014 04:24:37 +0000 (21:24 -0700)]
Retain display when creating specialized contexts.

Fixed a bug that cause Context.createPackageContext() to discard
display information.  Likewise also fixes issues where the
activity token, override configuration, user handle, and
restriction state might be discarded.

As part of this change, reworked how Contexts are created to make
initialization easier to understand and less error-prone.
The init() methods have been removed and most of the state is
now stored in final variables.

Bug: 12015587
Change-Id: If795851f1cd078bef889b76a52e00d9b3c06ab11

10 years agoam c48701a1: am 641d8aff: Merge "Fix possible invalid pointer index in swipe dismiss...
Justin Koh [Wed, 12 Mar 2014 00:49:44 +0000 (00:49 +0000)]
am c48701a1: am 641d8aff: Merge "Fix possible invalid pointer index in swipe dismiss." into klp-modular-dev

* commit 'c48701a134d3ba05e35d94da921abe1120b67185':
  Fix possible invalid pointer index in swipe dismiss.

10 years agoam 641d8aff: Merge "Fix possible invalid pointer index in swipe dismiss." into klp...
Justin Koh [Wed, 12 Mar 2014 00:47:20 +0000 (00:47 +0000)]
am 641d8aff: Merge "Fix possible invalid pointer index in swipe dismiss." into klp-modular-dev

* commit '641d8aff87cbb9ed5e84ce849e0da3d3962b5eb3':
  Fix possible invalid pointer index in swipe dismiss.

10 years agoMerge "Fix possible invalid pointer index in swipe dismiss." into klp-modular-dev
Justin Koh [Wed, 12 Mar 2014 00:44:22 +0000 (00:44 +0000)]
Merge "Fix possible invalid pointer index in swipe dismiss." into klp-modular-dev

10 years agoam f978f16e: resolved conflicts for merge of c76345a3 to klp-modular-dev-plus-aosp
Deepanshu Gupta [Tue, 11 Mar 2014 23:43:26 +0000 (23:43 +0000)]
am f978f16e: resolved conflicts for merge of c76345a3 to klp-modular-dev-plus-aosp

* commit 'f978f16e50374681b0ade2d14a5e39cedaea6c2f':
  Fix the delegate method signatures in LayoutLib

10 years agoresolved conflicts for merge of c76345a3 to klp-modular-dev-plus-aosp
Deepanshu Gupta [Tue, 11 Mar 2014 23:39:13 +0000 (16:39 -0700)]
resolved conflicts for merge of c76345a3 to klp-modular-dev-plus-aosp

Change-Id: Id0aae224e17651bc07aa3f5b1a06923603d025b8

10 years agoFix possible invalid pointer index in swipe dismiss.
Justin Koh [Thu, 6 Mar 2014 03:34:58 +0000 (19:34 -0800)]
Fix possible invalid pointer index in swipe dismiss.

Fix possible invalid pointer index in swipe dismiss: exit out if the pointer
index is -1. Also allow user to cancel this if in swipe mode.

Change-Id: I0f623ced0287679be8dd5c93ab6c67504b82fe9b

10 years agoam a54f852d: am ed28fc89: Utilize new Android LED constants. DO NOT MERGE
Michael Wright [Tue, 11 Mar 2014 23:26:39 +0000 (23:26 +0000)]
am a54f852d: am ed28fc89: Utilize new Android LED constants. DO NOT MERGE

* commit 'a54f852d3df7ac2e245ccffe8409b217330e5092':
  Utilize new Android LED constants. DO NOT MERGE

10 years agoam dd0db799: am 5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp...
Jose Lima [Tue, 11 Mar 2014 23:20:32 +0000 (23:20 +0000)]
am dd0db799: am 5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev

* commit 'dd0db799ee25833a8989a823299f039ac31fef58':
  Added LEANBACK_LAUNCHER Intent category

10 years agoam ee142967: am e5098b50: am e8af5e10: am 6d9ed0c3: Merge "DO NOT MERGE Debounce...
Robert Greenwalt [Tue, 11 Mar 2014 23:20:28 +0000 (23:20 +0000)]
am ee142967: am e5098b50: am e8af5e10: am 6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev

* commit 'ee142967f60388d73c3bb99f321a781aa07f1eec':
  DO NOT MERGE Debounce wifi country code Info

10 years agoam cb714ae6: am 74f36d31: am c48c9626: am 82ec1442: Merge "DO NOT MERGE Revert "Rever...
Zhihai Xu [Tue, 11 Mar 2014 23:20:25 +0000 (23:20 +0000)]
am cb714ae6: am 74f36d31: am c48c9626: am 82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev

* commit 'cb714ae68e3d1c0047fdb6980fabcafcd57b37b6':
  DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""

10 years agoam dbba6f07: am 2e76f5d8: am 5f683ca8: am 5243a760: Merge "DO NOT MERGE - Fix Airplan...
Vinit Deshapnde [Tue, 11 Mar 2014 23:20:22 +0000 (23:20 +0000)]
am dbba6f07: am 2e76f5d8: am 5f683ca8: am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev

* commit 'dbba6f076999afaad720c7c5657f7cbf9cdf2d14':
  DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi

10 years agoam b41c951f: am cb5f813b: am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator...
John Spurlock [Tue, 11 Mar 2014 23:20:19 +0000 (23:20 +0000)]
am b41c951f: am cb5f813b: am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs

* commit 'b41c951fb1b2a27d3278948f809e90a7c203ca4b':
  Fix doc typos in Vibrator.java

10 years agoam 60d18cea: am 21207588: am 790c5a4c: am 29de5063: Merge "fix some typos for GoogleA...
Scott Main [Tue, 11 Mar 2014 23:20:16 +0000 (23:20 +0000)]
am 60d18cea: am 21207588: am 790c5a4c: am 29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs

* commit '60d18ceaf12ec24cea18d21121845dc4edcd5272':
  fix some typos for GoogleApiClient doc

10 years agoam a17a7000: am 2ada4e31: am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs
Scott Main [Tue, 11 Mar 2014 23:20:13 +0000 (23:20 +0000)]
am a17a7000: am 2ada4e31: am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs

* commit 'a17a7000f2e1c5d38694c6329a8efdcad48fe1d5':
  fix typos

10 years agoam ed28fc89: Utilize new Android LED constants. DO NOT MERGE
Michael Wright [Tue, 11 Mar 2014 23:16:25 +0000 (23:16 +0000)]
am ed28fc89: Utilize new Android LED constants. DO NOT MERGE

* commit 'ed28fc89e3085a88c6bd8b4269988150f3eceb56':
  Utilize new Android LED constants. DO NOT MERGE

10 years agoam 792f38dd: Merge "Fix the delegate method signatures in LayoutLib"
Deepanshu Gupta [Tue, 11 Mar 2014 23:16:18 +0000 (16:16 -0700)]
am 792f38dd: Merge "Fix the delegate method signatures in LayoutLib"

* commit '792f38ddd9e8d25b2c8bf0d67363dbfa56550636':
  Fix the delegate method signatures in LayoutLib

10 years agoMerge "Reduce wake lock noise in battery history."
Dianne Hackborn [Tue, 11 Mar 2014 22:59:20 +0000 (22:59 +0000)]
Merge "Reduce wake lock noise in battery history."

10 years agoMerge "Fix SDK build"
RoboErik [Tue, 11 Mar 2014 22:46:05 +0000 (22:46 +0000)]
Merge "Fix SDK build"

10 years agoFix SDK build
RoboErik [Tue, 11 Mar 2014 22:43:46 +0000 (15:43 -0700)]
Fix SDK build

Change-Id: I4bf73294cc9d970e17d1cddb840b53cc42155d14

10 years agoRemove experimental perspective projection
Chris Craik [Tue, 11 Mar 2014 17:48:43 +0000 (10:48 -0700)]
Remove experimental perspective projection

Change-Id: Iad688c8395ccd4673cc129973802b5f01dfb45ba

10 years agoMerge "Improve shadow tessellation performance"
Chris Craik [Tue, 11 Mar 2014 22:35:46 +0000 (22:35 +0000)]
Merge "Improve shadow tessellation performance"

10 years agoImprove shadow tessellation performance
Chris Craik [Sat, 8 Mar 2014 02:27:49 +0000 (18:27 -0800)]
Improve shadow tessellation performance

- Tune and simplify shadow parameters
- Remove additional inner rings
- Improve polygon ray casting algorithm

Change-Id: If0f28b2d66ae0480b675942bb65e8fcd2864425d

10 years agoUtilize new Android LED constants. DO NOT MERGE
Michael Wright [Fri, 18 Oct 2013 22:26:48 +0000 (15:26 -0700)]
Utilize new Android LED constants. DO NOT MERGE

Also, have EventHub manage game controllers' player LEDs

Change-Id: Ic7dba19ad236a3c7d1aff5d3f938bd239b98d51d

10 years agoMerge "Fix the delegate method signatures in LayoutLib"
Deepanshu Gupta [Tue, 11 Mar 2014 21:22:39 +0000 (21:22 +0000)]
Merge "Fix the delegate method signatures in LayoutLib"

10 years agoam 5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev
Jose Lima [Tue, 11 Mar 2014 19:19:11 +0000 (19:19 +0000)]
am 5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev

* commit '5f0c0498a1382ef955cccca95920ec878fe2a64c':
  Added LEANBACK_LAUNCHER Intent category

10 years agoam e5098b50: am e8af5e10: am 6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country...
Robert Greenwalt [Tue, 11 Mar 2014 19:19:07 +0000 (19:19 +0000)]
am e5098b50: am e8af5e10: am 6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev

* commit 'e5098b502c28d8f40ff3b39070fc5fb7f1a3e445':
  DO NOT MERGE Debounce wifi country code Info

10 years agoam 74f36d31: am c48c9626: am 82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY...
Zhihai Xu [Tue, 11 Mar 2014 19:19:05 +0000 (19:19 +0000)]
am 74f36d31: am c48c9626: am 82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev

* commit '74f36d31892d8fdfddbecc7bf3018aa3a190e5fb':
  DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""

10 years agoam 2e76f5d8: am 5f683ca8: am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode +...
Vinit Deshapnde [Tue, 11 Mar 2014 19:19:02 +0000 (19:19 +0000)]
am 2e76f5d8: am 5f683ca8: am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev

* commit '2e76f5d8a282f4f948f88208e77dc4b3d0ec6634':
  DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi

10 years agoam cb5f813b: am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into...
John Spurlock [Tue, 11 Mar 2014 19:18:59 +0000 (19:18 +0000)]
am cb5f813b: am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs

* commit 'cb5f813bb642e72777643dcd2bcbd92cc2039388':
  Fix doc typos in Vibrator.java

10 years agoam 21207588: am 790c5a4c: am 29de5063: Merge "fix some typos for GoogleApiClient...
Scott Main [Tue, 11 Mar 2014 19:18:55 +0000 (19:18 +0000)]
am 21207588: am 790c5a4c: am 29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs

* commit '212075889eab9aab2c48881803888a1b827d77ba':
  fix some typos for GoogleApiClient doc

10 years agoam 2ada4e31: am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs
Scott Main [Tue, 11 Mar 2014 19:18:48 +0000 (19:18 +0000)]
am 2ada4e31: am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs

* commit '2ada4e310d728756fc9bf69086987bfe215dc487':
  fix typos

10 years agoInitial changes for recents.
Winson Chung [Fri, 7 Mar 2014 23:06:19 +0000 (15:06 -0800)]
Initial changes for recents.

Change-Id: Ide2c202b4a5b25410f0f32bd0a81ccf817ede38f

10 years agoMerge "Move the provisioning intents to DevicePolicyManager."
Jessica Hummel [Tue, 11 Mar 2014 18:40:52 +0000 (18:40 +0000)]
Merge "Move the provisioning intents to DevicePolicyManager."

10 years agoMerge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev
Jose Lima [Tue, 11 Mar 2014 18:08:53 +0000 (18:08 +0000)]
Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev

10 years agoMove the provisioning intents to DevicePolicyManager.
Jessica Hummel [Thu, 6 Mar 2014 16:13:12 +0000 (16:13 +0000)]
Move the provisioning intents to DevicePolicyManager.

Change-Id: Ibde867b193e64c1fda8d9c84b0d1be36a1592035

10 years agoam e8af5e10: am 6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into...
Robert Greenwalt [Tue, 11 Mar 2014 17:44:20 +0000 (17:44 +0000)]
am e8af5e10: am 6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev

* commit 'e8af5e10e04697acb26b47e5d60b99e5c61a020c':
  DO NOT MERGE Debounce wifi country code Info

10 years agoam c48c9626: am 82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE...
Zhihai Xu [Tue, 11 Mar 2014 17:43:56 +0000 (17:43 +0000)]
am c48c9626: am 82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev

* commit 'c48c9626bd2eb91aab33a034baf139aa2b92671d':
  DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""

10 years agoam 5f683ca8: am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interactio...
Vinit Deshapnde [Tue, 11 Mar 2014 17:43:50 +0000 (17:43 +0000)]
am 5f683ca8: am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev

* commit '5f683ca80611c3e98c91f631ee05dccf3e7e0227':
  DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi

10 years agoam 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs
John Spurlock [Tue, 11 Mar 2014 17:43:46 +0000 (17:43 +0000)]
am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs

* commit '0a3cb2ce1b2472b7e4ca6739eaeaa50975abf6ab':
  Fix doc typos in Vibrator.java

10 years agoam 790c5a4c: am 29de5063: Merge "fix some typos for GoogleApiClient doc" into klp...
Scott Main [Tue, 11 Mar 2014 17:43:42 +0000 (17:43 +0000)]
am 790c5a4c: am 29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs

* commit '790c5a4c06e0ceee8fbdbed575e93ef257124569':
  fix some typos for GoogleApiClient doc

10 years agoam 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs
Scott Main [Tue, 11 Mar 2014 17:43:38 +0000 (17:43 +0000)]
am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs

* commit '7b0c111b5f3595de5cac61b0657a6f2ecb7e77bd':
  fix typos

10 years agoAdded LEANBACK_LAUNCHER Intent category
Jose Lima [Tue, 11 Mar 2014 17:41:39 +0000 (10:41 -0700)]
Added LEANBACK_LAUNCHER Intent category

Change-Id: I4f5ccfa9725106f558972c73abbe3f9435267c75

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 11 Mar 2014 17:33:22 +0000 (17:33 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 11 Mar 2014 17:33:17 +0000 (17:33 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoMerge "AudioTrack write method with data in ByteBuffer"
Jean-Michel Trivi [Tue, 11 Mar 2014 17:12:59 +0000 (17:12 +0000)]
Merge "AudioTrack write method with data in ByteBuffer"

10 years agoReduce wake lock noise in battery history.
Dianne Hackborn [Sat, 8 Mar 2014 22:39:10 +0000 (14:39 -0800)]
Reduce wake lock noise in battery history.

When the work source of a wake lock was changed, this would
cause the old wake lock to be released in battery stats before
the new one was acquired (the power manager would correctly
keep holding the associated wake lock).  This resulted in a
pointless entry in the battery history showing the last wake
lock being released and a new one acquired.

This change adds a new path in to battery stats to report
when a wake lock has changed, allowing it to acquire the
new wake locks first before the old ones, so it can't drop
down to zero wake locks.  This also provides better timing
information, as the same current time can be used for both
operations.

In addition, added a new kind of history entry for the
current time, so you can tell when in actual world clock
time the battery data is happening.

Change-Id: Ibbf2eed83bb93f31f60267889b7bc5b9e71e355f

10 years agoFix scaleNinePatch.
Narayan Kamath [Tue, 11 Mar 2014 16:50:30 +0000 (16:50 +0000)]
Fix scaleNinePatch.

Use yDivs for yDivs, and not xDivs.

bug: 13394494
Change-Id: I4ca5fe33cf61922a894f071927ef08b2d7db7dd0

10 years agoam 4645c5ba: am a8706527: am b071a07d: am a79af364: Merge "Remove java.io.tmpdir...
Narayan Kamath [Tue, 11 Mar 2014 15:24:42 +0000 (15:24 +0000)]
am 4645c5ba: am a8706527: am b071a07d: am a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."

* commit '4645c5ba33e6b8c2623f8e3c86d4ed584f9708a9':
  Remove java.io.tmpdir assignment in AndroidRuntime (again).

10 years agoam a8706527: am b071a07d: am a79af364: Merge "Remove java.io.tmpdir assignment in...
Narayan Kamath [Tue, 11 Mar 2014 15:21:04 +0000 (15:21 +0000)]
am a8706527: am b071a07d: am a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."

* commit 'a870652789cc2b06b921fe66aa1bf48d4fc3e97c':
  Remove java.io.tmpdir assignment in AndroidRuntime (again).

10 years agoam b071a07d: am a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime...
Narayan Kamath [Tue, 11 Mar 2014 15:17:45 +0000 (15:17 +0000)]
am b071a07d: am a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."

* commit 'b071a07da89a8736fa4fd757f9a6c6e990d0e858':
  Remove java.io.tmpdir assignment in AndroidRuntime (again).

10 years agoam a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."
Narayan Kamath [Tue, 11 Mar 2014 15:14:26 +0000 (08:14 -0700)]
am a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."

* commit 'a79af3647f7f93825b84cc25187527b5aac60a69':
  Remove java.io.tmpdir assignment in AndroidRuntime (again).

10 years agoMerge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."
Narayan Kamath [Tue, 11 Mar 2014 15:09:44 +0000 (15:09 +0000)]
Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."

10 years agoRemove java.io.tmpdir assignment in AndroidRuntime (again).
Narayan Kamath [Tue, 11 Mar 2014 15:02:10 +0000 (15:02 +0000)]
Remove java.io.tmpdir assignment in AndroidRuntime (again).

This was brought back by a bad merge conflict resolution
in change 0efbd9a463c848118c7685f4bfc8765a82caa761.

Change-Id: I0c7cbe8ee396293619eabf4d0a3c2f06c76bdd6e

10 years agoam ad35099a: am b485d8e1: am 194e77aa: am 0f3fd6c6: Merge "Remove stray logging state...
Narayan Kamath [Tue, 11 Mar 2014 12:11:39 +0000 (12:11 +0000)]
am ad35099a: am b485d8e1: am 194e77aa: am 0f3fd6c6: Merge "Remove stray logging statement."

* commit 'ad35099a87b52e1df86237911eecda5e12961ee4':
  Remove stray logging statement.

10 years agoam b485d8e1: am 194e77aa: am 0f3fd6c6: Merge "Remove stray logging statement."
Narayan Kamath [Tue, 11 Mar 2014 12:08:58 +0000 (12:08 +0000)]
am b485d8e1: am 194e77aa: am 0f3fd6c6: Merge "Remove stray logging statement."

* commit 'b485d8e1e405296307197ae07c6ed214be3b4f58':
  Remove stray logging statement.

10 years agoam 194e77aa: am 0f3fd6c6: Merge "Remove stray logging statement."
Narayan Kamath [Tue, 11 Mar 2014 12:06:00 +0000 (12:06 +0000)]
am 194e77aa: am 0f3fd6c6: Merge "Remove stray logging statement."

* commit '194e77aafe32cacc00f69b25bec6eeea67eb0205':
  Remove stray logging statement.

10 years agoam 0f3fd6c6: Merge "Remove stray logging statement."
Narayan Kamath [Tue, 11 Mar 2014 12:03:36 +0000 (05:03 -0700)]
am 0f3fd6c6: Merge "Remove stray logging statement."

* commit '0f3fd6c66e8376e62ed61dd2b92ea4807571b3de':
  Remove stray logging statement.

10 years agoMerge "Remove stray logging statement."
Narayan Kamath [Tue, 11 Mar 2014 12:00:54 +0000 (12:00 +0000)]
Merge "Remove stray logging statement."

10 years agoRemove stray logging statement.
Narayan Kamath [Tue, 11 Mar 2014 11:08:41 +0000 (11:08 +0000)]
Remove stray logging statement.

bug: https://code.google.com/p/android/issues/detail?id=66974
Change-Id: Ie34c102de143cf6aeb16c78778dda3ef5e928380

10 years agoMerge "Unify touch feedback drawable and reveal drawable"
Alan Viverette [Tue, 11 Mar 2014 02:10:56 +0000 (02:10 +0000)]
Merge "Unify touch feedback drawable and reveal drawable"

10 years agoUnify touch feedback drawable and reveal drawable
Alan Viverette [Tue, 11 Mar 2014 02:09:28 +0000 (19:09 -0700)]
Unify touch feedback drawable and reveal drawable

BUG: 13030730
Change-Id: I65a50a00bd76b80bb242b1573b89e443e2e143fe

10 years agoAudioTrack write method with data in ByteBuffer
Jean-Michel Trivi [Fri, 7 Feb 2014 17:39:34 +0000 (09:39 -0800)]
AudioTrack write method with data in ByteBuffer

New write method with data in ByteBuffer. Allows blocking and
 non-blocking write.
If the ByteBuffer is not direct, the implementation uses the
 existing implementation with a byte array.

Bug 7919023

Change-Id: I6935e3e05783d7d7672614b194941a87abbb50cf

10 years agoam 1c4d86c7: am f54d62dc: am fc7315c6: am 6d71e165: Merge "Round off when calculate...
Jeff Brown [Tue, 11 Mar 2014 00:38:11 +0000 (00:38 +0000)]
am 1c4d86c7: am f54d62dc: am fc7315c6: am 6d71e165: Merge "Round off when calculate next step in Seekbar"

* commit '1c4d86c7b4eba393058db62fc1e61c9dc30aaa82':
  Round off when calculate next step in Seekbar

10 years agoam 1491aaf5: am 14006523: am 33282d66: am a41ddccd: Merge "Fixed typo errors in docum...
Jeff Brown [Tue, 11 Mar 2014 00:38:01 +0000 (00:38 +0000)]
am 1491aaf5: am 14006523: am 33282d66: am a41ddccd: Merge "Fixed typo errors in documentation"

* commit '1491aaf503de47491bc97457c77bb51c0320793e':
  Fixed typo errors in documentation

10 years agoam 70c27436: am daa1c969: am aaf23a9a: am c3f5d694: Merge "Hang off call by power...
Jeff Brown [Tue, 11 Mar 2014 00:37:57 +0000 (00:37 +0000)]
am 70c27436: am daa1c969: am aaf23a9a: am c3f5d694: Merge "Hang off call by power button while screen is on"

* commit '70c274361ec6089c5ed9d1a62877d51b9ec1dcc8':
  Hang off call by power button while screen is on

10 years agoam 3c6bb4d4: am f2e837e5: am e7f7af96: am 35c8ebab: Merge "take account of RotationVe...
Jeff Brown [Tue, 11 Mar 2014 00:37:53 +0000 (00:37 +0000)]
am 3c6bb4d4: am f2e837e5: am e7f7af96: am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter"

* commit '3c6bb4d4ec58d03f023280c8be8d95d984c8d1f1':
  take account of RotationVector's new extra parameter

10 years agoMediaPlayer: fix int overflow issue in MediaTimeProvider
Lajos Molnar [Tue, 11 Mar 2014 00:21:49 +0000 (17:21 -0700)]
MediaPlayer: fix int overflow issue in MediaTimeProvider

Bug: 13394783
Change-Id: I228ded5cf198852fda867d136cd8b1aacd8b6584

10 years agoam f54d62dc: am fc7315c6: am 6d71e165: Merge "Round off when calculate next step...
Jeff Brown [Tue, 11 Mar 2014 00:19:07 +0000 (00:19 +0000)]
am f54d62dc: am fc7315c6: am 6d71e165: Merge "Round off when calculate next step in Seekbar"

* commit 'f54d62dc80b43a72adaa273836f00153ce7edc72':
  Round off when calculate next step in Seekbar