LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,088 Commits 2 Branches 0 Tags
3fd7d3d383fd64e4a8b334ab831ece073580c02c
Commit Graph

12088 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dianne Hackborn
61397edb7c am 8f0cfc76: am 65db640c: am 75dbc398: Merge "Set correct targetSdkVersion for DevelopmentSettings" into jb-mr1-dev 
* commit '8f0cfc76d1ce958b1d8f383d9c645f117c2c9a5a':
  Set correct targetSdkVersion for DevelopmentSettings
 2012-11-05 16:56:00 -08:00
Xavier Ducrohet
60c6936fae am 86441905: am 73de7f76: am 65098d0d: Move support lib to r11 
* commit '8644190551c3bf9b43b545ac923c5176f0909ee9':
  Move support lib to r11
 2012-11-05 16:53:31 -08:00
Dianne Hackborn
8f0cfc76d1 am 65db640c: am 75dbc398: Merge "Set correct targetSdkVersion for DevelopmentSettings" into jb-mr1-dev 
* commit '65db640c4629a68aba24d3b0932da0bdbbdf600a':
  Set correct targetSdkVersion for DevelopmentSettings
 2012-11-05 16:53:23 -08:00
Dianne Hackborn
65db640c46 am 75dbc398: Merge "Set correct targetSdkVersion for DevelopmentSettings" into jb-mr1-dev 
* commit '75dbc3984c2c531427a77ae9e74c655b25785999':
  Set correct targetSdkVersion for DevelopmentSettings
 2012-11-05 16:51:29 -08:00
Xavier Ducrohet
8644190551 am 73de7f76: am 65098d0d: Move support lib to r11 
* commit '73de7f76a4b800a0ecbed0ab7e830c1a6022006d':
  Move support lib to r11
 2012-11-05 16:50:49 -08:00
Dianne Hackborn
75dbc3984c Merge "Set correct targetSdkVersion for DevelopmentSettings" into jb-mr1-dev 2012-11-05 16:50:14 -08:00
Xavier Ducrohet
73de7f76a4 am 65098d0d: Move support lib to r11 
* commit '65098d0da5bd04fac0b2bcf044f32c4a38548031':
  Move support lib to r11
 2012-11-05 16:48:01 -08:00
Xavier Ducrohet
65098d0da5 Move support lib to r11 
Change-Id: I714cefd462e30d4a975be40e0f9f8f14cb74fe26
 2012-11-05 16:45:03 -08:00
Dianne Hackborn
178634c803 Set correct targetSdkVersion for DevelopmentSettings 
This app shouldn't be used on API 14 or earlier, which is when
the real development settings panel was introduced.

Change-Id: I1436ff938aa66942c592d615b7bd5910e8cbfd88
 2012-11-05 16:24:52 -08:00
Katie McCormick
99ca344b23 cherrypick from ics-mr1 docs: network sample Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2 
Change-Id: I60235aa3e80974f2c3000760853f0159cf41cfa5
 2012-11-05 14:52:30 -08:00
Philip Milne
a982bbe43b am ffddc2e6: am 52a24010: am 888ac28d: Fixes to GridLayout demos. 
* commit 'ffddc2e6d8026d4e31343bde43e48abb5067d873':
  Fixes to GridLayout demos.
 2012-11-05 14:22:01 -08:00
Philip Milne
ffddc2e6d8 am 52a24010: am 888ac28d: Fixes to GridLayout demos. 
* commit '52a24010bb1cca085fa752faa35807082dec867b':
  Fixes to GridLayout demos.
 2012-11-05 14:17:53 -08:00
Philip Milne
52a24010bb am 888ac28d: Fixes to GridLayout demos. 
* commit '888ac28d79e6bcba43b200bc3d9ed971e0516c2b':
  Fixes to GridLayout demos.
 2012-11-05 14:12:10 -08:00
Trevor Johns
dad9287f9f am 4bab2147: am b89392d8: Merge "LunarLander: Fix race condition causing crash on exit" 
* commit '4bab2147b39d7e5a2babb02b3544cc2c483a3142':
  LunarLander: Fix race condition causing crash on exit
 2012-11-02 13:22:20 -07:00
Trevor Johns
4bab2147b3 am b89392d8: Merge "LunarLander: Fix race condition causing crash on exit" 
* commit 'b89392d837f06840c208ee3fbd3700632a04c725':
  LunarLander: Fix race condition causing crash on exit
 2012-11-02 13:19:14 -07:00
Trevor Johns
b89392d837 Merge "LunarLander: Fix race condition causing crash on exit" 2012-11-02 12:59:49 -07:00
The Android Open Source Project
3e5d85bbf5 am 70733220: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '70733220a7d61da44c6465f51154bb8e73b34f15':
 2012-11-02 07:30:21 -07:00
The Android Open Source Project
70733220a7 Reconcile with jb-mr1-release - do not merge 
Change-Id: I2c7dc58d384802df352438ef14c32654d1271a61
 2012-11-02 07:27:49 -07:00