OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 135b8207: am 1c3a8845: am 47a40013: Merge "Fix "@null" resource values in LayoutLi...
Deepanshu Gupta [Thu, 4 Sep 2014 04:35:58 +0000 (04:35 +0000)]
am 135b8207: am 1c3a8845: am 47a40013: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev

* commit '135b820789d393683df09f10631e7e9b16cfdb31':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]

9 years agoam 1c3a8845: am 47a40013: Merge "Fix "@null" resource values in LayoutLib. [DO NOT...
Deepanshu Gupta [Thu, 4 Sep 2014 04:24:04 +0000 (04:24 +0000)]
am 1c3a8845: am 47a40013: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev

* commit '1c3a884519dc5937bf321519d6adafb41a333bc1':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]

9 years agoam 47a40013: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into...
Deepanshu Gupta [Thu, 4 Sep 2014 04:14:31 +0000 (04:14 +0000)]
am 47a40013: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev

* commit '47a400131f026fd4afdf09e77fe82e79201c1458':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]

9 years agoam a780eee4: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp...
Deepanshu Gupta [Thu, 4 Sep 2014 02:22:53 +0000 (02:22 +0000)]
am a780eee4: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modular-dev

* commit 'a780eee46244062d699f76875fd05775c2ee92de':
  Resolve color xml attributes properly. [DO NOT MERGE]

9 years agoam 9776312a: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into...
Deepanshu Gupta [Thu, 4 Sep 2014 02:22:43 +0000 (02:22 +0000)]
am 9776312a: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-modular-dev

* commit '9776312a80f0072bf1d1fe8183e168f7d5879c4c':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]

9 years agoMerge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 4 Sep 2014 01:53:37 +0000 (01:53 +0000)]
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modular-dev

9 years agoMerge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 4 Sep 2014 01:50:27 +0000 (01:50 +0000)]
Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-modular-dev

9 years agoMerge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev
Deepanshu Gupta [Thu, 4 Sep 2014 01:50:05 +0000 (01:50 +0000)]
Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev

9 years agoam 048d8baa: am 0ccf80c3: Merge "docs: b/15790433 updated for xxhdpi and xxxhdpi...
Scott Rowe [Thu, 4 Sep 2014 00:13:02 +0000 (00:13 +0000)]
am 048d8baa: am 0ccf80c3: Merge "docs: b/15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs

* commit '048d8baaffadc28ee8e7bab0ce61a868c09c311a':
  docs: b/15790433 updated for xxhdpi and xxxhdpi

9 years agoam 0ccf80c3: Merge "docs: b/15790433 updated for xxhdpi and xxxhdpi" into klp-modular...
Scott Rowe [Wed, 3 Sep 2014 23:58:25 +0000 (23:58 +0000)]
am 0ccf80c3: Merge "docs: b/15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs

* commit '0ccf80c31dbf236ec8ffafc8c72f036c3137bc5a':
  docs: b/15790433 updated for xxhdpi and xxxhdpi

9 years agoMerge "docs: b/15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs
Scott Rowe [Wed, 3 Sep 2014 23:52:11 +0000 (23:52 +0000)]
Merge "docs: b/15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs

9 years agoam 15abafe2: am c0393e7f: Merge "docs: Docs for Android project view. Bug: 17108468...
Ricardo Cervera [Wed, 3 Sep 2014 23:37:46 +0000 (23:37 +0000)]
am 15abafe2: am c0393e7f: Merge "docs: Docs for Android project view. Bug: 17108468" into klp-modular-docs

* commit '15abafe2c0bbe034a63162ff409922225f55aed9':
  docs: Docs for Android project view. Bug: 17108468

9 years agoam 9de22952: am ab833be6: Merge "docs: Fix bug with Accessibility Services dev guide...
Joe Fernandez [Wed, 3 Sep 2014 23:29:46 +0000 (23:29 +0000)]
am 9de22952: am ab833be6: Merge "docs: Fix bug with Accessibility Services dev guide" into klp-modular-docs

* commit '9de229527e710a90b03a415a9b752cc6e2a11592':
  docs: Fix bug with Accessibility Services dev guide

9 years agoam c0393e7f: Merge "docs: Docs for Android project view. Bug: 17108468" into klp...
Ricardo Cervera [Wed, 3 Sep 2014 23:29:38 +0000 (23:29 +0000)]
am c0393e7f: Merge "docs: Docs for Android project view. Bug: 17108468" into klp-modular-docs

* commit 'c0393e7fba742027e2cb4b72cb9e7d9e52887516':
  docs: Docs for Android project view. Bug: 17108468

9 years agoMerge "docs: Docs for Android project view. Bug: 17108468" into klp-modular-docs
Ricardo Cervera [Wed, 3 Sep 2014 23:22:52 +0000 (23:22 +0000)]
Merge "docs: Docs for Android project view. Bug: 17108468" into klp-modular-docs

9 years agoam ab833be6: Merge "docs: Fix bug with Accessibility Services dev guide" into klp...
Joe Fernandez [Wed, 3 Sep 2014 23:18:16 +0000 (23:18 +0000)]
am ab833be6: Merge "docs: Fix bug with Accessibility Services dev guide" into klp-modular-docs

* commit 'ab833be68e3e51f6be032d552bc53802f3fc52f2':
  docs: Fix bug with Accessibility Services dev guide

9 years agoMerge "docs: Fix bug with Accessibility Services dev guide" into klp-modular-docs
Joe Fernandez [Wed, 3 Sep 2014 23:12:19 +0000 (23:12 +0000)]
Merge "docs: Fix bug with Accessibility Services dev guide" into klp-modular-docs

9 years agoam a32f29e2: am a4fe79a4: docs: Adding Sony logo to wear page
Ricardo Cervera [Wed, 3 Sep 2014 21:45:54 +0000 (21:45 +0000)]
am a32f29e2: am a4fe79a4: docs: Adding Sony logo to wear page

* commit 'a32f29e225e989fad682df91cb0a1cd36e7b7279':
  docs: Adding Sony logo to wear page

9 years agoam 734ef513: am 2d80f931: docs: Adding Sony logo to Wear partners
Ricardo Cervera [Wed, 3 Sep 2014 21:45:49 +0000 (21:45 +0000)]
am 734ef513: am 2d80f931: docs: Adding Sony logo to Wear partners

* commit '734ef51380a4f6fce0a633f56f9db5b6eef5be71':
  docs: Adding Sony logo to Wear partners

9 years agoam a4fe79a4: docs: Adding Sony logo to wear page
Ricardo Cervera [Wed, 3 Sep 2014 21:34:17 +0000 (21:34 +0000)]
am a4fe79a4: docs: Adding Sony logo to wear page

* commit 'a4fe79a4c4e36770c95f8450b664d7a1fa111004':
  docs: Adding Sony logo to wear page

9 years agoam 2d80f931: docs: Adding Sony logo to Wear partners
Ricardo Cervera [Wed, 3 Sep 2014 21:34:13 +0000 (21:34 +0000)]
am 2d80f931: docs: Adding Sony logo to Wear partners

* commit '2d80f9317fe69b932d5d9aeb9fc14017fab1af9c':
  docs: Adding Sony logo to Wear partners

9 years agodocs: Adding Sony logo to wear page
Ricardo Cervera [Wed, 3 Sep 2014 21:26:59 +0000 (14:26 -0700)]
docs: Adding Sony logo to wear page

Change-Id: I5e56ca313364d832bb26f7b07891381a0c2b55df

9 years agoam 1c9d1485: am 6d4873f5: am 0511ba50: Do not persist and restore the media button...
Jean-Michel Trivi [Wed, 3 Sep 2014 21:23:49 +0000 (21:23 +0000)]
am 1c9d1485: am 6d4873f5: am 0511ba50: Do not persist and restore the media button event receiver

* commit '1c9d1485f381d610152abd64bfaa6d5d963878d2':
  Do not persist and restore the media button event receiver

9 years agodocs: Adding Sony logo to Wear partners
Ricardo Cervera [Wed, 3 Sep 2014 21:17:06 +0000 (14:17 -0700)]
docs: Adding Sony logo to Wear partners

Change-Id: I3c4b52d647f0a942ef5d5daad6fb6d5197839f2d

9 years agoam 6d4873f5: am 0511ba50: Do not persist and restore the media button event receiver
Jean-Michel Trivi [Wed, 3 Sep 2014 21:11:13 +0000 (21:11 +0000)]
am 6d4873f5: am 0511ba50: Do not persist and restore the media button event receiver

* commit '6d4873f577774e5e7427e2675e4c6ff8049646be':
  Do not persist and restore the media button event receiver

9 years agoam 0511ba50: Do not persist and restore the media button event receiver
Jean-Michel Trivi [Wed, 3 Sep 2014 20:59:53 +0000 (20:59 +0000)]
am 0511ba50: Do not persist and restore the media button event receiver

* commit '0511ba506d30d0a517491a92eda8d001a441d557':
  Do not persist and restore the media button event receiver

9 years agoam da3b4363: DO NOT MERGE: Use a linear spline if there\'s a non-monotonic brightness...
Michael Wright [Tue, 2 Sep 2014 22:02:23 +0000 (22:02 +0000)]
am da3b4363: DO NOT MERGE: Use a linear spline if there\'s a non-monotonic brightness curve

* commit 'da3b43633fe86d69aab5cab52826e76e01f18d63':
  DO NOT MERGE: Use a linear spline if there's a non-monotonic brightness curve

9 years agoDO NOT MERGE: Use a linear spline if there's a non-monotonic brightness curve
Michael Wright [Fri, 29 Aug 2014 00:42:16 +0000 (17:42 -0700)]
DO NOT MERGE: Use a linear spline if there's a non-monotonic brightness curve

Some devices may contain things like transflective displays where
they actually want the backlight brightness to decrease in the face
of high ambient light scenarios. In the interest of time, just use a
linear interpolation based on the brightness control points for these
cases but in the future we should consider adding a non-monotonic
cubic spline.

Bug: 15611140
Change-Id: I308ad00943d916866ee8d2507a41b7032e6b524e

9 years agodocs: Fix bug with Accessibility Services dev guide
Joe Fernandez [Fri, 29 Aug 2014 23:24:15 +0000 (16:24 -0700)]
docs: Fix bug with Accessibility Services dev guide

b/11448573

Change-Id: I778c26f86c4a2cb3ebef9f3e75b5d544269486dc

9 years agoam 6208e7b5: am 1014b9aa: Merge "docs: remove references to resource browser; point...
Scott Rowe [Fri, 29 Aug 2014 21:17:08 +0000 (21:17 +0000)]
am 6208e7b5: am 1014b9aa: Merge "docs: remove references to resource browser; point to SDK instead" into klp-modular-docs

* commit '6208e7b56080956ffc48ade8d0b0f038b901cb23':
  docs: remove references to resource browser; point to SDK instead

9 years agoam 1014b9aa: Merge "docs: remove references to resource browser; point to SDK instead...
Scott Rowe [Fri, 29 Aug 2014 21:04:16 +0000 (21:04 +0000)]
am 1014b9aa: Merge "docs: remove references to resource browser; point to SDK instead" into klp-modular-docs

* commit '1014b9aa491d4d7dd4d4fc2510e7b6e6b3b4654d':
  docs: remove references to resource browser; point to SDK instead

9 years agoMerge "docs: remove references to resource browser; point to SDK instead" into klp...
Scott Rowe [Fri, 29 Aug 2014 20:52:52 +0000 (20:52 +0000)]
Merge "docs: remove references to resource browser; point to SDK instead" into klp-modular-docs

9 years agoam cafad301: am 82521171: Merge "docs: add warning to redirects file" into klp-modula...
Joe Fernandez [Wed, 27 Aug 2014 16:16:13 +0000 (16:16 +0000)]
am cafad301: am 82521171: Merge "docs: add warning to redirects file" into klp-modular-docs

* commit 'cafad30176ad621f3d943cab942af2187bdec7dc':
  docs: add warning to redirects file

9 years agoam df139acf: am 1cf6ff30: Merge "docs: Fixed Google Play Services version number...
Ricardo Cervera [Wed, 27 Aug 2014 16:05:10 +0000 (16:05 +0000)]
am df139acf: am 1cf6ff30: Merge "docs: Fixed Google Play Services version number. Bug: 17195954" into klp-modular-docs

* commit 'df139acff19cdbca43d9cc312653f03463e645ed':
  docs: Fixed Google Play Services version number. Bug: 17195954

9 years agoam 37e3f101: am 4f0fedd5: Merge "docs: Changed studio links to HTTPS from HTTP. Bug...
Ricardo Cervera [Wed, 27 Aug 2014 16:05:05 +0000 (16:05 +0000)]
am 37e3f101: am 4f0fedd5: Merge "docs: Changed studio links to HTTPS from HTTP. Bug: 17295924" into klp-modular-docs

* commit '37e3f10174bbe0308147323e8fcdf01ae09c5622':
  docs: Changed studio links to HTTPS from HTTP. Bug: 17295924

9 years agoam 82521171: Merge "docs: add warning to redirects file" into klp-modular-docs
Joe Fernandez [Wed, 27 Aug 2014 16:04:47 +0000 (16:04 +0000)]
am 82521171: Merge "docs: add warning to redirects file" into klp-modular-docs

* commit '825211712c2af5a2b9190662adf3fc93264eefd4':
  docs: add warning to redirects file

9 years agoMerge "docs: add warning to redirects file" into klp-modular-docs
Joe Fernandez [Wed, 27 Aug 2014 15:57:04 +0000 (15:57 +0000)]
Merge "docs: add warning to redirects file" into klp-modular-docs

9 years agoam cde64643: am d91deea5: Merge "docs: Fixed notification background bug. Bug: 168016...
Ricardo Cervera [Wed, 27 Aug 2014 15:54:29 +0000 (15:54 +0000)]
am cde64643: am d91deea5: Merge "docs: Fixed notification background bug. Bug: 16801684" into klp-modular-docs

* commit 'cde64643f9ff0ba3de5757520bead74d4ac52a19':
  docs: Fixed notification background bug. Bug: 16801684

9 years agoam 1cf6ff30: Merge "docs: Fixed Google Play Services version number. Bug: 17195954...
Ricardo Cervera [Wed, 27 Aug 2014 15:54:28 +0000 (15:54 +0000)]
am 1cf6ff30: Merge "docs: Fixed Google Play Services version number. Bug: 17195954" into klp-modular-docs

* commit '1cf6ff306e992711c1d6682ed5d69701669fdce3':
  docs: Fixed Google Play Services version number. Bug: 17195954

9 years agoam 4f0fedd5: Merge "docs: Changed studio links to HTTPS from HTTP. Bug: 17295924...
Ricardo Cervera [Wed, 27 Aug 2014 15:54:25 +0000 (15:54 +0000)]
am 4f0fedd5: Merge "docs: Changed studio links to HTTPS from HTTP. Bug: 17295924" into klp-modular-docs

* commit '4f0fedd5017563408436c8fa7702766a487e724f':
  docs: Changed studio links to HTTPS from HTTP. Bug: 17295924

9 years agoMerge "docs: Fixed Google Play Services version number. Bug: 17195954" into klp-modul...
Ricardo Cervera [Wed, 27 Aug 2014 15:49:33 +0000 (15:49 +0000)]
Merge "docs: Fixed Google Play Services version number. Bug: 17195954" into klp-modular-docs

9 years agoMerge "docs: Changed studio links to HTTPS from HTTP. Bug: 17295924" into klp-modular...
Ricardo Cervera [Wed, 27 Aug 2014 15:44:26 +0000 (15:44 +0000)]
Merge "docs: Changed studio links to HTTPS from HTTP. Bug: 17295924" into klp-modular-docs

9 years agodocs: Changed studio links to HTTPS from HTTP. Bug: 17295924
Ricardo Cervera [Wed, 27 Aug 2014 15:28:20 +0000 (08:28 -0700)]
docs: Changed studio links to HTTPS from HTTP. Bug: 17295924

Change-Id: Icafcdba235a22912780253003182479619e16ca1

9 years agoam d91deea5: Merge "docs: Fixed notification background bug. Bug: 16801684" into...
Ricardo Cervera [Wed, 27 Aug 2014 15:40:35 +0000 (15:40 +0000)]
am d91deea5: Merge "docs: Fixed notification background bug. Bug: 16801684" into klp-modular-docs

* commit 'd91deea5ec151d53e3640db791948fbe2480f433':
  docs: Fixed notification background bug. Bug: 16801684

9 years agoMerge "docs: Fixed notification background bug. Bug: 16801684" into klp-modular-docs
Ricardo Cervera [Wed, 27 Aug 2014 15:30:40 +0000 (15:30 +0000)]
Merge "docs: Fixed notification background bug. Bug: 16801684" into klp-modular-docs

9 years agodocs: Fixed Google Play Services version number. Bug: 17195954
Ricardo Cervera [Fri, 22 Aug 2014 21:32:27 +0000 (14:32 -0700)]
docs: Fixed Google Play Services version number. Bug: 17195954

Change-Id: I7a71aa5f600ae11cce388183fc20e4537864122d

9 years agodocs: Fixed notification background bug. Bug: 16801684
Ricardo Cervera [Mon, 18 Aug 2014 21:29:09 +0000 (14:29 -0700)]
docs: Fixed notification background bug. Bug: 16801684

Change-Id: Ibd42a52fd46d324a6f706bab69a23f8521b7b36b

9 years agoam 8d8cf0b2: am e7c7993e: Merge "docs: Fixed error in code sample." into klp-modular...
Andrew Solovay [Tue, 26 Aug 2014 18:47:25 +0000 (18:47 +0000)]
am 8d8cf0b2: am e7c7993e: Merge "docs: Fixed error in code sample." into klp-modular-docs

* commit '8d8cf0b22f9f8eaf06914697fbe22a77cb27e307':
  docs: Fixed error in code sample.

9 years agoam e7c7993e: Merge "docs: Fixed error in code sample." into klp-modular-docs
Andrew Solovay [Tue, 26 Aug 2014 18:36:23 +0000 (18:36 +0000)]
am e7c7993e: Merge "docs: Fixed error in code sample." into klp-modular-docs

* commit 'e7c7993e4d490b67b329ef2502e35c8aad763ca1':
  docs: Fixed error in code sample.

9 years agoMerge "docs: Fixed error in code sample." into klp-modular-docs
Andrew Solovay [Tue, 26 Aug 2014 18:25:33 +0000 (18:25 +0000)]
Merge "docs: Fixed error in code sample." into klp-modular-docs

9 years agoam cb16b55b: am 2a866f07: Update RenderScript docs.
Tim Murray [Tue, 26 Aug 2014 17:51:21 +0000 (17:51 +0000)]
am cb16b55b: am 2a866f07: Update RenderScript docs.

* commit 'cb16b55b5ed9e4388b36e457226c96962004dd6c':
  Update RenderScript docs.

9 years agoam 2a866f07: Update RenderScript docs.
Tim Murray [Tue, 26 Aug 2014 17:39:06 +0000 (17:39 +0000)]
am 2a866f07: Update RenderScript docs.

* commit '2a866f075d9b23f835d27d4d46f8ccdc60c1fa6e':
  Update RenderScript docs.

9 years agoDo not persist and restore the media button event receiver
Jean-Michel Trivi [Tue, 26 Aug 2014 01:28:30 +0000 (18:28 -0700)]
Do not persist and restore the media button event receiver

Do not persist the media button event receiver.
Do not restore the media button event receiver on behalf of the
  application that registered. Prevents reported vulnerability.

Bug 15428797

Change-Id: I7ca3e7fccb165c55b23f471c00e0ed77436f7dc1

9 years agoFix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 19 Aug 2014 23:15:37 +0000 (16:15 -0700)]
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]

Bug: http://b.android.com/74072
Change-Id: Ib84906d86772ac3df2407e71ad2167797bec4542
(cherry picked from commit c9cd725f1013bed27e6f6594b176c10a6a4c0f16)

9 years agoFix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 19 Aug 2014 23:15:37 +0000 (16:15 -0700)]
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]

Bug: http://b.android.com/74072
Change-Id: Ib84906d86772ac3df2407e71ad2167797bec4542
(cherry picked from commit c9cd725f1013bed27e6f6594b176c10a6a4c0f16)

9 years agoResolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Sat, 9 Aug 2014 21:14:45 +0000 (14:14 -0700)]
Resolve color xml attributes properly. [DO NOT MERGE]

Color attributes were not being converted to int properly. The
conversion to int was a simple string to int using base 16. This change
resolves the colors as per #RGB, #ARGB, #RRGGBB or #AARRGGBB format
depending on the length of the attribute. All values that begin with '#'
are treated as colors.

Bug: http://b.android.com/73845
Change-Id: I8ad089b821af1e290b9b95771b50213fe2fdd784
(cherry picked from commit 81564dfe60020fa977d39d168f682e9d61825660)

9 years agoUpdate RenderScript docs.
Tim Murray [Mon, 25 Aug 2014 18:08:24 +0000 (11:08 -0700)]
Update RenderScript docs.

android.renderscript is *not* deprecated at all and continues to
be under heavy development.

Change-Id: Ia5fcfbe89d30e92b97439c2864fd67de32b81fa4
(cherry picked from commit 0a02f29ad12845cfbda95c463c12d583f668ba63)

9 years agodocs: add warning to redirects file
Joe Fernandez [Mon, 25 Aug 2014 18:26:10 +0000 (11:26 -0700)]
docs: add warning to redirects file

This redirects file is not used in production. Added a warning directing
writers to update the correct redirects file.

Change-Id: I05474eaede78c6ac69f281bbceb99f4f070e0156

9 years agoam 17b94b8a: am 2e8d4787: docs: link bug fixes for accessibility testing page
Joe Fernandez [Mon, 25 Aug 2014 18:18:29 +0000 (18:18 +0000)]
am 17b94b8a: am 2e8d4787: docs: link bug fixes for accessibility testing page

* commit '17b94b8a583849c769aab57644e6c3c289b79e55':
  docs: link bug fixes for accessibility testing page

9 years agoam 2e8d4787: docs: link bug fixes for accessibility testing page
Joe Fernandez [Mon, 25 Aug 2014 18:07:13 +0000 (18:07 +0000)]
am 2e8d4787: docs: link bug fixes for accessibility testing page

* commit '2e8d4787cc383be3532a87fc1afdcdaa09e1c175':
  docs: link bug fixes for accessibility testing page

9 years agodocs: link bug fixes for accessibility testing page
Joe Fernandez [Fri, 22 Aug 2014 23:08:27 +0000 (16:08 -0700)]
docs: link bug fixes for accessibility testing page

b/15501836

Change-Id: Ie461dd7234aaaadd9f052bf0b107a4a4beec47d8

9 years agoam b48db445: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Fri, 22 Aug 2014 18:36:28 +0000 (18:36 +0000)]
am b48db445: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

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

9 years agoam 2be95a8b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Fri, 22 Aug 2014 18:36:24 +0000 (18:36 +0000)]
am 2be95a8b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '2be95a8bcf28fafff69c8e036c5ba5eb3f1884bd':
  Import translations. DO NOT MERGE

9 years agoam 21281ae6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Fri, 22 Aug 2014 18:36:19 +0000 (18:36 +0000)]
am 21281ae6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '21281ae6f101e73d0262a5a3a9490f7369736ffb':
  Import translations. DO NOT MERGE

9 years agoam 7da569a5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Fri, 22 Aug 2014 18:36:15 +0000 (18:36 +0000)]
am 7da569a5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

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

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

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

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

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

9 years agoam 765c08fd: am 611dea81: Step Counter documentation fix.
Aravind Akella [Fri, 22 Aug 2014 18:08:42 +0000 (18:08 +0000)]
am 765c08fd: am 611dea81: Step Counter documentation fix.

* commit '765c08fdd634d2c2f100e8b1182cd48216696a9b':
  Step Counter documentation fix.

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 agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Aug 2014 17:50:15 +0000 (10:50 -0700)]
Import translations. DO NOT MERGE

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

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

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

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

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

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

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

9 years agoam d6c7fd28: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Fri, 22 Aug 2014 17:27:33 +0000 (17:27 +0000)]
am d6c7fd28: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

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

9 years agoam b3024901: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Aug 2014 17:27:29 +0000 (17:27 +0000)]
am b3024901: (-s ours) Import translations. DO NOT MERGE

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

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 agodocs: Docs for Android project view. Bug: 17108468
Ricardo Cervera [Thu, 21 Aug 2014 17:43:31 +0000 (10:43 -0700)]
docs: Docs for Android project view. Bug: 17108468

Change-Id: If63361314f2da6a8fa4fa35357c2dec1d47c777f

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 f42fdfd9: am 152cc584: Merge "docs: Added additional documentation for specifying...
Quddus Chong [Thu, 21 Aug 2014 23:12:49 +0000 (23:12 +0000)]
am f42fdfd9: am 152cc584: Merge "docs: Added additional documentation for specifying OAuth scopes. bug: 12650251" into klp-modular-docs

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

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 agoam 2c374e64: am 82957e38: Merge "docs: Fixed typo in intents page. Bug: 16949177...
Ricardo Cervera [Thu, 21 Aug 2014 17:31:31 +0000 (17:31 +0000)]
am 2c374e64: am 82957e38: Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs

* commit '2c374e643d6cce73a71fb57559f898b6b554e36c':
  docs: Fixed typo in intents page. Bug: 16949177

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

* commit 'd309de3d06817e51aab056284874f613238ff400':
  Docs: Fixed typo 'Fore'

9 years agoam 0d65bf25: am 262b4147: Merge "docs: Fixed bug in declaring layout page. Bug: 16815...
Ricardo Cervera [Thu, 21 Aug 2014 17:31:03 +0000 (17:31 +0000)]
am 0d65bf25: am 262b4147: Merge "docs: Fixed bug in declaring layout page. Bug: 16815916" into klp-modular-docs

* commit '0d65bf25c8a9091d598f50e0d534625107db6cf6':
  docs: Fixed bug in declaring layout page. Bug: 16815916

9 years agoam 63da186f: am c5807808: docs: Fixed typo in Wear training class. Bug: 16709202
Ricardo Cervera [Thu, 21 Aug 2014 17:30:57 +0000 (17:30 +0000)]
am 63da186f: am c5807808: docs: Fixed typo in Wear training class. Bug: 16709202

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

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