LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,706 Commits 2 Branches 0 Tags
fade4acf30c83386acef52dc5cdbe14b6a60f7bf
Commit Graph

11706 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
55d6a11dd6 am cd18b809: am 2df7c91d: am 87525f60: am 09d8f21c: am e242276c: docs: redirect next steps to building first app class 
* commit 'cd18b80902d862211b4116e65d2473de1c1f0b44':
  docs: redirect next steps to building first app class
 2012-11-12 19:55:23 -08:00
Scott Main
cd18b80902 am 2df7c91d: am 87525f60: am 09d8f21c: am e242276c: docs: redirect next steps to building first app class 
* commit '2df7c91d5f93a91f23c54239de5ac49d06ee1554':
  docs: redirect next steps to building first app class
 2012-11-12 19:52:49 -08:00
Scott Main
2df7c91d5f am 87525f60: am 09d8f21c: am e242276c: docs: redirect next steps to building first app class 
* commit '87525f600943f36697c85c22555463bb199afc2f':
  docs: redirect next steps to building first app class
 2012-11-12 19:50:56 -08:00
Scott Main
87525f6009 am 09d8f21c: am e242276c: docs: redirect next steps to building first app class 
* commit '09d8f21c0b9531d1d2615a737b256da4f29d27bf':
  docs: redirect next steps to building first app class
 2012-11-12 19:47:51 -08:00
Scott Main
09d8f21c0b am e242276c: docs: redirect next steps to building first app class 
* commit 'e242276c5b021c6219b31e9a40e126b633f15deb':
  docs: redirect next steps to building first app class
 2012-11-12 19:45:49 -08:00
Andy Stadler
819950decd am ee062480: am 623e45b7: am e9a06346: am 18bc76ab: Cleanup eclipse .classpath for Gallery2 
* commit 'ee062480adcacde89e0ed1a04e8d0e34faa3e42c':
  Cleanup eclipse .classpath for Gallery2
 2012-11-12 16:15:54 -08:00
Andy Stadler
ee062480ad am 623e45b7: am e9a06346: am 18bc76ab: Cleanup eclipse .classpath for Gallery2 
* commit '623e45b7eec12cde5d77db2cdcbd276c5b245d2f':
  Cleanup eclipse .classpath for Gallery2
 2012-11-12 16:13:40 -08:00
Andy Stadler
623e45b7ee am e9a06346: am 18bc76ab: Cleanup eclipse .classpath for Gallery2 
* commit 'e9a0634689298458077de62186b6a85c4ff2324b':
  Cleanup eclipse .classpath for Gallery2
 2012-11-12 16:11:58 -08:00
Andy Stadler
e9a0634689 am 18bc76ab: Cleanup eclipse .classpath for Gallery2 
* commit '18bc76ab25b105af2d26c5456e0937e139b3203b':
  Cleanup eclipse .classpath for Gallery2
 2012-11-12 16:09:36 -08:00
Andy Stadler
18bc76ab25 Cleanup eclipse .classpath for Gallery2 
A couple of minor fixes to make eclipse happy.

Change-Id: Id9a30778efd3ef18e45efe316402971ca72a7c60
 2012-11-12 14:40:23 -08:00
Andy Stadler
afa0c3fbbb am a103fc1e: Cleanup eclipse .classpath for Gallery2 
* commit 'a103fc1e4ed59001673ca28ddf0dabde9b2c0f01':
  Cleanup eclipse .classpath for Gallery2
 2012-11-12 13:50:28 -08:00
Andy Stadler
a103fc1e4e Cleanup eclipse .classpath for Gallery2 
A couple of minor fixes to make eclipse happy.

Change-Id: Id9a30778efd3ef18e45efe316402971ca72a7c60
 2012-11-12 13:42:25 -08:00
Marco Nelissen
3cab67467e Add video for VideoView demo 
Add one of the CTS test videos so the demo works out of the box, and
make the video fill the screen instead of hardcoding it to a tiny size.

Change-Id: Ie26a4ae0e186fe966d0679b088492a0c7d035713
 2012-11-09 14:46:52 -08:00
The Android Open Source Project
e761ab8fed am 37ca54d2: (-s ours) am 62ea063d: am 7cb8e4ae: Reconcile with jb-mr1-release - do not merge 
* commit '37ca54d2a212cd4c1cb4ebf7d3a6cabb1748fe7b':
 2012-11-08 06:31:49 -08:00
The Android Open Source Project
37ca54d2a2 am 62ea063d: am 7cb8e4ae: Reconcile with jb-mr1-release - do not merge 
* commit '62ea063df0c96ff549e1fe6d4bbdbf4836f23d3d':
 2012-11-08 06:26:56 -08:00
Xavier Ducrohet
66eba00914 am 0a5b1596: am 42a111e5: am 9350dd44: am 85c1f088: revert API 17 system image to rev 1. 
* commit '0a5b159698c94b718e6fd7395fb511b3476899d0':
  revert API 17 system image to rev 1.
 2012-11-08 06:17:41 -08:00
The Android Open Source Project
3d3c7ab815 am dcec4836: (-s ours) am 3902e196: am f2701a8a: Reconcile with jb-mr1-release - do not merge 
* commit 'dcec4836a7e8153b172db27c10c49fa5d11e684c':
 2012-11-08 06:17:40 -08:00
Xavier Ducrohet
0a5b159698 am 42a111e5: am 9350dd44: am 85c1f088: revert API 17 system image to rev 1. 
* commit '42a111e579f2de6c834573285409a47d842c4057':
  revert API 17 system image to rev 1.
 2012-11-08 06:14:20 -08:00
The Android Open Source Project
dcec4836a7 am 3902e196: am f2701a8a: Reconcile with jb-mr1-release - do not merge 
* commit '3902e1967eacb8211c2805eb4281c555bb0df8d8':
 2012-11-08 06:12:38 -08:00
Scott Main
e242276c5b docs: redirect next steps to building first app class 
Change-Id: I2cc922573021a6c69d8830ab886b537df28a2a62
 2012-11-07 17:47:47 -08:00
The Android Open Source Project
62ea063df0 am 7cb8e4ae: Reconcile with jb-mr1-release - do not merge 
* commit '7cb8e4ae66a4a9f73ed40576efd5da4d86e9a2a0':
 2012-11-07 10:22:12 -08:00
The Android Open Source Project
7cb8e4ae66 Reconcile with jb-mr1-release - do not merge 
Change-Id: I36e5d6ccd61dc24a395656f7fdf9a6ca3781a331
 2012-11-07 10:19:43 -08:00
Andrew Hsieh
6a172a167e am a6326ef6: am e67bb3dc: am 0f85f2de: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation" 
* commit 'a6326ef671e269863fda56f086388f9b76849e26':
  Fix return type of glGetAttribLocation and glGetUniformLocation
 2012-11-06 20:37:32 -08:00
Andrew Hsieh
a6326ef671 am e67bb3dc: am 0f85f2de: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation" 
* commit 'e67bb3dc07975413341087727dd797b69fdd5dd2':
  Fix return type of glGetAttribLocation and glGetUniformLocation
 2012-11-06 20:27:15 -08:00
Andrew Hsieh
e67bb3dc07 am 0f85f2de: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation" 
* commit '0f85f2de9c2ba9d764c7774fb826535ed9d148ca':
  Fix return type of glGetAttribLocation and glGetUniformLocation
 2012-11-06 20:24:52 -08:00
Andrew Hsieh
0f85f2de9c Merge "Fix return type of glGetAttribLocation and glGetUniformLocation" 2012-11-06 20:16:34 -08:00
The Android Automerger
f893fe7ac1 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-06 18:03:53 -08:00
Xavier Ducrohet
42a111e579 am 9350dd44: am 85c1f088: revert API 17 system image to rev 1. 
* commit '9350dd44e3516251d88661e298b80f9f9fc1d8e5':
  revert API 17 system image to rev 1.
 2012-11-06 17:13:23 -08:00
Xavier Ducrohet
9350dd44e3 am 85c1f088: revert API 17 system image to rev 1. 
* commit '85c1f0880d5d8ac8fab41dc141eba3e5495bedcd':
  revert API 17 system image to rev 1.
 2012-11-06 17:09:19 -08:00
Xavier Ducrohet
85c1f0880d revert API 17 system image to rev 1. 
Change-Id: I6e28fd4567f8c99eaca86b328d10d616317cf5d8
 2012-11-06 15:27:49 -08:00
Andrew Hsieh
18fc7183ea Fix return type of glGetAttribLocation and glGetUniformLocation 
from int to GLint.

See:
   https://android-review.googlesource.com/#/c/46120
   http://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetAttribLocation.xml
   http://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetUniformLocation.xml

Change-Id: I57fa430be2987b41e31fb6b3bcefa5dfb58e63b9
 2012-11-06 13:52:56 -08:00
The Android Open Source Project
3902e1967e am f2701a8a: Reconcile with jb-mr1-release - do not merge 
* commit 'f2701a8a6e1b5a056e4c8609713ff9b045fc1e82':
 2012-11-06 13:29:15 -08:00
The Android Open Source Project
f2701a8a6e Reconcile with jb-mr1-release - do not merge 
Change-Id: I3cd40c84fd37293ca96b5c35bea6c34871bf7659
 2012-11-06 13:26:41 -08:00
The Android Automerger
5b96c40589 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-06 13:13:21 -08:00
The Android Open Source Project
4564a7faf5 am 7894ce43: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit '7894ce435ac2708fb3908911fe9b9a3a30b4cfe9':
 2012-11-06 12:40:05 -08:00
The Android Open Source Project
7894ce435a Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I6f3ca8c4ce83100bc3da52d60b238640d9e301cb
 2012-11-06 12:37:14 -08:00
The Android Open Source Project
4cbbd7ac9b am 896412bf: (-s ours) am 413b280d: am 4844b206: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
* commit '896412bf3bcffe8e1331dd635542b4ac76c01b26':
 2012-11-06 11:26:58 -08:00
The Android Open Source Project
896412bf3b am 413b280d: am 4844b206: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
* commit '413b280dcbd3108a44728aac111035d47409ee77':
 2012-11-06 11:24:32 -08:00
The Android Open Source Project
413b280dcb am 4844b206: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
* commit '4844b2068d9f036f9f036da58f2295927c8ee085':
  Camera2: Use lower resolutions for front fake camera
  Camera2: Fix deadlock issues with getInProgressCount
  EmulatedFakeCamera2: Add features needed for recording support for 320x240, NV21
  gralloc: Add automatic format selection
 2012-11-06 11:22:52 -08:00
The Android Open Source Project
4844b2068d Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
Change-Id: Ib34e324ad00ff6f1b970c073ed468a45af88280d
 2012-11-06 11:20:18 -08:00
Katie McCormick
6d0e799a89 am c42a143d: am 15920fa9: am 130b7e43: Merge "cherrypick from ics-mr1 docs: network sample Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2" into jb-mr1-dev 
* commit 'c42a143ddb9b7489c8788c891318410997e553d5':
  cherrypick from ics-mr1 docs: network sample Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2
 2012-11-06 11:08:19 -08:00
Katie McCormick
c42a143ddb am 15920fa9: am 130b7e43: Merge "cherrypick from ics-mr1 docs: network sample Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2" into jb-mr1-dev 
* commit '15920fa94559ddff48b0d2e83b5f086c49fb5c67':
  cherrypick from ics-mr1 docs: network sample Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2
 2012-11-06 11:06:18 -08:00
Katie McCormick
15920fa945 am 130b7e43: Merge "cherrypick from ics-mr1 docs: network sample Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2" into jb-mr1-dev 
* commit '130b7e43f91e154cd1e9a63c37089c223c3e1f1e':
  cherrypick from ics-mr1 docs: network sample Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2
 2012-11-06 11:03:26 -08:00
Katie McCormick
130b7e43f9 Merge "cherrypick from ics-mr1 docs: network sample Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2" into jb-mr1-dev 2012-11-06 09:29:58 -08:00
The Android Automerger
76fa8e0b46 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-06 02:14:02 -08:00
The Android Automerger
1c9c1edfcb merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-05 18:38:39 -08:00
Xavier Ducrohet
529c766225 am 67efee54: am 36c8ceb0: am 529393a5: Update API text file. 
* commit '67efee54a29173b9b40d6ae894fe7bfc31984458':
  Update API text file.
 2012-11-05 17:15:46 -08:00
Xavier Ducrohet
67efee54a2 am 36c8ceb0: am 529393a5: Update API text file. 
* commit '36c8ceb0ab5e16280b6b83bc7d7d8fe99cbeee36':
  Update API text file.
 2012-11-05 17:14:34 -08:00
Xavier Ducrohet
36c8ceb0ab am 529393a5: Update API text file. 
* commit '529393a5da3baba4c912be460f577714e42cc835':
  Update API text file.
 2012-11-05 17:13:12 -08:00
Xavier Ducrohet
529393a5da Update API text file. 
Change-Id: I9513b88373e893d8f16092d1735e6eb0bb7ea34b
 2012-11-05 17:09:52 -08:00