Jeff Brown
8b51a39fda
Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev
2013-07-09 23:44:58 +00:00
Jeff Brown
a18be3116a
Revert "Remove mediarouter v7 support library from SDK."
...
This reverts commit 408c184614 .
Bug: 9425325
Change-Id: I340364c43f3040b454894e55a94be236ff999ce6
2013-07-09 00:35:10 +00:00
Fred Chung
7167a054a8
Bluetooth LE sample.
...
This sample demonstrates how to communicate with a Generic Attribute Profile (GATT) server over
Bluetooth Low Energy. This feature is available on Android 4.3 (API level 18) and above
platforms.
You can test this sample app using any Bluetooth Low Energy-capable devices. If the device
supports the Heart Rate Profile, the app will parse and display the heart rate.
Change-Id: I69a4955cb9929f837e81ad1c19145ff45bdd27ec
2013-07-08 13:22:56 -07:00
Jesse Hall
163e7c5e50
Merge "Add a sample showing how to use OpenGL ES 3.0" into jb-mr2-dev
2013-06-30 04:07:40 +00:00
Jesse Hall
5e42792955
Merge "Add GLESv3 to future NDK release" into jb-mr2-dev
2013-06-30 04:01:42 +00:00
Dirk Dougherty
711343d467
am f3136431: am 6dcbcb7a: am 90b9ab16: Merge commit \'b1637825\' into manualmerge
...
* commit 'f3136431df3319c415fde335f172f55f0d74494f':
Adjust the redirects for edu and a couple others.
2013-06-26 11:07:45 -07:00
Dirk Dougherty
f3136431df
am 6dcbcb7a: am 90b9ab16: Merge commit \'b1637825\' into manualmerge
...
* commit '6dcbcb7a539a7704672cc22dba3ac12cf5622b36':
Adjust the redirects for edu and a couple others.
2013-06-26 11:05:13 -07:00
Dirk Dougherty
6dcbcb7a53
am 90b9ab16: Merge commit \'b1637825\' into manualmerge
...
* commit '90b9ab16f9f8730f69905f56055c5364d26ce888':
Adjust the redirects for edu and a couple others.
2013-06-26 11:02:54 -07:00
Dirk Dougherty
90b9ab16f9
Merge commit 'b1637825' into manualmerge
...
Conflicts:
scripts/app_engine_server/redirects.yaml
Change-Id: If68fc5e8461f3f9d63d00cc251e4bed2531d7025
2013-06-26 10:58:30 -07:00
Dirk Dougherty
b1637825c1
am 392804d0: Adjust the redirects for edu and a couple others.
...
* commit '392804d01ce967c5ec4d00b710c7664f42c3d736':
Adjust the redirects for edu and a couple others.
2013-06-26 10:40:48 -07:00
Dirk Dougherty
392804d01c
Adjust the redirects for edu and a couple others.
...
Change-Id: I95049ad68a4ecc31354f9e97e10d83114be8bb78
2013-06-26 10:34:59 -07:00
Jesse Hall
a451b018f6
Add a sample showing how to use OpenGL ES 3.0
...
Change-Id: If834a23ad3ad2164e6fdc40f865ee28cfa93de7e
2013-06-24 11:12:42 -07:00
Jesse Hall
c05863dac1
Add GLESv3 to future NDK release
...
* Headers were copied from frameworks/native/opengl/include/GLES3/.
* Symbol lists were generated with ndk/build/tools/gen-system-symbols.sh.
* Symbols are identical between architectures
Change-Id: I011094ea3b479cf166ffb6bef3778cde683fc502
2013-06-18 10:19:36 -07:00
Robert Ly
4268df44c2
am 61cf8608: am 58a0f1bc: am af5f663a: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"
...
* commit '61cf860801f1106d71124c69deebfb53ec25ac69':
2013-06-17 10:00:10 -07:00
Robert Ly
9fc688f47a
am 6e58370c: am 4d3ff06e: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"
...
* commit '6e58370c0198221979eef9879b5fb8e22a0f1b1b':
Revert "make target for gms and gcm javadocs and to automate entire docs build"
2013-06-17 10:00:09 -07:00
Robert Ly
61cf860801
am 58a0f1bc: am af5f663a: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"
...
* commit '58a0f1bc860e6603970c5178294a7dd1709e9dad':
2013-06-17 09:57:56 -07:00
Robert Ly
6e58370c01
am 4d3ff06e: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"
...
* commit '4d3ff06ef1fea7a18d04a013ec0e077ccf89394e':
Revert "make target for gms and gcm javadocs and to automate entire docs build"
2013-06-17 09:57:55 -07:00
Robert Ly
58a0f1bc86
am af5f663a: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"
...
* commit 'af5f663ae05c86e52e0ff6cbe028748992118643':
2013-06-17 09:56:02 -07:00
Robert Ly
4d3ff06ef1
am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"
...
* commit '5632947990326ebb2cd81e567e7b0d282672c2fd':
Revert "make target for gms and gcm javadocs and to automate entire docs build"
2013-06-17 09:55:14 -07:00
Robert Ly
af5f663ae0
am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"
...
* commit '5632947990326ebb2cd81e567e7b0d282672c2fd':
Revert "make target for gms and gcm javadocs and to automate entire docs build"
2013-06-17 09:54:43 -07:00
Robert Ly
5632947990
am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"
...
* commit '6bd35b5bd685355b673a36ed96b77ddd13a0bff4':
Revert "make target for gms and gcm javadocs and to automate entire docs build"
2013-06-17 09:52:40 -07:00
Robert Ly
6bd35b5bd6
Revert "make target for gms and gcm javadocs and to automate entire docs build"
...
This reverts commit 2deefec495 .
Change-Id: I60be16d5233568a8ffcf6ec09952261b854275a8
2013-06-17 16:10:59 +00:00
Jeff Brown
408c184614
Remove mediarouter v7 support library from SDK.
...
Bug: 9425325
Change-Id: I9459fa005c4801cac0c2e28c5afb414620241ad9
2013-06-14 15:47:52 -07:00
Robert Ly
1630db410d
am 3d1ead8f: am 2336733e: am 0e7706f3: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build
...
* commit '3d1ead8f391d560b8721355a4909af2567fa67b4':
2013-06-13 15:42:27 -07:00
Robert Ly
c303493931
am ecd39491: am c3e7bbaf: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build
...
* commit 'ecd39491d7314b9d8e5de1b11ce100371c2c5409':
make target for gms and gcm javadocs and to automate entire docs build
2013-06-13 15:42:25 -07:00
Robert Ly
3d1ead8f39
am 2336733e: am 0e7706f3: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build
...
* commit '2336733e7c8dc773b619e648b30b18f91fa6e952':
2013-06-13 15:40:33 -07:00
Robert Ly
ecd39491d7
am c3e7bbaf: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build
...
* commit 'c3e7bbaf00207bf36a2082cece68f7d6c0bf94af':
make target for gms and gcm javadocs and to automate entire docs build
2013-06-13 15:40:32 -07:00
Robert Ly
2336733e7c
am 0e7706f3: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build
...
* commit '0e7706f3071b1edc4bd0af673c0ac44cbfe0cd71':
2013-06-13 15:37:06 -07:00
Robert Ly
c3e7bbaf00
am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build
...
* commit '128c2f0265307ef5f36bd073148b46ef545db1c2':
make target for gms and gcm javadocs and to automate entire docs build
2013-06-13 15:36:30 -07:00
Robert Ly
0e7706f307
am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build
...
* commit '128c2f0265307ef5f36bd073148b46ef545db1c2':
make target for gms and gcm javadocs and to automate entire docs build
2013-06-13 15:35:55 -07:00
Robert Ly
128c2f0265
am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build
...
* commit '2deefec495526a521f16e4c0d6e19f2969462199':
make target for gms and gcm javadocs and to automate entire docs build
2013-06-13 15:34:14 -07:00
Xavier Ducrohet
8707c92ba3
Merge "Update the SDK API Data." into jb-mr2-dev
2013-06-12 18:04:27 +00:00
Xavier Ducrohet
8f1a2bdf5a
Update the SDK API Data.
...
This is necesary for Lint to handle API 18.
Change-Id: Ida60df3f9149fdb9a4835752b1a9c3e6a3d75082
2013-06-12 10:09:42 -07:00
Jeff Brown
972588aba0
Redefine content position in milliseconds instead of seconds.
...
Made a note to update some other parts of the sample that need
to be fixed after other recent API changes.
Bug: 9380827
Change-Id: I23ccfa9ab434d4c7661ae379b77fa95e128513eb
2013-06-11 18:51:17 -07:00
Robert Ly
2deefec495
make target for gms and gcm javadocs and to automate entire docs build
...
Change-Id: Iea7d17782f41c91e42a244bf8c67c30b64c43ede
2013-06-11 22:54:04 +00:00
Jeff Brown
fad7c428e1
Update media router api.
...
Bug: 9380827
Change-Id: I74b5d5150336be95bd66bab35be8837c9cdf49de
2013-06-11 00:55:32 -07:00
Xavier Ducrohet
8f92729c1a
Merge "Fix support version." into jb-mr2-dev
2013-06-11 00:05:38 +00:00
Xavier Ducrohet
298c00f935
Fix support version.
...
Should still be 18.0.0 but looks like the schemas doesn't support this (yet?).
Change-Id: I2bf61debad74b04ea3678b3226c833abb197ca8f
2013-06-10 17:04:19 -07:00
Xavier Ducrohet
a06071bd27
Merge "Update revision of SDK component for the new release. do not merge." into jb-mr2-dev
2013-06-10 22:27:10 +00:00
Xavier Ducrohet
128ca67932
Update revision of SDK component for the new release. do not merge.
...
Change-Id: Id48d7fa1847af58bf8d23ce127ef42b4103db74d
2013-06-10 15:25:36 -07:00
Scott Main
0855744698
am 64904ff8: am 8abfd5c1: am a0787146: redirect all UI guideline docs to Design docs except for widgets, pending b/9303742
...
* commit '64904ff82332af31a1d72d635cbed0d600f6c1f1':
redirect all UI guideline docs to Design docs except for widgets, pending b/9303742
2013-06-06 12:10:37 -07:00
Scott Main
64904ff823
am 8abfd5c1: am a0787146: redirect all UI guideline docs to Design docs except for widgets, pending b/9303742
...
* commit '8abfd5c1b23bc6d941b38c2bff7285f9bb7a10bc':
redirect all UI guideline docs to Design docs except for widgets, pending b/9303742
2013-06-06 12:09:01 -07:00
Scott Main
8abfd5c1b2
am a0787146: redirect all UI guideline docs to Design docs except for widgets, pending b/9303742
...
* commit 'a0787146674c12218a5891b5c2b36a2cffb74c56':
redirect all UI guideline docs to Design docs except for widgets, pending b/9303742
2013-06-06 12:07:18 -07:00
Scott Main
a078714667
redirect all UI guideline docs to Design docs
...
except for widgets, pending b/9303742
Change-Id: I9b896e6c88701044f572ab79813d43c2f34b81b9
2013-06-05 20:46:59 -07:00
Yu Shan Emily Lau
9662fbd259
Merge "Added the test def for new camera native tests." into jb-mr2-dev
2013-06-03 17:28:22 +00:00
Jeff Brown
998bd1138a
Update media router API.
...
Bug: 9210033
Change-Id: I11a3bb3691096cdea60823d92245cbf86770f23b
2013-05-30 19:23:15 -07:00
Chet Haase
cdf654b530
am 9079a04c: am 829b544e: am f04a0b09: am 8654b6c6: am 3ff1591c: am 28b127ec: New DevBytes animation demos
...
* commit '9079a04c9ec614d8be81827d133dca9e91f561d7':
2013-05-30 15:14:30 -07:00
Chet Haase
9079a04c9e
am 829b544e: am f04a0b09: am 8654b6c6: am 3ff1591c: am 28b127ec: New DevBytes animation demos
...
* commit '829b544e4e26e7c425f49a52cebf2e6ada98d4f7':
2013-05-30 15:12:21 -07:00
Jeff Sharkey
d1c2d376c9
am 29ca053a: am 0ea348a5: am 39ffbccd: Generalize support library tests.
...
* commit '29ca053ab3584e3a07f98990dafbca8e572b5413':
Generalize support library tests.
2013-05-30 15:10:45 -07:00
Chet Haase
829b544e4e
am f04a0b09: am 8654b6c6: am 3ff1591c: am 28b127ec: New DevBytes animation demos
...
* commit 'f04a0b09a1b758356a928f7a3ed56333a02e691d':
2013-05-30 15:09:15 -07:00