OSDN Git Service

android-x86/frameworks-base.git
9 years agoBurn in protection.
Filip Gruszczynski [Thu, 19 Feb 2015 21:05:03 +0000 (13:05 -0800)]
Burn in protection.

Bug: 19373758
Change-Id: I7242f73acadd21bdee03262b4205c8af0734fccb

9 years agoMerge "Force translucency from windowIsTranslucent on SwipeDismissLayout." into lmp...
Filip Gruszczynski [Wed, 25 Feb 2015 18:40:18 +0000 (18:40 +0000)]
Merge "Force translucency from windowIsTranslucent on SwipeDismissLayout." into lmp-mr1-modular-dev

9 years agoam 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
Jim Miller [Wed, 25 Feb 2015 18:17:13 +0000 (18:17 +0000)]
am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev

* commit '19847b07e81b9b29e3574ce6ab8acf7a958a1a63':
  Remove TrustAgent whitelisting API

9 years agoam b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
Jim Miller [Wed, 25 Feb 2015 18:09:54 +0000 (18:09 +0000)]
am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev

* commit 'b46e48067fd03b63fa5f5191651ac2a5d009e226':
  Remove TrustAgent whitelisting API

9 years agoMerge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
Jim Miller [Wed, 25 Feb 2015 18:04:57 +0000 (18:04 +0000)]
Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev

9 years agoam bb463806: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 25 Feb 2015 15:47:38 +0000 (15:47 +0000)]
am bb463806: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

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

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 25 Feb 2015 15:41:21 +0000 (15:41 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 25 Feb 2015 15:39:28 +0000 (07:39 -0800)]
Import translations. DO NOT MERGE

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

9 years agoam c2cbbb89: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 25 Feb 2015 14:13:06 +0000 (14:13 +0000)]
am c2cbbb89: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

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

9 years agoam a4f54454: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 25 Feb 2015 14:13:00 +0000 (14:13 +0000)]
am a4f54454: (-s ours) Import translations. DO NOT MERGE

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

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 25 Feb 2015 14:09:54 +0000 (14:09 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 25 Feb 2015 14:08:29 +0000 (06:08 -0800)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 25 Feb 2015 14:02:34 +0000 (06:02 -0800)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Wed, 25 Feb 2015 13:45:20 +0000 (13:45 +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 [Wed, 25 Feb 2015 13:44:54 +0000 (13:44 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 25 Feb 2015 13:41:18 +0000 (07:41 -0600)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 25 Feb 2015 13:41:09 +0000 (05:41 -0800)]
Import translations. DO NOT MERGE

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

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

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

9 years agoam 9afbbb2e: am 8ffb574a: am f7224396: am c427b721: am 41418826: Merge "docs: Android...
Joe Fernandez [Wed, 25 Feb 2015 13:27:07 +0000 (13:27 +0000)]
am 9afbbb2e: am 8ffb574a: am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs

* commit '9afbbb2e600936ef7a402fecd0402a3e59cf864e':
  docs: Android for Work developer landing page

9 years agoam d7cddbd2: am 7391b0a1: am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for...
Andrew Solovay [Wed, 25 Feb 2015 13:27:03 +0000 (13:27 +0000)]
am d7cddbd2: am 7391b0a1: am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller

* commit 'd7cddbd2d595cd5ee2cb9e7e05af8a760f265f84':
  docs: New doc for creating an AfW Work Policy Controller

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 8ffb574a: am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work...
Joe Fernandez [Wed, 25 Feb 2015 13:16:20 +0000 (13:16 +0000)]
am 8ffb574a: am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs

* commit '8ffb574a5087b2099cef5f629568375caa0ddc9c':
  docs: Android for Work developer landing page

9 years agoam 7391b0a1: am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an...
Andrew Solovay [Wed, 25 Feb 2015 13:16:15 +0000 (13:16 +0000)]
am 7391b0a1: am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller

* commit '7391b0a177f9ecf3c8e3a9657bbf1ae7000ce528':
  docs: New doc for creating an AfW Work Policy Controller

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 f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landin...
Joe Fernandez [Wed, 25 Feb 2015 13:09:56 +0000 (13:09 +0000)]
am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs

* commit 'f7224396ee8416630b9387995a79faae1ee68b7c':
  docs: Android for Work developer landing page

9 years agoam e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy...
Andrew Solovay [Wed, 25 Feb 2015 13:09:33 +0000 (13:09 +0000)]
am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller

* commit 'e64301e639e73f346a78584af2727bc98f3d81ae':
  docs: New doc for creating an AfW Work Policy Controller

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 c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into...
Joe Fernandez [Wed, 25 Feb 2015 08:06:01 +0000 (08:06 +0000)]
am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs

* commit 'c427b721b681b19f40e45ed82ae0c628f3f5b528':
  docs: Android for Work developer landing page

9 years agoam 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs
Joe Fernandez [Wed, 25 Feb 2015 07:59:48 +0000 (07:59 +0000)]
am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs

* commit '414188262311ec48235095a5dec622b24f7e69ef':
  docs: Android for Work developer landing page

9 years agoMerge "docs: Android for Work developer landing page" into lmp-docs
Joe Fernandez [Wed, 25 Feb 2015 07:52:29 +0000 (07:52 +0000)]
Merge "docs: Android for Work developer landing page" into lmp-docs

9 years agoam 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller
Andrew Solovay [Wed, 25 Feb 2015 07:49:37 +0000 (07:49 +0000)]
am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller

* commit '790b1bc864d9066ff691b0e12a4e14ef85566c50':
  docs: New doc for creating an AfW Work Policy Controller

9 years agoam d3cd0948: docs: New doc for creating an AfW Work Policy Controller
Andrew Solovay [Wed, 25 Feb 2015 07:42:44 +0000 (07:42 +0000)]
am d3cd0948: docs: New doc for creating an AfW Work Policy Controller

* commit 'd3cd0948c8c4662c8711433b756c82fbe2f7a3ad':
  docs: New doc for creating an AfW Work Policy Controller

9 years agodocs: New doc for creating an AfW Work Policy Controller
Andrew Solovay [Fri, 20 Feb 2015 01:57:50 +0000 (17:57 -0800)]
docs: New doc for creating an AfW Work Policy Controller

See first comment for doc stage location.

Change-Id: I0c9c0f849c049d33fc66e2bd8ac5ba284c7b9415

9 years agoRemove TrustAgent whitelisting API
Jim Miller [Wed, 25 Feb 2015 02:00:25 +0000 (18:00 -0800)]
Remove TrustAgent whitelisting API

Due to a bug caught late in the release, this API is broken
and should be removed from API 22 because it's too late for
a fix and there's no workaround.

Bug 19461292

Change-Id: Ib0757a4484b14afe7f83ae9527bb3f5f4834ee62

9 years agodocs: Android for Work developer landing page
Joe Fernandez [Fri, 20 Feb 2015 07:56:07 +0000 (23:56 -0800)]
docs: Android for Work developer landing page

Change-Id: I9886e82bd33357c3fc7296859d70c98747d8c14a

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 agoForce translucency from windowIsTranslucent on SwipeDismissLayout.
Filip Gruszczynski [Tue, 24 Feb 2015 02:05:27 +0000 (18:05 -0800)]
Force translucency from windowIsTranslucent on SwipeDismissLayout.

Bug: 18799741

Change-Id: Ifb05869f1bf080d7555d7728dc085c41cc2c277c

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 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 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 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 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 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 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 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 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 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 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

9 years agoFixes several typos.
David Friedman [Fri, 20 Feb 2015 17:40:06 +0000 (09:40 -0800)]
Fixes several typos.

Change-Id: Iea6463bb4f0e8c178d77a0e19544e7b2cbf8c3ca

9 years agoam b5e787c1: am 26b0d973: Merge "Fix change IME content description" into lmp-mr1-dev
Adrian Roos [Fri, 20 Feb 2015 14:39:30 +0000 (14:39 +0000)]
am b5e787c1: am 26b0d973: Merge "Fix change IME content description" into lmp-mr1-dev

* commit 'b5e787c1c5a1845e0b8de53f1452a7a6cdeb4c93':
  Fix change IME content description

9 years agoam 26b0d973: Merge "Fix change IME content description" into lmp-mr1-dev
Adrian Roos [Fri, 20 Feb 2015 14:32:44 +0000 (14:32 +0000)]
am 26b0d973: Merge "Fix change IME content description" into lmp-mr1-dev

* commit '26b0d973d8c2b05e6141fb4808fbb0a28cb7f713':
  Fix change IME content description

9 years agoMerge "Fix change IME content description" into lmp-mr1-dev
Adrian Roos [Fri, 20 Feb 2015 14:28:36 +0000 (14:28 +0000)]
Merge "Fix change IME content description" into lmp-mr1-dev

9 years agoam a8dbdb1c: am bb1c03e9: am a4fce24d: am e16f4393: am 506cba8b: Doc Update: fixed...
kmccormick [Thu, 19 Feb 2015 22:16:52 +0000 (22:16 +0000)]
am a8dbdb1c: am bb1c03e9: am a4fce24d: am e16f4393: am 506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.

* commit 'a8dbdb1c5a019ac6fbcd8c20d7837d80fc9e41b7':
  Doc Update: fixed unescaped angle brackets in code snippets.

9 years agoam bb1c03e9: am a4fce24d: am e16f4393: am 506cba8b: Doc Update: fixed unescaped angle...
kmccormick [Thu, 19 Feb 2015 22:11:29 +0000 (22:11 +0000)]
am bb1c03e9: am a4fce24d: am e16f4393: am 506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.

* commit 'bb1c03e9500e2a13044925c78a11d3c48a3a47ef':
  Doc Update: fixed unescaped angle brackets in code snippets.

9 years agoam a4fce24d: am e16f4393: am 506cba8b: Doc Update: fixed unescaped angle brackets...
kmccormick [Thu, 19 Feb 2015 22:04:51 +0000 (22:04 +0000)]
am a4fce24d: am e16f4393: am 506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.

* commit 'a4fce24d6652e3869f70ca9f549ef45661608114':
  Doc Update: fixed unescaped angle brackets in code snippets.