OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 611dea81: Step Counter documentation fix.
Aravind Akella [Fri, 22 Aug 2014 18:02:17 +0000 (18:02 +0000)]
am 611dea81: Step Counter documentation fix.

* commit '611dea81a2f061e3d44841a5312ad7922e03ef63':
  Step Counter documentation fix.

9 years agoMerge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Fri, 22 Aug 2014 17:17:26 +0000 (17:17 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Aug 2014 17:09:14 +0000 (10:09 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Aug 2014 17:05:53 +0000 (10:05 -0700)]
Import translations. DO NOT MERGE

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

9 years agoStep Counter documentation fix.
Aravind Akella [Wed, 20 Aug 2014 01:28:12 +0000 (18:28 -0700)]
Step Counter documentation fix.

Change-Id: I04921ca2bdfd10581f5582a025de617a506035b7
(cherry picked from commit 2ba8057d92d490a2492c528d857a9e9fc521e317)

9 years agoam 152cc584: Merge "docs: Added additional documentation for specifying OAuth scopes...
Quddus Chong [Thu, 21 Aug 2014 23:01:54 +0000 (23:01 +0000)]
am 152cc584: Merge "docs: Added additional documentation for specifying OAuth scopes. bug: 12650251" into klp-modular-docs

* commit '152cc5845737a92daec57c8934b74e6b01071266':
  docs: Added additional documentation for specifying OAuth scopes. bug: 12650251

9 years agoMerge "docs: Added additional documentation for specifying OAuth scopes. bug: 1265025...
Quddus Chong [Thu, 21 Aug 2014 22:55:14 +0000 (22:55 +0000)]
Merge "docs: Added additional documentation for specifying OAuth scopes. bug: 12650251" into klp-modular-docs

9 years agodocs: Added additional documentation for specifying OAuth scopes.
Quddus Chong [Wed, 20 Aug 2014 01:01:11 +0000 (18:01 -0700)]
docs: Added additional documentation for specifying OAuth scopes.
bug: 12650251

Change-Id: I8905ed63208aff82d0c0caf1b3503831f121b09e

9 years agoam 82957e38: Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular...
Ricardo Cervera [Thu, 21 Aug 2014 15:31:34 +0000 (15:31 +0000)]
am 82957e38: Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs

* commit '82957e38b2d38ea41fdf930d722157287eab0590':
  docs: Fixed typo in intents page. Bug: 16949177

9 years agoMerge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs
Ricardo Cervera [Thu, 21 Aug 2014 15:22:10 +0000 (15:22 +0000)]
Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs

9 years agoam 7bf7b779: Merge "Docs: Fixed typo \'Fore\'" into klp-modular-docs
Rich Slogar [Thu, 21 Aug 2014 00:57:30 +0000 (00:57 +0000)]
am 7bf7b779: Merge "Docs: Fixed typo \'Fore\'" into klp-modular-docs

* commit '7bf7b77923cda854fb46bb40473282ae10e1dea4':
  Docs: Fixed typo 'Fore'

9 years agoMerge "Docs: Fixed typo 'Fore'" into klp-modular-docs
Rich Slogar [Thu, 21 Aug 2014 00:47:21 +0000 (00:47 +0000)]
Merge "Docs: Fixed typo 'Fore'" into klp-modular-docs

9 years agoam 262b4147: Merge "docs: Fixed bug in declaring layout page. Bug: 16815916" into...
Ricardo Cervera [Wed, 20 Aug 2014 23:50:07 +0000 (23:50 +0000)]
am 262b4147: Merge "docs: Fixed bug in declaring layout page. Bug: 16815916" into klp-modular-docs

* commit '262b41478d77bdebb78acccf795c14e9c097773e':
  docs: Fixed bug in declaring layout page. Bug: 16815916

9 years agoam c5807808: docs: Fixed typo in Wear training class. Bug: 16709202
Ricardo Cervera [Wed, 20 Aug 2014 23:50:03 +0000 (23:50 +0000)]
am c5807808: docs: Fixed typo in Wear training class. Bug: 16709202

* commit 'c58078085a3fb30947d7982536ebe0a06cdf4b62':
  docs: Fixed typo in Wear training class. Bug: 16709202

9 years agoDocs: Fixed typo 'Fore'
Rich Slogar [Wed, 20 Aug 2014 23:29:02 +0000 (16:29 -0700)]
Docs: Fixed typo 'Fore'

Change-Id: I67cacf2ca11be27f9352cd8bddb1f9e6ff8a65c6

9 years agodocs: Fixed typo in intents page. Bug: 16949177
Ricardo Cervera [Wed, 20 Aug 2014 22:57:44 +0000 (15:57 -0700)]
docs: Fixed typo in intents page. Bug: 16949177

Change-Id: Ie3ae033932134058008dd17124f1bbd43e24a65d

9 years agodocs: Fixed typo in Wear training class. Bug: 16709202
Ricardo Cervera [Wed, 20 Aug 2014 22:51:17 +0000 (15:51 -0700)]
docs: Fixed typo in Wear training class. Bug: 16709202

Change-Id: I4649546f2ebe2dba7266a3260d0aa4388a2a7fe1

9 years agoMerge "docs: Fixed bug in declaring layout page. Bug: 16815916" into klp-modular...
Ricardo Cervera [Wed, 20 Aug 2014 23:24:45 +0000 (23:24 +0000)]
Merge "docs: Fixed bug in declaring layout page. Bug: 16815916" into klp-modular-docs

9 years agodocs: Fixed bug in declaring layout page. Bug: 16815916
Ricardo Cervera [Wed, 20 Aug 2014 23:03:47 +0000 (16:03 -0700)]
docs: Fixed bug in declaring layout page. Bug: 16815916

Change-Id: I8990488f45e7a09c948f5be006457205665b84a1

9 years agoVirtualDisplayAdapter: Set the transaction surface even if NULL
Jesse Hall [Mon, 5 May 2014 23:09:32 +0000 (16:09 -0700)]
VirtualDisplayAdapter: Set the transaction surface even if NULL

Bug: 17116728
Change-Id: I55e4a2e575cfd3788fbdb90b050dac486976c1b6

9 years agoam 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into...
Andrew Solovay [Mon, 18 Aug 2014 21:08:17 +0000 (21:08 +0000)]
am 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs

* commit '8319455afca3dc4c8f799d7752dfa44780cf8855':
  docs: Documented new fields returned by getSkuDetails().

9 years agoam fb1f5bde: docs: Removing radio from music intents
Ricardo Cervera [Mon, 18 Aug 2014 19:28:02 +0000 (19:28 +0000)]
am fb1f5bde: docs: Removing radio from music intents

* commit 'fb1f5bdef03844547152f921dcaa044269b5a0cb':
  docs: Removing radio from music intents

9 years agodocs: Removing radio from music intents
Ricardo Cervera [Mon, 18 Aug 2014 19:13:04 +0000 (12:13 -0700)]
docs: Removing radio from music intents

Change-Id: Iaf645d692b247994dd8c12835c387ff296b26019

9 years agoam d0842384: docs: Updated links for Android Studio 0.8.6
Ricardo Cervera [Mon, 18 Aug 2014 16:40:01 +0000 (16:40 +0000)]
am d0842384: docs: Updated links for Android Studio 0.8.6

* commit 'd0842384cb9d6a19f129434457c88de64f2b0b06':
  docs: Updated links for Android Studio 0.8.6

9 years agodocs: Updated links for Android Studio 0.8.6
Ricardo Cervera [Mon, 18 Aug 2014 16:03:59 +0000 (09:03 -0700)]
docs: Updated links for Android Studio 0.8.6

Change-Id: Ic01263930b94232445704c03854414bd07ca4c33

9 years agoam b6c923a2: am 59eedf52: Layoutlib: Update wifi and battery icon for KK
Deepanshu Gupta [Sat, 16 Aug 2014 05:53:49 +0000 (05:53 +0000)]
am b6c923a2: am 59eedf52: Layoutlib: Update wifi and battery icon for KK

* commit 'b6c923a2dfd86eb56a8f83d5a27f21996331e436':
  Layoutlib: Update wifi and battery icon for KK

9 years agoam 59eedf52: Layoutlib: Update wifi and battery icon for KK
Deepanshu Gupta [Sat, 16 Aug 2014 05:45:42 +0000 (05:45 +0000)]
am 59eedf52: Layoutlib: Update wifi and battery icon for KK

* commit '59eedf528ca29a32b6d7f358f5076929f8fbb164':
  Layoutlib: Update wifi and battery icon for KK

9 years agoMerge "docs: Documented new fields returned by getSkuDetails()." into klp-modular...
Andrew Solovay [Mon, 18 Aug 2014 21:01:17 +0000 (21:01 +0000)]
Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs

9 years agoLayoutlib: Update wifi and battery icon for KK
Deepanshu Gupta [Sat, 16 Aug 2014 00:48:52 +0000 (17:48 -0700)]
Layoutlib: Update wifi and battery icon for KK

Change-Id: Ic5c80e83366bb7672049a6bf726d11cf6717f400
(cherry picked from commit 59eedf528ca29a32b6d7f358f5076929f8fbb164)

9 years agoLayoutlib: Update wifi and battery icon for KK
Deepanshu Gupta [Sat, 16 Aug 2014 00:48:52 +0000 (17:48 -0700)]
Layoutlib: Update wifi and battery icon for KK

Change-Id: Ic5c80e83366bb7672049a6bf726d11cf6717f400

9 years agoMerge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Fri, 15 Aug 2014 22:26:23 +0000 (22:26 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Aug 2014 20:27:39 +0000 (13:27 -0700)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Fri, 15 Aug 2014 22:26:20 +0000 (22:26 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Aug 2014 20:28:46 +0000 (13:28 -0700)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Fri, 15 Aug 2014 22:26:17 +0000 (22:26 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Aug 2014 20:34:28 +0000 (13:34 -0700)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Fri, 15 Aug 2014 22:26:14 +0000 (22:26 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Aug 2014 20:36:47 +0000 (13:36 -0700)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Fri, 15 Aug 2014 22:26:12 +0000 (22:26 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Aug 2014 20:37:46 +0000 (13:37 -0700)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Fri, 15 Aug 2014 22:14:39 +0000 (22:14 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Aug 2014 19:52:49 +0000 (12:52 -0700)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Fri, 15 Aug 2014 22:14:37 +0000 (22:14 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Aug 2014 19:57:31 +0000 (12:57 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Aug 2014 19:54:24 +0000 (12:54 -0700)]
Import translations. DO NOT MERGE

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

9 years agodocs: Documented new fields returned by getSkuDetails().
Andrew Solovay [Thu, 14 Aug 2014 00:25:30 +0000 (17:25 -0700)]
docs: Documented new fields returned by getSkuDetails().

Per bug b/9221265, documented new price_amount_micros and
price_currency_code fields.

Doc is staged to:

http://asolovay.mtv:9265/google/play/billing/billing_reference.html#getSkuDetails

bug: 9221265
Change-Id: I06798692b3329e5e0d1fe3aaf215d9c97f2363c0

9 years agoam a0197180: Merge "Doc Change: Remove obsolete sample link." into klp-modular-docs
kmccormick [Wed, 13 Aug 2014 18:43:20 +0000 (18:43 +0000)]
am a0197180: Merge "Doc Change: Remove obsolete sample link." into klp-modular-docs

* commit 'a0197180e76bad29a4b6eaed5c43cd922bc1803d':
  Doc Change: Remove obsolete sample link.

9 years agoam bcdbe1a0: Merge "Doc Change: remove obsolete links." into klp-modular-docs
kmccormick [Wed, 13 Aug 2014 17:05:01 +0000 (17:05 +0000)]
am bcdbe1a0: Merge "Doc Change: remove obsolete links." into klp-modular-docs

* commit 'bcdbe1a0fcb9c24cdc4ee402f29f279ef2b9e7fa':
  Doc Change: remove obsolete links.

9 years agoam efbbb182: Merge "cherrypick from klp-docs docs: security consideration for Android...
Robert Ly [Wed, 13 Aug 2014 16:07:40 +0000 (16:07 +0000)]
am efbbb182: Merge "cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5" into klp-modular-docs

* commit 'efbbb18241c8b74a2813b48af2aeff8f03fbe8e7':
  cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5

9 years agoMerge "cherrypick from klp-docs docs: security consideration for Android <4.2 Change...
Robert Ly [Wed, 13 Aug 2014 16:02:35 +0000 (16:02 +0000)]
Merge "cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5" into klp-modular-docs

9 years agoMerge "Doc Change: Remove obsolete sample link." into klp-modular-docs
kmccormick [Wed, 13 Aug 2014 18:39:52 +0000 (18:39 +0000)]
Merge "Doc Change: Remove obsolete sample link." into klp-modular-docs

9 years agoDoc Change: Remove obsolete sample link.
kmccormick [Wed, 13 Aug 2014 01:08:01 +0000 (18:08 -0700)]
Doc Change: Remove obsolete sample link.

Fix for:

b/16685592

Change-Id: If15951ee783e8c05b4dfb32983a87a3518cdbe82

9 years agoMerge "Doc Change: remove obsolete links." into klp-modular-docs
kmccormick [Wed, 13 Aug 2014 17:02:15 +0000 (17:02 +0000)]
Merge "Doc Change: remove obsolete links." into klp-modular-docs

9 years agoDoc Change: remove obsolete links.
kmccormick [Wed, 13 Aug 2014 00:51:44 +0000 (17:51 -0700)]
Doc Change: remove obsolete links.

Fixes for:

b/16494813

Change-Id: I2aaae520cdafadf8707f2fbf38c10588f0de2987

9 years agoam ac605c84: Merge "docs: Updated L Preview Overview and support page with informatio...
Quddus Chong [Tue, 12 Aug 2014 22:42:19 +0000 (22:42 +0000)]
am ac605c84: Merge "docs: Updated L Preview Overview and support page with information about using NDK r10 for 64-bit support." into klp-modular-docs

* commit 'ac605c8488a3092c1451ac29cad35ff2ff9f7f98':
  docs: Updated L Preview Overview and support page with information about using NDK r10 for 64-bit support.

9 years agoMerge "docs: Updated L Preview Overview and support page with information about using...
Quddus Chong [Tue, 12 Aug 2014 22:38:14 +0000 (22:38 +0000)]
Merge "docs: Updated L Preview Overview and support page with information about using NDK r10 for 64-bit support." into klp-modular-docs

9 years agodocs: Updated L Preview Overview and support page with information about using NDK...
Quddus Chong [Fri, 18 Jul 2014 20:21:48 +0000 (13:21 -0700)]
docs: Updated L Preview Overview and support page with information about using NDK r10 for 64-bit support.

Change-Id: Ib759f6a187a8a1298d01f8485a8e05e5d9b67e27

9 years agoam 41e836a6: Merge "docs: update dashboard" into klp-modular-docs
Robert Ly [Tue, 12 Aug 2014 19:45:28 +0000 (19:45 +0000)]
am 41e836a6: Merge "docs: update dashboard" into klp-modular-docs

* commit '41e836a644b1fa767fdcce629bbb4753e0f5ecd6':
  docs: update dashboard

9 years agoMerge "docs: update dashboard" into klp-modular-docs
Robert Ly [Tue, 12 Aug 2014 19:40:31 +0000 (19:40 +0000)]
Merge "docs: update dashboard" into klp-modular-docs

9 years agodocs: update dashboard
Robert Ly [Tue, 12 Aug 2014 19:26:37 +0000 (12:26 -0700)]
docs: update dashboard

Change-Id: I3a11a4ffbd9e5544c598bdebacd67e236305602f

9 years agoam 6bb49e4a: Merge "docs: Fixed minor issue with Studio shortcuts" into klp-modular...
Ricardo Cervera [Mon, 11 Aug 2014 15:17:27 +0000 (15:17 +0000)]
am 6bb49e4a: Merge "docs: Fixed minor issue with Studio shortcuts" into klp-modular-docs

* commit '6bb49e4ae629e3740cd3a623fcc115f895f3188c':
  docs: Fixed minor issue with Studio shortcuts

9 years agoMerge "docs: Fixed minor issue with Studio shortcuts" into klp-modular-docs
Ricardo Cervera [Mon, 11 Aug 2014 15:13:54 +0000 (15:13 +0000)]
Merge "docs: Fixed minor issue with Studio shortcuts" into klp-modular-docs

9 years agodocs: Fixed minor issue with Studio shortcuts
Ricardo Cervera [Thu, 7 Aug 2014 20:47:39 +0000 (13:47 -0700)]
docs: Fixed minor issue with Studio shortcuts

See https://code.google.com/p/android/issues/detail?id=74316
Updated keymap for new files and added note on choosing keymaps.

Change-Id: I3c1e1a8ab0f344040ea2627734f7d5959c842799

9 years agoam 46baa5ff: Merge "docs: Release notes for ADT 23.0.3" into klp-modular-docs
Ricardo Cervera [Thu, 7 Aug 2014 23:17:16 +0000 (23:17 +0000)]
am 46baa5ff: Merge "docs: Release notes for ADT 23.0.3" into klp-modular-docs

* commit '46baa5ff7dadad76fc5503a7c2be6d22eb00da57':
  docs: Release notes for ADT 23.0.3

9 years agocherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id...
Scott Rowe [Thu, 7 Aug 2014 18:42:09 +0000 (11:42 -0700)]
cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5

Change-Id: I9838519ad3e0c2fb3957829fc448b1ae6bd1d62b

9 years agoMerge "docs: Simplify and update the Signing page. Bug: 16296405" into klp-modular...
Ricardo Cervera [Thu, 7 Aug 2014 16:00:13 +0000 (16:00 +0000)]
Merge "docs: Simplify and update the Signing page. Bug: 16296405" into klp-modular-docs

9 years agoMerge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp-modular...
Robert Ly [Thu, 7 Aug 2014 15:50:25 +0000 (15:50 +0000)]
Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp-modular-docs

9 years agoMerge "docs: Release notes for ADT 23.0.3" into klp-modular-docs
Ricardo Cervera [Thu, 7 Aug 2014 23:14:28 +0000 (23:14 +0000)]
Merge "docs: Release notes for ADT 23.0.3" into klp-modular-docs

9 years agodocs: Release notes for ADT 23.0.3
Ricardo Cervera [Thu, 7 Aug 2014 21:49:03 +0000 (14:49 -0700)]
docs: Release notes for ADT 23.0.3

Change-Id: I9e68f4ecaec47b8a139f32773ef9916c3011061b

9 years agoMerge "Move wakelock release to handleMessage" into klp-modular-dev
Prashant Malani [Thu, 7 Aug 2014 22:07:09 +0000 (22:07 +0000)]
Merge "Move wakelock release to handleMessage" into klp-modular-dev

9 years agoam 6f273458: Merge "docs: remove "developer preview" and point to Android-specific...
Robert Ly [Thu, 7 Aug 2014 21:59:43 +0000 (21:59 +0000)]
am 6f273458: Merge "docs: remove "developer preview" and point to Android-specific doc" into klp-modular-docs

* commit '6f273458fb9de10e07f5876e85f9f80592bf52b2':
  docs: remove "developer preview" and point to Android-specific doc

9 years agoam edcf7c51: Merge "docs: Simplify and update the Signing page. Bug: 16296405" into...
Ricardo Cervera [Thu, 7 Aug 2014 16:03:27 +0000 (16:03 +0000)]
am edcf7c51: Merge "docs: Simplify and update the Signing page. Bug: 16296405" into klp-modular-docs

* commit 'edcf7c51676e3b4d0481dcdc9c2e128f7f4f2e5d':
  docs: Simplify and update the Signing page. Bug: 16296405

9 years agoam 8e115e64: Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)....
Robert Ly [Thu, 7 Aug 2014 15:55:10 +0000 (15:55 +0000)]
am 8e115e64: Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp-modular-docs

* commit '8e115e6460f5bfe5e682dda6e816b9d8c84bc525':
  docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).

9 years agoMove wakelock release to handleMessage
Prashant Malani [Wed, 6 Aug 2014 23:49:53 +0000 (16:49 -0700)]
Move wakelock release to handleMessage

There were certain code paths in handleDockStateChange() that were
exiting without releasing the wakelock. So we move the release to the
calling function to prevent stray held wakelocks.

Bug: 16841895

Change-Id: I8ae4d2ab8f775c42a893d3bcdef34321c5f631a6
Signed-off-by: Prashant Malani <pmalani@google.com>
9 years agoMerge "docs: remove "developer preview" and point to Android-specific doc" into klp...
Robert Ly [Thu, 7 Aug 2014 21:55:43 +0000 (21:55 +0000)]
Merge "docs: remove "developer preview" and point to Android-specific doc" into klp-modular-docs

9 years agoam 904d7711: am 7b561be3: am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am...
Deepanshu Gupta [Wed, 6 Aug 2014 22:51:47 +0000 (22:51 +0000)]
am 904d7711: am 7b561be3: am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs

* commit '904d77118bab63139174470ef728ca9a53e75a15':
  Fix SystemProperties in LayoutLib.

9 years agoam 7b561be3: am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am...
Deepanshu Gupta [Wed, 6 Aug 2014 22:45:23 +0000 (22:45 +0000)]
am 7b561be3: am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs

* commit '7b561be3a6fedebfce412cecd8c36d6686f6576c':
  Fix SystemProperties in LayoutLib.

9 years agoam 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am...
Deepanshu Gupta [Wed, 6 Aug 2014 22:37:10 +0000 (22:37 +0000)]
am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs

* commit '09c3c2edb2391d3ffed9a07ec360b9f75b9f7637':
  Fix SystemProperties in LayoutLib.

9 years agoam ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am...
Deepanshu Gupta [Wed, 6 Aug 2014 22:30:06 +0000 (22:30 +0000)]
am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs

* commit 'ba31d628621f3d49195d141dabff30a7665f3b50':
  Fix SystemProperties in LayoutLib.

9 years agoam db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolve...
Deepanshu Gupta [Wed, 6 Aug 2014 22:25:50 +0000 (22:25 +0000)]
am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs

* commit 'db94ea9ed03dbaa0ca075a433a986d7e414e8f8d':
  Fix SystemProperties in LayoutLib.

9 years agoam f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts...
Deepanshu Gupta [Wed, 6 Aug 2014 22:21:54 +0000 (22:21 +0000)]
am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs

* commit 'f970d2c201649843b8d51d094b865f16b15bc0bc':
  Fix SystemProperties in LayoutLib.

9 years agoam 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge...
Deepanshu Gupta [Wed, 6 Aug 2014 22:18:04 +0000 (22:18 +0000)]
am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs

* commit '79c3f678d21f6b3c058623217cbe5dd57a553fe8':
  Fix SystemProperties in LayoutLib.

9 years agoam 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to...
Deepanshu Gupta [Wed, 6 Aug 2014 22:13:18 +0000 (22:13 +0000)]
am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs

* commit '206c691bfdb3a6b78d35c7481365980dd387b8c9':
  Fix SystemProperties in LayoutLib.

9 years agoam 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs
Deepanshu Gupta [Wed, 6 Aug 2014 22:09:13 +0000 (22:09 +0000)]
am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs

* commit '72cf03a27a73e91d4a3eabf74e0384b310f4a5b2':
  Fix SystemProperties in LayoutLib.

9 years agoam 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs
Deepanshu Gupta [Wed, 6 Aug 2014 22:05:38 +0000 (22:05 +0000)]
am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs

* commit '3a544a81b3d2d529b2995f4b5db2077760d440b5':
  Fix SystemProperties in LayoutLib.

9 years agoresolved conflicts for merge of a232a68d to jb-mr1.1-docs
Deepanshu Gupta [Wed, 6 Aug 2014 22:00:14 +0000 (15:00 -0700)]
resolved conflicts for merge of a232a68d to jb-mr1.1-docs

Change-Id: I1ea220e3e0a81880db68abab87beab56dc4a336c

9 years agoresolved conflicts for merge of 5476cfee to jb-mr1-dev
Deepanshu Gupta [Wed, 6 Aug 2014 21:41:02 +0000 (14:41 -0700)]
resolved conflicts for merge of 5476cfee to jb-mr1-dev

Change-Id: I5197271e6fdd36fed9ca9f9b7221d9a99141a4b4

9 years agoam 505c675c: Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 21:28:24 +0000 (21:28 +0000)]
am 505c675c: Fix SystemProperties in LayoutLib.

* commit '505c675c3a536ac7c6ad264eb62542537532119c':
  Fix SystemProperties in LayoutLib.

9 years agoFix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 00:33:35 +0000 (17:33 -0700)]
Fix SystemProperties in LayoutLib.

Not all System Properties were used via Build class. Also, properties
like SDK_INT which called SystemProperties directly were not initialized
properly.

This change is essentially cherry picking of the relevant parts from the
following commits:
984749bf75c9ce9d3401b8410ea7d6276544b6ee
167bc25bceea9280bbe4858db4cb8233f86ce325

Bug: http://b.android.com/73046
Change-Id: Ia0fb467ee6d5fdedda500d57d02be20006f115df

9 years agoam ea12f0fd: Fix some sync adapter docs typos.
Andrew Flynn [Fri, 1 Aug 2014 18:29:27 +0000 (18:29 +0000)]
am ea12f0fd: Fix some sync adapter docs typos.

* commit 'ea12f0fd7ed236fa38f73cfff5be5fa36f016690':
  Fix some sync adapter docs typos.

9 years agoFix some sync adapter docs typos.
Andrew Flynn [Fri, 1 Aug 2014 18:19:48 +0000 (14:19 -0400)]
Fix some sync adapter docs typos.

Change-Id: Icb108bcfd7835049ff7d50660d1f8084ebc3c8e9

9 years agoam 69ed58ac: Merge "docs: Adding TIF one-pager to TV docs in L-Preview" into klp...
Joe Fernandez [Thu, 31 Jul 2014 18:35:02 +0000 (18:35 +0000)]
am 69ed58ac: Merge "docs: Adding TIF one-pager to TV docs in L-Preview" into klp-modular-docs

* commit '69ed58aced0e884d7758d84067134b04fbcee9c0':
  docs: Adding TIF one-pager to TV docs in L-Preview

9 years agodocs: Documenting fix for CVE-2014-0224 (SSL vulnerability).
Andrew Solovay [Wed, 30 Jul 2014 22:00:55 +0000 (15:00 -0700)]
docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).

Wrote a training page on how to use Google Play services to update a
device's security provider, which (int. al.) installs a fix against
the recently-discovered SSL CCS injection vulnerability.

Doc is staged to:

http://asolovay.mtv:9338/training/articles/security-gms-provider.html

bug: 16296338

Change-Id: I5b0dd052113998d585a46262b216ef0c1b432362

9 years agodocs: Simplify and update the Signing page. Bug: 16296405
Ricardo Cervera [Tue, 29 Jul 2014 23:22:52 +0000 (16:22 -0700)]
docs: Simplify and update the Signing page. Bug: 16296405

Change-Id: Id74525b00efdbb21e41895a4e0351b2450125a90

9 years agodocs: remove "developer preview" and point to Android-specific doc
Scott Rowe [Wed, 30 Jul 2014 18:16:24 +0000 (11:16 -0700)]
docs: remove "developer preview" and point to Android-specific doc

Change-Id: I0b9816c75e3ad98d7c9b4b5d887a4d079d618981

9 years agoam b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ...
Joe Fernandez [Wed, 30 Jul 2014 18:09:27 +0000 (18:09 +0000)]
am b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs

* commit 'b83127f0cf35a2d95684293818ca25171f6643e1':
  docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ

9 years agoMerge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modul...
Joe Fernandez [Wed, 30 Jul 2014 18:07:11 +0000 (18:07 +0000)]
Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs

9 years agodocs: Add adb over TCP/IP connection instructions to ADT-1 FAQ
Joe Fernandez [Tue, 29 Jul 2014 21:44:28 +0000 (14:44 -0700)]
docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ

Change-Id: Ifa8831e1594470ecf65761efea472de79aaf5ece

9 years agoMerge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views...
Alan Lau [Wed, 30 Jul 2014 17:39:37 +0000 (17:39 +0000)]
Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev

9 years agoRevert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""
Alan Lau [Wed, 30 Jul 2014 17:35:20 +0000 (17:35 +0000)]
Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""

This reverts commit cbeef01cce314e3a3977b042d8ec0744816c0df4.

Change-Id: I170ccb2264941e8a8b090b3bb553970414f0c4eb