Baligh Uddin
501ecc50fc
Import translations. DO NOT MERGE
...
Change-Id: Ie3decee38150b828ca6b4dd79b368bcf357000c0
Auto-generated-cl: translation import
2013-09-14 00:03:28 -07:00
Andrew Hsieh
a28b96d040
am a0bd157a: am 539c54da: am cfb3c3ff: Merge "Fix sample bitmap-plasma to draw on whole screen"
...
* commit 'a0bd157aa25321de7b719cff534da9556ed21f67':
Fix sample bitmap-plasma to draw on whole screen
2013-09-13 04:50:41 -07:00
Andrew Hsieh
307a254231
am 79d33b2b: am 6cb8f771: am eb0b5623: Merge "Fix error about multiple unsequenced modifications"
...
* commit '79d33b2b5273afa10b6ffc1382278757492c6720':
Fix error about multiple unsequenced modifications
2013-09-13 04:50:40 -07:00
Andrew Hsieh
a0bd157aa2
am 539c54da: am cfb3c3ff: Merge "Fix sample bitmap-plasma to draw on whole screen"
...
* commit '539c54da923f0200294dde3e4ba80a9aa48e49f3':
Fix sample bitmap-plasma to draw on whole screen
2013-09-13 04:48:04 -07:00
Andrew Hsieh
79d33b2b52
am 6cb8f771: am eb0b5623: Merge "Fix error about multiple unsequenced modifications"
...
* commit '6cb8f77156f09489e1bb685d306c9f81e3e5dc98':
Fix error about multiple unsequenced modifications
2013-09-13 04:48:03 -07:00
Andrew Hsieh
539c54da92
am cfb3c3ff: Merge "Fix sample bitmap-plasma to draw on whole screen"
...
* commit 'cfb3c3ff05c9eacecfa60f68a2a0128b344a0cba':
Fix sample bitmap-plasma to draw on whole screen
2013-09-13 04:36:07 -07:00
Andrew Hsieh
6cb8f77156
am eb0b5623: Merge "Fix error about multiple unsequenced modifications"
...
* commit 'eb0b56233947b32d8ebaa29db3103cbe2072fd49':
Fix error about multiple unsequenced modifications
2013-09-13 04:35:56 -07:00
Andrew Hsieh
cfb3c3ff05
Merge "Fix sample bitmap-plasma to draw on whole screen"
2013-09-13 11:34:17 +00:00
Andrew Hsieh
eb0b562339
Merge "Fix error about multiple unsequenced modifications"
2013-09-13 11:34:02 +00:00
Andrew Hsieh
055992fa7d
Fix sample bitmap-plasma to draw on whole screen
...
The previous dimension 200x200 is tiny these days
Change-Id: I7d7a7d93b3e60bd4dcd8a2b22b97fc7ed9ca4dfa
2013-09-13 18:29:42 +08:00
Andrew Hsieh
99da728a3d
Fix error about multiple unsequenced modifications
...
The evaluation order of function args aren't gaurenteed in C++
jni/NDKSupport/vecmath.h:869:32: warning: multiple unsequenced modifications to 'i' [-Wunsequenced]
LOGI("%f %f %f %f", f[i++], f[i++], f[i++], f[i++]);
Change-Id: Ibf69978dd3abf57a7042624aad3d416a0f6f5e01
2013-09-13 17:47:47 +08:00
Andrew Hsieh
53d27f3182
am 56896f8f: am 18bdd9b2: am 83e093e9: Merge "Add NDK sample to demonstrate more OpenGL&Gaming related technologies."
...
* commit '56896f8f5e3cf5d14d9113cee2bb7fb3cf8ed084':
Add NDK sample to demonstrate more OpenGL&Gaming related technologies.
2013-09-13 00:41:45 -07:00
Andrew Hsieh
56896f8f5e
am 18bdd9b2: am 83e093e9: Merge "Add NDK sample to demonstrate more OpenGL&Gaming related technologies."
...
* commit '18bdd9b22a5400e70581d1b1771bc79c70f98493':
Add NDK sample to demonstrate more OpenGL&Gaming related technologies.
2013-09-13 00:39:21 -07:00
Andrew Hsieh
18bdd9b22a
am 83e093e9: Merge "Add NDK sample to demonstrate more OpenGL&Gaming related technologies."
...
* commit '83e093e9a2f7c428b85e013d10cf20eb204d0062':
Add NDK sample to demonstrate more OpenGL&Gaming related technologies.
2013-09-13 00:35:53 -07:00
Andrew Hsieh
83e093e9a2
Merge "Add NDK sample to demonstrate more OpenGL&Gaming related technologies."
2013-09-13 07:33:26 +00:00
Hak Matsuda
f39a078023
Add NDK sample to demonstrate more OpenGL&Gaming related technologies.
...
Change-Id: I0fb56c1fd1aa82d5a7c4da5010e00e103146ba78
2013-09-13 15:12:22 +08:00
Tor Norbye
784abcfaf1
Temporarily disable removing typedefs
...
Change-Id: Ief7cb3b570d2b36b7101f622ab77cbdf7d699e3e
2013-09-12 17:09:59 -07:00
Yohann Roussel
6fa1156b3b
Add res folder to multidex SDK projects.
...
This will fix an error when importing thoses projects with ADT.
Change-Id: I75d2b0376222b13d630ef7e53386dedf62cc3fec
2013-09-12 07:51:54 +00:00
Yohann Roussel
2ee7919660
Merge "android-support-multidex-instrumentation in SDK."
2013-09-12 07:34:34 +00:00
Baligh Uddin
908bcaebb0
Merge "Import translations. DO NOT MERGE"
2013-09-12 03:13:38 +00:00
Erik Gilling
aeac590137
am 1c415cbb: am 438ea813: Add Consumer IR ApiDemo
...
* commit '1c415cbb54621f5e86dfc8364a29eaf9e35c67b5':
Add Consumer IR ApiDemo
2013-09-11 17:22:57 -07:00
Baligh Uddin
dfd89ed284
Import translations. DO NOT MERGE
...
Change-Id: Id816a500425dc981c2cacf2ca4244590b297418f
Auto-generated-cl: translation import
2013-09-11 15:17:43 -07:00
Erik Gilling
1c415cbb54
am 438ea813: Add Consumer IR ApiDemo
...
* commit '438ea813f1846f88205ff98436568aaa34f06845':
Add Consumer IR ApiDemo
2013-09-11 12:10:10 -07:00
Yohann Roussel
6f57b24889
android-support-multidex-instrumentation in SDK.
...
Change-Id: I6e39034f592f6ad7654ee37970f3367a87b2034f
2013-09-11 08:05:14 +00:00
Erik Gilling
438ea813f1
Add Consumer IR ApiDemo
...
Change-Id: I4eb27b2ba6a46c27962eaa5e09d3e65939b64c0a
2013-09-10 21:07:58 -07:00
Alex Ray
e80479394d
Merge "Remove broken os.Sensors demo"
2013-09-10 06:28:46 +00:00
Jeff Sharkey
f985c64370
am 88241b52: am 34c8fae5: Add DocumentsUI tests.
...
* commit '88241b529163123540eeb5867b6b03624ed21614':
Add DocumentsUI tests.
2013-09-07 12:28:25 -07:00
Jeff Sharkey
88241b5291
am 34c8fae5: Add DocumentsUI tests.
...
* commit '34c8fae561288700ccf004fa490da09ebacaaedf':
Add DocumentsUI tests.
2013-09-07 12:25:33 -07:00
Jeff Sharkey
34c8fae561
Add DocumentsUI tests.
...
Bug: 10514613
Change-Id: I1375a8ee421153178f86a1842ebbe572858bf94c
2013-09-06 13:56:45 -07:00
Andrew Hsieh
3511e91b04
am 32f9427a: am 14ebb417: am 445765eb: Merge "Fix issue 58135 about _C_LABEL_STRING macro w/o space between literal in C++"
...
* commit '32f9427ac73886555a2d1b2e01714a7ab508d019':
Fix issue 58135 about _C_LABEL_STRING macro w/o space between literal in C++
2013-09-06 09:52:43 -07:00
Andrew Hsieh
7c77049474
am c3e07fd8: am 09d77363: am 7d80bf6a: Merge "arch-specific diff of header"
...
* commit 'c3e07fd8aef8ce6fe3a92a881d3f079ed792cd6b':
arch-specific diff of header
2013-09-06 09:52:41 -07:00
Dirk Dougherty
901ca8141b
am ac11f916: am 73762c8d: am 17b152d9: am 60880978: am fe32c3ad: Adjust tags format in _index.jd files.
...
* commit 'ac11f916695392a68eade6d4986746629bfdbdb1':
Adjust tags format in _index.jd files.
2013-09-06 09:52:09 -07:00
Andrew Hsieh
32f9427ac7
am 14ebb417: am 445765eb: Merge "Fix issue 58135 about _C_LABEL_STRING macro w/o space between literal in C++"
...
* commit '14ebb417006c2686c077f70e9ddbb745bee94493':
Fix issue 58135 about _C_LABEL_STRING macro w/o space between literal in C++
2013-09-06 04:46:29 -07:00
Andrew Hsieh
14ebb41700
am 445765eb: Merge "Fix issue 58135 about _C_LABEL_STRING macro w/o space between literal in C++"
...
* commit '445765ebe5887dccb9c93973024e9e59563adb8d':
Fix issue 58135 about _C_LABEL_STRING macro w/o space between literal in C++
2013-09-06 04:44:14 -07:00
Andrew Hsieh
445765ebe5
Merge "Fix issue 58135 about _C_LABEL_STRING macro w/o space between literal in C++"
2013-09-06 11:42:04 +00:00
Andrew Hsieh
c2e61c3c01
Fix issue 58135 about _C_LABEL_STRING macro w/o space between literal in C++
...
Change-Id: Iefc3c090071f3629998515d43907139b07105672
2013-09-06 17:34:31 +08:00
Andrew Hsieh
c3e07fd8ae
am 09d77363: am 7d80bf6a: Merge "arch-specific diff of header"
...
* commit '09d77363b434071784398589bc932b122b4d45b3':
arch-specific diff of header
2013-09-06 01:36:46 -07:00
Andrew Hsieh
09d77363b4
am 7d80bf6a: Merge "arch-specific diff of header"
...
* commit '7d80bf6ab4e0df5049ccfc241bfb1408bf2e2931':
arch-specific diff of header
2013-09-06 01:35:41 -07:00
Andrew Hsieh
7d80bf6ab4
Merge "arch-specific diff of header"
2013-09-06 08:26:19 +00:00
Andrew Hsieh
d9124876f0
arch-specific diff of header
...
Change-Id: I78e2186dc7e491095201efc2c709f26e8822a076
2013-09-06 16:25:41 +08:00
Chet Haase
f15155b1c4
am 3b20ea9a: am 2fafc775: Merge "Minor fixes to animation ApiDemos" into klp-dev
...
* commit '3b20ea9a9ac1ede37f8acb4725602afc5cc19c61':
Minor fixes to animation ApiDemos
2013-09-05 23:52:09 -07:00
Dirk Dougherty
ac11f91669
am 73762c8d: am 17b152d9: am 60880978: am fe32c3ad: Adjust tags format in _index.jd files.
...
* commit '73762c8de9d804b13b2c19122257913256e15715':
Adjust tags format in _index.jd files.
2013-09-05 19:35:35 -07:00
Dirk Dougherty
73762c8de9
am 17b152d9: am 60880978: am fe32c3ad: Adjust tags format in _index.jd files.
...
* commit '17b152d9a273987645fa97b0df00a35378efc85a':
Adjust tags format in _index.jd files.
2013-09-05 19:34:14 -07:00
Dirk Dougherty
17b152d9a2
am 60880978: am fe32c3ad: Adjust tags format in _index.jd files.
...
* commit '60880978e61a43624e50a3537819e827a24ff2ae':
Adjust tags format in _index.jd files.
2013-09-05 19:33:05 -07:00
Dirk Dougherty
60880978e6
am fe32c3ad: Adjust tags format in _index.jd files.
...
* commit 'fe32c3ad53be328d445e8c5ce1d3b1f2bdad7166':
Adjust tags format in _index.jd files.
2013-09-05 19:30:18 -07:00
Dirk Dougherty
fe32c3ad53
Adjust tags format in _index.jd files.
...
Change-Id: Id32ea71d4b8d54c6e8783326b112b20e23a8f44c
2013-09-05 18:50:25 -07:00
Chet Haase
3b20ea9a9a
am 2fafc775: Merge "Minor fixes to animation ApiDemos" into klp-dev
...
* commit '2fafc7751e0ce0b80266a1e0902b1a3a70b392e4':
Minor fixes to animation ApiDemos
2013-09-05 16:40:37 -07:00
Chet Haase
2fafc7751e
Merge "Minor fixes to animation ApiDemos" into klp-dev
2013-09-05 23:36:38 +00:00
Chet Haase
f3dbdc66d7
Minor fixes to animation ApiDemos
...
Many of the original animation demos still had hardwareAccelerated="false"
in their activity tag. This was originally necessary due to the state of the
hw renderer in 3.0, but is no longer necessary.
Also, added documentation to the new Transitions demo.
Issue #7902583 Update animation ApiDemos to use hw acceleration
Change-Id: I7add3acc10d8fa36648e1869a3ec91088b2e199d
2013-09-05 12:57:33 -07:00
Deepanshu Gupta
4e21d52071
am a4a7f11e: am 7a63270e: am a3e0ada2: am 7c5fdf32: am 2c3e0af1: Merge "Add ICU jar to SDK" into jb-mr2-dev
...
* commit 'a4a7f11e117dec76d8a67477c99820d8bd83f3a0':
Add ICU jar to SDK
2013-09-05 12:03:43 -07:00