Commit Graph

12830 Commits

Author SHA1 Message Date
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
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
The Android Automerger
89b09c486c merge in klp-release history after reset to klp-dev 2013-09-12 06:00:53 -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
Erik Gilling
438ea813f1 Add Consumer IR ApiDemo
Change-Id: I4eb27b2ba6a46c27962eaa5e09d3e65939b64c0a
2013-09-10 21:07:58 -07:00
The Android Automerger
1716bb09a7 merge in klp-release history after reset to klp-dev 2013-09-09 06:00:57 -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
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
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
a4a7f11e11 am 7a63270e: am a3e0ada2: am 7c5fdf32: am 2c3e0af1: Merge "Add ICU jar to SDK" into jb-mr2-dev
* commit '7a63270eb422d91d8036c7285c584c1872d589c7':
  Add ICU jar to SDK
2013-09-05 11:59:47 -07:00
Deepanshu Gupta
7a63270eb4 am a3e0ada2: am 7c5fdf32: am 2c3e0af1: Merge "Add ICU jar to SDK" into jb-mr2-dev
* commit 'a3e0ada25bb5fbd34fe6ade783bdb61469871ab8':
  Add ICU jar to SDK
2013-09-05 11:57:31 -07:00
Deepanshu Gupta
a3e0ada25b am 7c5fdf32: am 2c3e0af1: Merge "Add ICU jar to SDK" into jb-mr2-dev
* commit '7c5fdf3251a44fb584c957de37849e4d4b6d363e':
  Add ICU jar to SDK
2013-09-05 11:54:57 -07:00
Deepanshu Gupta
7c5fdf3251 am 2c3e0af1: Merge "Add ICU jar to SDK" into jb-mr2-dev
* commit '2c3e0af13c08379895f0ec296f2e5cb7670acb4a':
  Add ICU jar to SDK
2013-09-05 11:52:38 -07:00
Deepanshu Gupta
2c3e0af13c Merge "Add ICU jar to SDK" into jb-mr2-dev 2013-09-05 18:48:10 +00:00
Tom O'Neill
9fed64dead am 6ae72772: React to split of getStatus() into onGetSummary() and onGetEnabled()
* commit '6ae72772c076b602eb71c3e0b680d6b514323c07':
  React to split of getStatus() into onGetSummary() and onGetEnabled()
2013-09-05 10:37:35 -07:00
Tom O'Neill
6ae72772c0 React to split of getStatus() into onGetSummary() and onGetEnabled()
- Part of b/10461474

Change-Id: I1dbee915692aab93d56d85203cee3133a8e0e058
2013-09-05 08:17:40 -07:00
The Android Automerger
9f8fb0a043 merge in klp-release history after reset to klp-dev 2013-09-05 06:00:51 -07:00
Dirk Dougherty
494ae6239c am 79392cbf: am 97717b66: am 3186fb28: am 16f78acf: Add _index.jd files to a few test samples.
* commit '79392cbf67fd250e1bfa23f9abcb408ae69f6a69':
  Add _index.jd files to a few test samples.
2013-09-04 22:27:44 -07:00
Dirk Dougherty
79392cbf67 am 97717b66: am 3186fb28: am 16f78acf: Add _index.jd files to a few test samples.
* commit '97717b6664d08e00e6a94715fd77cb01cf0ce7ae':
  Add _index.jd files to a few test samples.
2013-09-04 22:25:42 -07:00
Dirk Dougherty
97717b6664 am 3186fb28: am 16f78acf: Add _index.jd files to a few test samples.
* commit '3186fb282159f222abe20a804a24e7d49f4c81c0':
  Add _index.jd files to a few test samples.
2013-09-04 22:23:35 -07:00
Dirk Dougherty
3186fb2821 am 16f78acf: Add _index.jd files to a few test samples.
* commit '16f78acfe1f842881787401dfa8d2e72d13d19f1':
  Add _index.jd files to a few test samples.
2013-09-04 22:20:29 -07:00
Dirk Dougherty
16f78acfe1 Add _index.jd files to a few test samples.
Change-Id: Iffdc702c29319e03f22705d7c615ff2f0ff69e33
2013-09-04 21:56:39 -07:00
Dianne Hackborn
3afdda6286 am 0a98bfed: Fix build -- undo manager not yet public.
* commit '0a98bfeda6423533417e2eee5ae669e61651f818':
  Fix build -- undo manager not yet public.
2013-09-04 19:08:30 -07:00
Dianne Hackborn
0a98bfeda6 Fix build -- undo manager not yet public.
Change-Id: I2d1d59e27b1bbe499421aa2312d8220d12ba18fb
2013-09-04 19:04:56 -07:00
Chet Haase
397a561724 am 916c2c60: Merge "New demo for transitions feature" into klp-dev
* commit '916c2c6013f83a513351e0aa0c3cb2e0b0f1c6f3':
  New demo for transitions feature
2013-09-04 16:49:37 -07:00
Chet Haase
916c2c6013 Merge "New demo for transitions feature" into klp-dev 2013-09-04 23:47:50 +00:00