8813 Commits

Author SHA1 Message Date
Elliott Hughes
07b4a29131 am 3e2848d2: am 8fc88562: am 85e21bd5: Mention ProGuard in the JNI documentation.
* commit '3e2848d249cafbf1cc79b600eab9bce055adcf8e':
  Mention ProGuard in the JNI documentation.
2014-11-27 18:57:00 +00:00
Elliott Hughes
85e21bd534 Mention ProGuard in the JNI documentation.
(cherry picked from commit 8e1bbfe0f1e4dac35b20972a71656e4c9bf437a1)

Change-Id: I22731dfb94dcc1271b987ed52914e665704dd378
2014-11-27 10:28:11 -08:00
Elliott Hughes
d3794d681a am 29e1c36d: am 3afb9f63: am 2c53d22b: Merge "Mention ProGuard in the JNI documentation."
* commit '29e1c36d4b57854a34c5db43e37282b867bf149b':
  Mention ProGuard in the JNI documentation.
2014-11-27 18:18:51 +00:00
Elliott Hughes
29e1c36d4b am 3afb9f63: am 2c53d22b: Merge "Mention ProGuard in the JNI documentation."
* commit '3afb9f6378779e6ee355b0b56c47ad7270e2b832':
  Mention ProGuard in the JNI documentation.
2014-11-27 18:11:58 +00:00
Scott Main
4a45a44152 am 2995bd80: am 5a27b4b8: am fc793074: Merge "docs:advmgr-updates" into lmp-docs
* commit '2995bd8033ecbf4e1a5b3392ec27008d2d184b8a':
  docs:advmgr-updates
2014-11-27 10:08:51 +00:00
smain@google.com
576e248f3c am 277fb8fd: am d3c17270: am 3a4b011c: define height for context images to avoid content jumps on load
* commit '277fb8fdaeb546119bc31269425edc72b75e87dd':
  define height for context images to avoid content jumps on load
2014-11-27 10:08:45 +00:00
smain@google.com
df48876b3b am 804830f8: am 357efcd1: am ee032263: am 9da0881f: am 59f4624a: am be718f7c: Merge "add wear design guide for contextual apps" into lmp-docs
* commit '804830f83c7df0c69ed784619e62e2293a31182f':
  add wear design guide for contextual apps
2014-11-26 19:41:53 +00:00
Elliott Hughes
8e1bbfe0f1 Mention ProGuard in the JNI documentation.
Change-Id: I7822ec1eca0290eba1f4b08eca6794b41172d606
2014-11-26 10:51:37 -08:00
smain@google.com
804830f83c am 357efcd1: am ee032263: am 9da0881f: am 59f4624a: am be718f7c: Merge "add wear design guide for contextual apps" into lmp-docs
* commit '357efcd1d9b23036bd4e858155696ed2ed27f5dc':
  add wear design guide for contextual apps
2014-11-26 18:41:53 +00:00
Scott Main
f24f2d9453 Merge "docs:download updates for studio" 2014-11-26 03:14:36 +00:00
Scott Main
fc79307406 Merge "docs:advmgr-updates" into lmp-docs 2014-11-26 03:13:27 +00:00
smain@google.com
3a4b011c9e define height for context images to avoid content jumps on load
Change-Id: I95fb6d628f8be12c31c0b7fa2978dd266f72dbf6
2014-11-25 18:05:39 -08:00
smain@google.com
ee03226304 am 9da0881f: am 59f4624a: am be718f7c: Merge "add wear design guide for contextual apps" into lmp-docs
* commit '9da0881ffbcdc566cc1bf60b817ab4f617d0049a':
  add wear design guide for contextual apps
2014-11-26 00:59:45 +00:00
Rich Slogar
0ed88b9a2e docs:advmgr-updates
Change-Id: I4895f8dc91d0397a615a358d97cbd229b171f507
2014-11-25 16:40:28 -08:00
smain@google.com
be718f7ceb Merge "add wear design guide for contextual apps" into lmp-docs 2014-11-26 00:18:59 +00:00
smain@google.com
98ee16c52a add wear design guide for contextual apps
Change-Id: I2c5709f02352def34c5c6a0c7dcf7193ebd58e4f
2014-11-25 16:12:48 -08:00
Rich Slogar
91635522ac docs: debugging studio
Change-Id: I1ef8c954d780e7283bb91c16a84dc727be42f9ab
2014-11-25 15:02:54 -08:00
Rich Slogar
40385cdc91 docs:download updates for studio
Change-Id: I3d0f5f39a6c8d5264cc5c9bb6c8a24ec75c6f7b4
2014-11-25 12:06:34 -08:00
Rich Slogar
daaa16403f docs:setting up hardware devices
Change-Id: I3a04df7b70bf8e389361e3c333e62a639a70d36e
2014-11-25 11:55:37 -08:00
Natalie Masse
82f5fde34c am 18c295bf: am a05d4a4b: am 8d9e6434: am 65e51fcd: am d7c7d275: am 77283ec9: Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs
* commit '18c295bf8b258e94050b2e2fb741cb597011159b':
  Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation
2014-11-25 18:51:24 +00:00
Dirk Dougherty
0b43c7eefb am e264e1f0: am be8da57a: am 5977f7d5: am d23a8692: am 14e40f04: am fd117ff2: Doc change: zh-cn translation of Android L overviews. cherrypick from I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
* commit 'e264e1f046d6374577c8c474fb3a6d772e2ac0bf':
  Doc change: zh-cn translation of Android L overviews. cherrypick from  I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
2014-11-25 18:51:15 +00:00
Natalie Masse
18c295bf8b am a05d4a4b: am 8d9e6434: am 65e51fcd: am d7c7d275: am 77283ec9: Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs
* commit 'a05d4a4bb38df792cbf19a0f1e198a26f1509281':
  Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation
2014-11-25 18:45:38 +00:00
Dirk Dougherty
e264e1f046 am be8da57a: am 5977f7d5: am d23a8692: am 14e40f04: am fd117ff2: Doc change: zh-cn translation of Android L overviews. cherrypick from I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
* commit 'be8da57a33103f9257d1a23eee372a703d8c181a':
  Doc change: zh-cn translation of Android L overviews. cherrypick from  I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
2014-11-25 18:45:11 +00:00
smain@google.com
669131f9b8 am cde20158: am f00d46db: am 79b496e8: am 75cd7c74: am 5f3ba993: am 1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs
* commit 'cde2015889a26926c72d72c6b15c46ed1c3b5ead':
  add intro videos (w/ shadowbox) to Auto and Wear landing pages.
2014-11-25 17:49:05 +00:00
smain@google.com
cde2015889 am f00d46db: am 79b496e8: am 75cd7c74: am 5f3ba993: am 1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs
* commit 'f00d46db377b97da673f8699928d8343b3bc132d':
  add intro videos (w/ shadowbox) to Auto and Wear landing pages.
2014-11-25 17:38:15 +00:00
Natalie Masse
8d9e64343d am 65e51fcd: am d7c7d275: am 77283ec9: Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs
* commit '65e51fcda25c33cdfa73e8ca3a4f71cf987bd0d2':
  Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation
2014-11-25 11:22:05 +00:00
Natalie Masse
77283ec981 Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs 2014-11-25 11:05:52 +00:00
Dirk Dougherty
5977f7d520 am d23a8692: am 14e40f04: am fd117ff2: Doc change: zh-cn translation of Android L overviews. cherrypick from I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
* commit 'd23a8692ac96b7da73949d2dc4c549e73931609c':
  Doc change: zh-cn translation of Android L overviews. cherrypick from  I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
2014-11-25 02:58:25 +00:00
Dirk Dougherty
fd117ff2a4 Doc change: zh-cn translation of Android L overviews.
cherrypick from  I56d1ce58e10b83d10d0077cc9dfbeb04f090b861

Change-Id: Ic02b747917b11a88c2adf38a73c046dc32af6ce9
2014-11-24 17:39:14 -08:00
smain@google.com
79b496e867 am 75cd7c74: am 5f3ba993: am 1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs
* commit '75cd7c74ab38a55914f1658234a0031c907eb3ed':
  add intro videos (w/ shadowbox) to Auto and Wear landing pages.
2014-11-24 19:11:04 +00:00
smain@google.com
1b23ee962a Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs 2014-11-24 18:51:03 +00:00
Natalie Masse
e24908e342 Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation
Change-Id: Ie433d4bfd7ac7fd2e524a201497c250a7aede47d
2014-11-24 18:38:00 +00:00
Eino-Ville Talvala
a48e26bb65 am bd9567e1: am e289082a: am dfa99f63: Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev
* commit 'bd9567e1569a6fc5222427f18cc653c29c0beb89':
  Camera: Add new capability flags as system features as well
2014-11-24 18:12:51 +00:00
Joe Fernandez
a37ec5abb6 am 7ce31112: am 0c7d2d2f: am 85f463c5: am fbdfdef4: am 9034ead0: am 5b94d00b: docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
* commit '7ce31112b2252f8a3283e4d29ea42cf5780deef2':
  docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
2014-11-24 18:12:38 +00:00
Scott Rowe
727c1b6861 am 78639221: am 9e9d1cd3: am a505d0be: am 63108ee3: am 02cb1fe6: am 14f78ed7: Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs
* commit '7863922116fd0836a58b705efed861b12d661fcd':
  docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
2014-11-24 18:12:33 +00:00
Eino-Ville Talvala
bd9567e156 am e289082a: am dfa99f63: Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev
* commit 'e289082a7066a86032190aa100425ce29cd2a4f2':
  Camera: Add new capability flags as system features as well
2014-11-24 18:05:40 +00:00
Joe Fernandez
7ce31112b2 am 0c7d2d2f: am 85f463c5: am fbdfdef4: am 9034ead0: am 5b94d00b: docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
* commit '0c7d2d2fa8ce801d608db2da6670d10720eaea16':
  docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
2014-11-24 18:05:17 +00:00
Scott Rowe
7863922116 am 9e9d1cd3: am a505d0be: am 63108ee3: am 02cb1fe6: am 14f78ed7: Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs
* commit '9e9d1cd3ff536e8c9d00469f01b00b94fe73e0a2':
  docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
2014-11-24 18:05:11 +00:00
smain@google.com
43eabc8f13 add intro videos (w/ shadowbox) to Auto and Wear landing pages.
Change-Id: Ieb730416b7a469c7cbd0e80d1e9f74f14a7adb70
2014-11-24 09:25:00 -08:00
Eino-Ville Talvala
dfa99f6367 Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev 2014-11-22 04:57:49 +00:00
Joe Fernandez
85f463c5b5 am fbdfdef4: am 9034ead0: am 5b94d00b: docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
* commit 'fbdfdef43da5d946e8559d47d8bd79db0bceedb1':
  docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
2014-11-22 00:25:13 +00:00
Scott Rowe
a505d0becb am 63108ee3: am 02cb1fe6: am 14f78ed7: Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs
* commit '63108ee3623cc2b57c3a0a2e730dc9bf5c06c825':
  docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
2014-11-22 00:24:51 +00:00
Joe Fernandez
5b94d00b89 docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
- Chinese pages are showing Japanese (not good)
- Chinese resource page is not rendering because of bad video links

Change-Id: Ia4508c2db85b9cbd5bdad34ae8bedc411df98360
2014-11-21 20:27:13 +00:00
Scott Rowe
14f78ed7b8 Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs 2014-11-21 17:34:29 +00:00
Ricardo Cervera
537c91efcc am bc250401: am d4ea7b3c: am 9aede602: am c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev automerge: 161dce4
* commit 'bc250401fe0baacb8880ba7d85364de3e6df11b9':
  docs: Fixes to the Data Layer Wear class.
2014-11-21 12:19:50 +00:00
Andrew Solovay
eeb06d941f am a1c2b6a9: am d3e2fd99: am c79173c7: am 05282133: Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs automerge: b5b9c9b automerge: 5a75a66
* commit 'a1c2b6a9e9dc9e41a7a7dce609ab77ba45ada36e':
  docs: Bugfix & minor cleanup for "Providing Messaging for Auto"
2014-11-21 12:19:40 +00:00
Dirk Dougherty
36dfe4cb15 am 448d1ffc: am 40343340: am ef629f1f: am a79acc03: Doc change: localized content. automerge: 4d82f8a automerge: 1896e58
* commit '448d1ffcadab7cee678100137aad9435a2088695':
  Doc change: localized content.
2014-11-21 12:19:31 +00:00
smain@google.com
845e81e220 am 2dc4cfa0: am 74bafd41: am 555d6e70: am 2411fe88: Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs automerge: 6e08d30 automerge: 39d6b21
* commit '2dc4cfa09617cfa660728b3c972f840853a80583':
  add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes
2014-11-21 12:19:23 +00:00
Quddus Chong
5bd45a6671 am 5b51858d: am ecccf10b: am 5b944f4a: am 8428c114: am 9b822b96: docs: Added link to CarExtender class from Auto Getting Started doc. automerge: a1e1890
* commit '5b51858dc29f7892c17c82ef1c2fecf767c89f41':
  docs: Added link to CarExtender class from Auto Getting Started doc.
2014-11-21 12:19:19 +00:00
Ricardo Cervera
bc250401fe am d4ea7b3c: am 9aede602: am c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev automerge: 161dce4
* commit 'd4ea7b3cb626dbd807fed9477c50726fb7dd38a2':
  docs: Fixes to the Data Layer Wear class.
2014-11-21 10:26:37 +00:00