OSDN Git Service

android-x86/frameworks-base.git
9 years agoam d6f1fbe0: am 9ac09b6c: am 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge...
Andrew Solovay [Wed, 25 Feb 2015 17:11:05 +0000 (17:11 +0000)]
am d6f1fbe0: am 9ac09b6c: am 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs

* commit 'd6f1fbe04cd7e099c1fa95967c1b7ddfad8669d3':
  docs: New "implementing app restrictions" doc

9 years agoam 7914fa5c: am 661b54ae: am 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain...
Chris Craik [Wed, 25 Feb 2015 17:10:59 +0000 (17:10 +0000)]
am 7914fa5c: am 661b54ae: am 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection

* commit '7914fa5ce6c521d4aa7b16a37a2f2df9263b123b':
  Explain behavior of boundless ripple projection

9 years agoam 9ac09b6c: am 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New...
Andrew Solovay [Wed, 25 Feb 2015 13:26:58 +0000 (13:26 +0000)]
am 9ac09b6c: am 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs

* commit '9ac09b6c553060d0104aa8fb3f38f4dfd81a8957':
  docs: New "implementing app restrictions" doc

9 years agoam 661b54ae: am 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior...
Chris Craik [Wed, 25 Feb 2015 13:26:53 +0000 (13:26 +0000)]
am 661b54ae: am 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection

* commit '661b54ae2a55461aa70c07d069550b911c14f800':
  Explain behavior of boundless ripple projection

9 years agoam 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing...
Andrew Solovay [Wed, 25 Feb 2015 13:16:11 +0000 (13:16 +0000)]
am 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs

* commit '93df7f0740a6d2044c29227ac6f684c74aa49ff7':
  docs: New "implementing app restrictions" doc

9 years agoam 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless...
Chris Craik [Wed, 25 Feb 2015 13:16:06 +0000 (13:16 +0000)]
am 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection

* commit '7fc5b5a129a3599c4a213117415e113a85d09745':
  Explain behavior of boundless ripple projection

9 years agoam 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restriction...
Andrew Solovay [Wed, 25 Feb 2015 13:09:29 +0000 (13:09 +0000)]
am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs

* commit '032e931a806d21d5fa190d1d28f8d65ee0fb4926':
  docs: New "implementing app restrictions" doc

9 years agoam a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection
Chris Craik [Wed, 25 Feb 2015 13:09:24 +0000 (13:09 +0000)]
am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection

* commit 'a9ad0fc793e3479e678441f2ed7abd47994ab74d':
  Explain behavior of boundless ripple projection

9 years agoam 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into...
Andrew Solovay [Wed, 25 Feb 2015 01:14:58 +0000 (01:14 +0000)]
am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs

* commit '6ffe1058463e5f4e65aa131796b37c0443d1b44b':
  docs: New "implementing app restrictions" doc

9 years agoam a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs
Andrew Solovay [Wed, 25 Feb 2015 01:07:25 +0000 (01:07 +0000)]
am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs

* commit 'a2ae6c9dbffe76bd5bc452fbd85ae92e5e3b9a5c':
  docs: New "implementing app restrictions" doc

9 years agoMerge "docs: New "implementing app restrictions" doc" into lmp-docs
Andrew Solovay [Wed, 25 Feb 2015 01:01:55 +0000 (01:01 +0000)]
Merge "docs: New "implementing app restrictions" doc" into lmp-docs

9 years agoam f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection
Chris Craik [Wed, 25 Feb 2015 00:26:51 +0000 (00:26 +0000)]
am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection

* commit 'f2525ed3f4fbb61f7a5e28d2673a3557fbb7773f':
  Explain behavior of boundless ripple projection

9 years agodocs: New "implementing app restrictions" doc
Andrew Solovay [Wed, 11 Feb 2015 21:12:18 +0000 (13:12 -0800)]
docs: New "implementing app restrictions" doc

New doc on app restrictions, aimed primarily at developers of
enterprise apps. See first comment for doc stage location.

Change-Id: I561780d218c78ae0dc4e4e54d925302c718f96ac

9 years agoam ea2a0648: Explain behavior of boundless ripple projection
Chris Craik [Wed, 25 Feb 2015 00:18:51 +0000 (00:18 +0000)]
am ea2a0648: Explain behavior of boundless ripple projection

* commit 'ea2a0648a85a059f7235fbae69df87ba511832cf':
  Explain behavior of boundless ripple projection

9 years agoExplain behavior of boundless ripple projection
Chris Craik [Tue, 24 Feb 2015 21:58:26 +0000 (13:58 -0800)]
Explain behavior of boundless ripple projection

Change-Id: I27d5c194750313d5d4e0d9dd541f3157b75340ab

9 years agoam 76507a64: am 72dc62ea: Merge "Track removal of refcounts from FileMap."
Narayan Kamath [Tue, 24 Feb 2015 13:04:43 +0000 (13:04 +0000)]
am 76507a64: am 72dc62ea: Merge "Track removal of refcounts from FileMap."

* commit '76507a64b530c757dc284f1f4d0807ffbfd9a701':
  Track removal of refcounts from FileMap.

9 years agoam 72dc62ea: Merge "Track removal of refcounts from FileMap."
Narayan Kamath [Tue, 24 Feb 2015 12:56:52 +0000 (12:56 +0000)]
am 72dc62ea: Merge "Track removal of refcounts from FileMap."

* commit '72dc62ead214bdec5c46d42f4e859b139dba0a00':
  Track removal of refcounts from FileMap.

9 years agoMerge "Track removal of refcounts from FileMap."
Narayan Kamath [Tue, 24 Feb 2015 12:50:55 +0000 (12:50 +0000)]
Merge "Track removal of refcounts from FileMap."

9 years agoam 948682d1: am 6e208cdd: Merge "Remove wrong javadoc comment"
Narayan Kamath [Tue, 24 Feb 2015 10:18:39 +0000 (10:18 +0000)]
am 948682d1: am 6e208cdd: Merge "Remove wrong javadoc comment"

* commit '948682d15f1a4a6676318213a49b50b967cfae27':
  Remove wrong javadoc comment

9 years agoam 6e208cdd: Merge "Remove wrong javadoc comment"
Narayan Kamath [Tue, 24 Feb 2015 10:11:52 +0000 (10:11 +0000)]
am 6e208cdd: Merge "Remove wrong javadoc comment"

* commit '6e208cddad3315c4e38accdb801908b2b9b5cbbd':
  Remove wrong javadoc comment

9 years agoMerge "Remove wrong javadoc comment"
Narayan Kamath [Tue, 24 Feb 2015 10:04:31 +0000 (10:04 +0000)]
Merge "Remove wrong javadoc comment"

9 years agoam c0c39516: Merge "Hold a wake lock while dozing when display updates are pending...
Joe LaPenna [Tue, 24 Feb 2015 00:46:48 +0000 (00:46 +0000)]
am c0c39516: Merge "Hold a wake lock while dozing when display updates are pending." into lmp-mr1-modular-dev

* commit 'c0c395162ff14b83694158663470ad60e065d9a9':
  Hold a wake lock while dozing when display updates are pending.

9 years agoMerge "Hold a wake lock while dozing when display updates are pending." into lmp...
Joe LaPenna [Tue, 24 Feb 2015 00:37:14 +0000 (00:37 +0000)]
Merge "Hold a wake lock while dozing when display updates are pending." into lmp-mr1-modular-dev

9 years agoam cdc70256: am f3c117ca: Merge "Add new IKeystoreService methods to KeyStore"
Chad Brubaker [Mon, 23 Feb 2015 22:53:07 +0000 (22:53 +0000)]
am cdc70256: am f3c117ca: Merge "Add new IKeystoreService methods to KeyStore"

* commit 'cdc70256f47b1797520f2bb5c63b21bd441ed8d9':
  Add new IKeystoreService methods to KeyStore

9 years agoam 1629f954: am 598f9b2a: Merge "Add Keymaster 0.4 binder API"
Chad Brubaker [Mon, 23 Feb 2015 22:53:01 +0000 (22:53 +0000)]
am 1629f954: am 598f9b2a: Merge "Add Keymaster 0.4 binder API"

* commit '1629f9543a48e93515395a10c50d0394f8be2774':
  Add Keymaster 0.4 binder API

9 years agoam f3c117ca: Merge "Add new IKeystoreService methods to KeyStore"
Chad Brubaker [Mon, 23 Feb 2015 22:45:11 +0000 (22:45 +0000)]
am f3c117ca: Merge "Add new IKeystoreService methods to KeyStore"

* commit 'f3c117ca0d116b01174732790be1939282d0a5a0':
  Add new IKeystoreService methods to KeyStore

9 years agoam 598f9b2a: Merge "Add Keymaster 0.4 binder API"
Chad Brubaker [Mon, 23 Feb 2015 22:45:01 +0000 (22:45 +0000)]
am 598f9b2a: Merge "Add Keymaster 0.4 binder API"

* commit '598f9b2a19bf5adf834f9a0edd12d4b4bc7ea27d':
  Add Keymaster 0.4 binder API

9 years agoMerge "Add new IKeystoreService methods to KeyStore"
Chad Brubaker [Mon, 23 Feb 2015 22:20:54 +0000 (22:20 +0000)]
Merge "Add new IKeystoreService methods to KeyStore"

9 years agoMerge "Add Keymaster 0.4 binder API"
Chad Brubaker [Mon, 23 Feb 2015 22:20:37 +0000 (22:20 +0000)]
Merge "Add Keymaster 0.4 binder API"

9 years agoAdd new IKeystoreService methods to KeyStore
Chad Brubaker [Wed, 11 Feb 2015 05:33:23 +0000 (21:33 -0800)]
Add new IKeystoreService methods to KeyStore

Add wrappers for all the new IKeystoreService keymaster 0.4 methods to
android.security.KeyStore.

Change-Id: Icb5500cfffb62d1af326edf326e1b9b67e5cece9

9 years agoAdd Keymaster 0.4 binder API
Chad Brubaker [Wed, 21 Jan 2015 22:00:55 +0000 (14:00 -0800)]
Add Keymaster 0.4 binder API

This adds the classes for creating and serializing arguments and results
from keymaster as well as the enum values from
hardware/libhardware/include/hardware/keymaster_defs.h which will be
needed for argument creation as well as converting keymaster error
codes into Java exceptions.

Change-Id: I61046756361d43d9f02eea370c2cbd07c3638ea3

9 years agoam 8f022fd3: am 5ed4fc9e: am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFram...
Deepanshu Gupta [Mon, 23 Feb 2015 19:29:31 +0000 (19:29 +0000)]
am 8f022fd3: am 5ed4fc9e: am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev

* commit '8f022fd323063f9cebb481be650db40cf5e486f3':
  Set forceFramework correctly for included layouts.

9 years agoam 5ed4fc9e: am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correct...
Deepanshu Gupta [Mon, 23 Feb 2015 19:22:31 +0000 (19:22 +0000)]
am 5ed4fc9e: am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev

* commit '5ed4fc9efda45d2411b8b9bc8cab55b8e270b13c':
  Set forceFramework correctly for included layouts.

9 years agoam 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for includ...
Deepanshu Gupta [Mon, 23 Feb 2015 19:15:57 +0000 (19:15 +0000)]
am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev

* commit '99142d298213e93f673057c2334b04b38f7e4450':
  Set forceFramework correctly for included layouts.

9 years agoam 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts...
Deepanshu Gupta [Mon, 23 Feb 2015 19:09:14 +0000 (19:09 +0000)]
am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev

* commit '3f8e2b9302fba0ace67fb0459d6ffb0884c4d80b':
  Set forceFramework correctly for included layouts.

9 years agoam 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev
Deepanshu Gupta [Mon, 23 Feb 2015 19:03:29 +0000 (19:03 +0000)]
am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev

* commit '30a67cd17af03e53b8be5638f7f70d2989a7cd78':
  Set forceFramework correctly for included layouts.

9 years agoMerge "Set forceFramework correctly for included layouts." into lmp-dev
Deepanshu Gupta [Mon, 23 Feb 2015 18:56:27 +0000 (18:56 +0000)]
Merge "Set forceFramework correctly for included layouts." into lmp-dev

9 years agoam 84e40b1f: am d77380b8: am 3570268b: am 09e9076d: am ab0f8ff7: am 88e0145f: Merge...
David Friedman [Mon, 23 Feb 2015 18:39:53 +0000 (18:39 +0000)]
am 84e40b1f: am d77380b8: am 3570268b: am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs

* commit '84e40b1f338eba0a352a6bf3a0f2801c21e17d59':
  Fixes several typos.

9 years agoam 2c689468: am fcbc8428: am f066c235: am 18c8a35f: am 8e604689: am 3c26756a: Merge...
David Friedman [Mon, 23 Feb 2015 18:39:47 +0000 (18:39 +0000)]
am 2c689468: am fcbc8428: am f066c235: am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs

* commit '2c6894685dff6c6f8bbb1af59cf9c8f4acb162c8':
  Update Google Play brand-info page. Bug: 18257984

9 years agoam d77380b8: am 3570268b: am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several...
David Friedman [Mon, 23 Feb 2015 18:33:08 +0000 (18:33 +0000)]
am d77380b8: am 3570268b: am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs

* commit 'd77380b856050a5d933cbd4cc0ada6192de65f48':
  Fixes several typos.

9 years agoam fcbc8428: am f066c235: am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google...
David Friedman [Mon, 23 Feb 2015 18:33:04 +0000 (18:33 +0000)]
am fcbc8428: am f066c235: am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs

* commit 'fcbc842878df5fbe3d8a62add407bb512179e28a':
  Update Google Play brand-info page. Bug: 18257984

9 years agoam 3570268b: am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos."...
David Friedman [Mon, 23 Feb 2015 18:26:10 +0000 (18:26 +0000)]
am 3570268b: am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs

* commit '3570268bcf1e4c375d8b592714f8b7be25819873':
  Fixes several typos.

9 years agoam f066c235: am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand...
David Friedman [Mon, 23 Feb 2015 18:26:06 +0000 (18:26 +0000)]
am f066c235: am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs

* commit 'f066c2358d48fdc2ecbc28af99bc8332a3d78ce1':
  Update Google Play brand-info page. Bug: 18257984

9 years agoam 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs
David Friedman [Mon, 23 Feb 2015 18:20:37 +0000 (18:20 +0000)]
am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs

* commit '09e9076ddfd5e9f738cd5096409ff3fb61174803':
  Fixes several typos.

9 years agoam 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page...
David Friedman [Mon, 23 Feb 2015 18:20:32 +0000 (18:20 +0000)]
am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs

* commit '18c8a35fa4e775c3b515e739b0f32981395914ad':
  Update Google Play brand-info page. Bug: 18257984

9 years agoam ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs
David Friedman [Mon, 23 Feb 2015 18:13:36 +0000 (18:13 +0000)]
am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs

* commit 'ab0f8ff740d314182ccc644f118a7f8ba6c4937e':
  Fixes several typos.

9 years agoam 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984...
David Friedman [Mon, 23 Feb 2015 18:13:32 +0000 (18:13 +0000)]
am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs

* commit '8e604689c8c8f8ad073e12094991daa712cd8f38':
  Update Google Play brand-info page. Bug: 18257984

9 years agoam 88e0145f: Merge "Fixes several typos." into lmp-docs
David Friedman [Mon, 23 Feb 2015 18:06:47 +0000 (18:06 +0000)]
am 88e0145f: Merge "Fixes several typos." into lmp-docs

* commit '88e0145fb82b6711527ab173e4dc817e3f430708':
  Fixes several typos.

9 years agoam 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs
David Friedman [Mon, 23 Feb 2015 18:06:43 +0000 (18:06 +0000)]
am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs

* commit '3c26756aefae228941588042d677424b54167aa7':
  Update Google Play brand-info page. Bug: 18257984

9 years agoMerge "Fixes several typos." into lmp-docs
David Friedman [Mon, 23 Feb 2015 18:05:35 +0000 (18:05 +0000)]
Merge "Fixes several typos." into lmp-docs

9 years agoMerge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs
David Friedman [Mon, 23 Feb 2015 18:02:25 +0000 (18:02 +0000)]
Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs

9 years agoSet forceFramework correctly for included layouts.
Deepanshu Gupta [Mon, 23 Feb 2015 17:18:08 +0000 (09:18 -0800)]
Set forceFramework correctly for included layouts.

Bug: http://b.android.com/151326
Change-Id: I759f6e1a7a1c83bbbb771ddbb92843a105acffa4

9 years agoam 87809139: (-s ours) am 4c58f127: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 23 Feb 2015 16:47:35 +0000 (16:47 +0000)]
am 87809139: (-s ours) am 4c58f127: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '87809139d223ae1e5629590ba7611b9b1da63cbb':
  Import translations. DO NOT MERGE

9 years agoam 4c58f127: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 23 Feb 2015 16:41:22 +0000 (16:41 +0000)]
am 4c58f127: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '4c58f1271d60554375d85598134fdc821563e78a':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 23 Feb 2015 16:34:41 +0000 (16:34 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

9 years agoTrack removal of refcounts from FileMap.
Narayan Kamath [Mon, 23 Feb 2015 15:47:54 +0000 (15:47 +0000)]
Track removal of refcounts from FileMap.

Use delete instead of release.

Change-Id: I25c841b368aa9d51e9259399b94cafa2bbb7a076

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Feb 2015 15:47:09 +0000 (07:47 -0800)]
Import translations. DO NOT MERGE

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

9 years agoam 84cd5f64: (-s ours) am e74331dc: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 23 Feb 2015 14:32:42 +0000 (14:32 +0000)]
am 84cd5f64: (-s ours) am e74331dc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '84cd5f64c340067b1a8e3e7a7c7d1e86ca155313':
  Import translations. DO NOT MERGE

9 years agoam 5f28b32c: (-s ours) am dc82f4ce: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Feb 2015 14:27:02 +0000 (14:27 +0000)]
am 5f28b32c: (-s ours) am dc82f4ce: (-s ours) Import translations. DO NOT MERGE

* commit '5f28b32ce6f5fe99af76b2c8e8c95e9fd148a530':
  Import translations. DO NOT MERGE

9 years agoam e74331dc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 23 Feb 2015 14:26:47 +0000 (14:26 +0000)]
am e74331dc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

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

9 years agoam dc82f4ce: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Feb 2015 14:20:49 +0000 (14:20 +0000)]
am dc82f4ce: (-s ours) Import translations. DO NOT MERGE

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

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 23 Feb 2015 14:20:06 +0000 (14:20 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Feb 2015 14:18:26 +0000 (06:18 -0800)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Feb 2015 14:12:16 +0000 (06:12 -0800)]
Import translations. DO NOT MERGE

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

9 years agoam 5211dfd5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Mon, 23 Feb 2015 13:55:42 +0000 (13:55 +0000)]
am 5211dfd5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

* commit '5211dfd5b49b4e0ed1dbd6bb06e3f96244b55134':
  Import translations. DO NOT MERGE

9 years agoam 1f4e01f2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Mon, 23 Feb 2015 13:55:37 +0000 (13:55 +0000)]
am 1f4e01f2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

* commit '1f4e01f2b30e713cfb679fcb81286ba4a2fd7b53':
  Import translations. DO NOT MERGE

9 years agoam 7aaaacc1: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Feb 2015 13:55:31 +0000 (13:55 +0000)]
am 7aaaacc1: (-s ours) Import translations. DO NOT MERGE

* commit '7aaaacc1d1f9c2928c1d4d5df457163eebbdc36f':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Mon, 23 Feb 2015 13:52:34 +0000 (13:52 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Mon, 23 Feb 2015 13:51:59 +0000 (13:51 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Feb 2015 13:50:48 +0000 (05:50 -0800)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Feb 2015 13:50:45 +0000 (07:50 -0600)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Feb 2015 13:44:35 +0000 (05:44 -0800)]
Import translations. DO NOT MERGE

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

9 years agoam c90df076: am 6b492e78: Merge "Clean up Javadocs for UEventObserver"
Narayan Kamath [Mon, 23 Feb 2015 11:00:51 +0000 (11:00 +0000)]
am c90df076: am 6b492e78: Merge "Clean up Javadocs for UEventObserver"

* commit 'c90df0768a9be3e40d7c1edfdfb28af7bd25d98e':
  Clean up Javadocs for UEventObserver

9 years agoam 6b492e78: Merge "Clean up Javadocs for UEventObserver"
Narayan Kamath [Mon, 23 Feb 2015 10:54:40 +0000 (10:54 +0000)]
am 6b492e78: Merge "Clean up Javadocs for UEventObserver"

* commit '6b492e78115833f0093d1517483728b574121c07':
  Clean up Javadocs for UEventObserver

9 years agoMerge "Clean up Javadocs for UEventObserver"
Narayan Kamath [Mon, 23 Feb 2015 10:50:18 +0000 (10:50 +0000)]
Merge "Clean up Javadocs for UEventObserver"

9 years agoClean up Javadocs for UEventObserver
Valter Strods [Tue, 19 Aug 2014 20:42:18 +0000 (23:42 +0300)]
Clean up Javadocs for UEventObserver

This commit removes a couple of apostrophes from the word "UEvents" as
the apostrophes would only be needed if something that belongs to the
UEvent was being talked about. Instead, the UEvents are being talked
about themselves - as a bunch.

Change-Id: I6a7908c6b73c0739102b632d2499e0f1e3c2d47f

9 years agoam 92c4f175: am d002e027: Merge "Fix \'fuchsia\' typo."
Elliott Hughes [Sat, 21 Feb 2015 17:15:00 +0000 (17:15 +0000)]
am 92c4f175: am d002e027: Merge "Fix \'fuchsia\' typo."

* commit '92c4f1756d4ae8ef1082f159f7133ad811f235d4':
  Fix 'fuchsia' typo.

9 years agoam d002e027: Merge "Fix \'fuchsia\' typo."
Elliott Hughes [Sat, 21 Feb 2015 17:09:46 +0000 (17:09 +0000)]
am d002e027: Merge "Fix \'fuchsia\' typo."

* commit 'd002e02750b51fed3da41a2b4b222824df8d1a10':
  Fix 'fuchsia' typo.

9 years agoMerge "Fix 'fuchsia' typo."
Elliott Hughes [Sat, 21 Feb 2015 17:04:21 +0000 (17:04 +0000)]
Merge "Fix 'fuchsia' typo."

9 years agoFix 'fuchsia' typo.
Elliott Hughes [Sat, 21 Feb 2015 03:07:41 +0000 (19:07 -0800)]
Fix 'fuchsia' typo.

Bug: https://code.google.com/p/android/issues/detail?id=152142
Change-Id: Ib45f2d19d52fe9d95d560d37296d50cba190cb83

9 years agoam 5f21a4dc: am cd0425d6: am aba93780: am 5b60b1a0: am a91f6d00: am 4a99918b: Merge...
Rich Slogar [Sat, 21 Feb 2015 01:35:38 +0000 (01:35 +0000)]
am 5f21a4dc: am cd0425d6: am aba93780: am 5b60b1a0: am a91f6d00: am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs

* commit '5f21a4dc7d2f34759e8035a1a98d0c8e4794286c':
  docs: android plugin revisions page v2

9 years agoam cd0425d6: am aba93780: am 5b60b1a0: am a91f6d00: am 4a99918b: Merge "docs: android...
Rich Slogar [Sat, 21 Feb 2015 01:29:13 +0000 (01:29 +0000)]
am cd0425d6: am aba93780: am 5b60b1a0: am a91f6d00: am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs

* commit 'cd0425d6e28ffba9bf256159bdb9ff883b09f638':
  docs: android plugin revisions page v2

9 years agoam aba93780: am 5b60b1a0: am a91f6d00: am 4a99918b: Merge "docs: android plugin revis...
Rich Slogar [Sat, 21 Feb 2015 01:09:58 +0000 (01:09 +0000)]
am aba93780: am 5b60b1a0: am a91f6d00: am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs

* commit 'aba93780b47472f411737744957af00ae8d12220':
  docs: android plugin revisions page v2

9 years agoam 5b60b1a0: am a91f6d00: am 4a99918b: Merge "docs: android plugin revisions page...
Rich Slogar [Sat, 21 Feb 2015 01:04:52 +0000 (01:04 +0000)]
am 5b60b1a0: am a91f6d00: am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs

* commit '5b60b1a0401afb4d1addf53ca40facb5b5f6c0ee':
  docs: android plugin revisions page v2

9 years agoam a91f6d00: am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp...
Rich Slogar [Sat, 21 Feb 2015 00:58:17 +0000 (00:58 +0000)]
am a91f6d00: am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs

* commit 'a91f6d0003d852fc744ce4ce3a14b0786ac2f26f':
  docs: android plugin revisions page v2

9 years agoam 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs
Rich Slogar [Sat, 21 Feb 2015 00:51:05 +0000 (00:51 +0000)]
am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs

* commit '4a99918b40329e7d041db0de1e1863d688eb1b3b':
  docs: android plugin revisions page v2

9 years agoMerge "docs: android plugin revisions page v2" into lmp-docs
Rich Slogar [Sat, 21 Feb 2015 00:44:49 +0000 (00:44 +0000)]
Merge "docs: android plugin revisions page v2" into lmp-docs

9 years agoUpdate Google Play brand-info page.
David Friedman [Fri, 13 Feb 2015 03:43:35 +0000 (19:43 -0800)]
Update Google Play brand-info page.
Bug: 18257984

Change-Id: I8f41ace9bfef4b7fe1c7ad8b5fd4ea92f1438f4c

9 years agoam e2b5c881: am 5ecbd6ad: am 677a1754: am 969848c4: am f900a1f4: am 81752cf5: Merge...
Luan Nguyen [Sat, 21 Feb 2015 00:13:39 +0000 (00:13 +0000)]
am e2b5c881: am 5ecbd6ad: am 677a1754: am 969848c4: am f900a1f4: am 81752cf5: Merge "docs: Fix issue with older devices section not expanding" into lmp-docs

* commit 'e2b5c88157c6ab26a85f52a86e936e25983ed1c0':
  docs: Fix issue with older devices section not expanding

9 years agoam 5ecbd6ad: am 677a1754: am 969848c4: am f900a1f4: am 81752cf5: Merge "docs: Fix...
Luan Nguyen [Sat, 21 Feb 2015 00:07:22 +0000 (00:07 +0000)]
am 5ecbd6ad: am 677a1754: am 969848c4: am f900a1f4: am 81752cf5: Merge "docs: Fix issue with older devices section not expanding" into lmp-docs

* commit '5ecbd6ad6909afe2f9c80d63670b9aa8850acc3e':
  docs: Fix issue with older devices section not expanding

9 years agoam 677a1754: am 969848c4: am f900a1f4: am 81752cf5: Merge "docs: Fix issue with older...
Luan Nguyen [Sat, 21 Feb 2015 00:00:01 +0000 (00:00 +0000)]
am 677a1754: am 969848c4: am f900a1f4: am 81752cf5: Merge "docs: Fix issue with older devices section not expanding" into lmp-docs

* commit '677a175481a5d4eed73168a02406f6226f2c0c57':
  docs: Fix issue with older devices section not expanding

9 years agoam 969848c4: am f900a1f4: am 81752cf5: Merge "docs: Fix issue with older devices...
Luan Nguyen [Fri, 20 Feb 2015 23:54:15 +0000 (23:54 +0000)]
am 969848c4: am f900a1f4: am 81752cf5: Merge "docs: Fix issue with older devices section not expanding" into lmp-docs

* commit '969848c4484b5430e00cac7c317cc5e35e7ec8f5':
  docs: Fix issue with older devices section not expanding

9 years agoam f900a1f4: am 81752cf5: Merge "docs: Fix issue with older devices section not expan...
Luan Nguyen [Fri, 20 Feb 2015 23:48:00 +0000 (23:48 +0000)]
am f900a1f4: am 81752cf5: Merge "docs: Fix issue with older devices section not expanding" into lmp-docs

* commit 'f900a1f48abde96e41f40f61d3610b6245a9f94c':
  docs: Fix issue with older devices section not expanding

9 years agoam 81752cf5: Merge "docs: Fix issue with older devices section not expanding" into...
Luan Nguyen [Fri, 20 Feb 2015 23:40:47 +0000 (23:40 +0000)]
am 81752cf5: Merge "docs: Fix issue with older devices section not expanding" into lmp-docs

* commit '81752cf5148b93ef84f8890cb04876344924eae8':
  docs: Fix issue with older devices section not expanding

9 years agoMerge "docs: Fix issue with older devices section not expanding" into lmp-docs
Luan Nguyen [Fri, 20 Feb 2015 23:36:16 +0000 (23:36 +0000)]
Merge "docs: Fix issue with older devices section not expanding" into lmp-docs

9 years agoam a15ac5fe: am adb52ef7: Merge "Implement finalizer for RS contexts."
Jason Sams [Fri, 20 Feb 2015 20:07:56 +0000 (20:07 +0000)]
am a15ac5fe: am adb52ef7: Merge "Implement finalizer for RS contexts."

* commit 'a15ac5fea3c88f908bf808d7b4cda276fb3f513f':
  Implement finalizer for RS contexts.

9 years agoam adb52ef7: Merge "Implement finalizer for RS contexts."
Jason Sams [Fri, 20 Feb 2015 20:00:40 +0000 (20:00 +0000)]
am adb52ef7: Merge "Implement finalizer for RS contexts."

* commit 'adb52ef7034d4d3e0eee58cedae2a343d29771b9':
  Implement finalizer for RS contexts.

9 years agoMerge "Implement finalizer for RS contexts."
Jason Sams [Fri, 20 Feb 2015 19:51:54 +0000 (19:51 +0000)]
Merge "Implement finalizer for RS contexts."

9 years agoHold a wake lock while dozing when display updates are pending.
Jeff Brown [Fri, 21 Nov 2014 02:04:05 +0000 (18:04 -0800)]
Hold a wake lock while dozing when display updates are pending.

When the display state is DOZE or DOZE_SUSPEND, assume this means
that the AP may go to sleep at any time so hold a wake lock for
a little while starting when traversals are scheduled to ensure
that the AP remains awake long enough to draw and post the frame
to the display hardware.

This patch is somewhat approximate but should be good enough for
most devices today.

Note that the implementation uses the window manager to ensure that
the window which wants to draw is actually visible before acquiring
the wake lock.  There is a cost to this test (a round-trip) which
should not be significant today since we do not expect apps to draw
more than one frame or two while dozing.  However, if we wanted to
support animations in general, we might want to optimize it or
eliminate the check altogether (since we can already account for
the app's use of the wake lock).

Another way to implement this functionality might be for the view
hierarchy to listen for the power manager to report that it has entered
a non-interactive power state before deciding to poke draw locks.
This would be somewhat more accurate than watching the display state.
Also, the draw lock timeout logic could be implemented more directly
instead of using an ordinary timed wake lock.

Bug: 18284212
Change-Id: I84b341c678303e8b7481bd1620e634fe82cc4350

9 years agodocs: android plugin revisions page v2
Rich Slogar [Wed, 18 Feb 2015 21:09:43 +0000 (13:09 -0800)]
docs: android plugin revisions page v2

Change-Id: Ifdefd66149a34590e3d195a9b290bc3be111caf2