LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,682 Commits 2 Branches 0 Tags
45cb1b0a85458dd80fb321c7fa0502e3bd33eaa5
Commit Graph

8682 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Hsieh
d0e65433d0 Fixed compilation error #include <android/*h> 
Fixed compilation error when header in #include <android/*h> is
included alone.

Fix for rect.h already exists in $ANDROID/frameworks/native/include/android

Change-Id: I7c49e044507581c5ad591f26f99cda6870b411c5
 2012-04-20 15:50:10 +08:00
Scott Main
7b797e3bb5 am 1583b7c6: Delete the fragment-UI sample in favor of the FragmentBasics sample for the 101 training class on fragments 
* commit '1583b7c60373b1b501f69b16c3eb718529a3ffd4':
  Delete the fragment-UI sample in favor of the FragmentBasics sample for the 101 training class on fragments
 2012-04-19 16:53:19 -07:00
Scott Main
dc8be81ab0 am ff329d74: Merge "Rename the activity lifecycle sample\'s directory" into ics-mr1 
* commit 'ff329d74fcd9d387c784d4e72c2b806c727965f6':
  Rename the activity lifecycle sample's directory
 2012-04-19 16:50:00 -07:00
Scott Main
1583b7c603 Delete the fragment-UI sample in favor of the FragmentBasics sample 
for the 101 training class on fragments

Change-Id: I3289e3f4d74869956ee20a5b817a469cce885018
 2012-04-19 16:49:16 -07:00
Scott Main
ff329d74fc Merge "Rename the activity lifecycle sample's directory" into ics-mr1 2012-04-19 16:47:27 -07:00
Scott Main
11f9ad8c3d am ba1636e4: Add new sample for 101 class on fragments. 
* commit 'ba1636e4259c15f2a8f01754420d86f7a5802f23':
  Add new sample for 101 class on fragments.
 2012-04-19 16:46:38 -07:00
Scott Main
d573ba579b Rename the activity lifecycle sample's directory 
Change-Id: I76c27dfbead6462b0bdfc3b58e24b0fe96d8272f
 2012-04-19 16:46:14 -07:00
Scott Main
ba1636e425 Add new sample for 101 class on fragments. 
The app has a fragment with a list that shows a couple phony
article names and a fragment that displays the phony articles.
They appear side by side on a large screen, but one at a time on smaller screens.

Change-Id: Ic78b772e1c8d1ddbfa6fa3fdb0b54a2363951063
 2012-04-19 16:18:16 -07:00
Jean-Baptiste Queru
d294027b1f Merge 2fa7b9ff 
Change-Id: I59b2fd09648909c721af5ebb951bc2287fe9fc1a
 2012-04-18 15:04:52 -07:00
Xavier Ducrohet
2fa7b9ffeb Merge "Move emulator GLES from development.git to sdk.git" 2012-04-18 12:14:25 -07:00
Jesse Hall
80d4ba7716 Move emulator GLES from development.git to sdk.git 
The emulator GLES support has two interfaces: a host shared library
interface used by QEMU, and a protocol between the platform and the
host. The host library interface is not versioned; QEMU and the GLES
renderer must match. The protocol on the other hand must be backwards
compatible: a new GLES renderer must support an older platform image.

Thus for branching purposes it makes more sense to put the GLES
renderer in sdk.git, which is branched along with qemu.git for SDK
releases. Platform images will be built against the protocol version
in the platform branch of sdk.git.

Change-Id: Ie73fce12815c9740e27d0f56caa53c6ceb3d30cc
 2012-04-18 06:26:17 -07:00
Fred Chung
53bb817340 am 16266ff7: Updated "Making your App Location Aware" class to include information on location provider enable check. 
* commit '16266ff7117a5cf65b9fcc52d72a4ba5f6db09c6':
  Updated "Making your App Location Aware" class to include information on location provider enable check.
 2012-04-17 09:47:57 -07:00
Fred Chung
16266ff711 Updated "Making your App Location Aware" class to include information on location provider enable check. 
Change-Id: I97e0a6b02bccbfbdc5697953d2d8b63cb6089370
 2012-04-16 23:26:40 -07:00
Robert Ly
affcdfd7d8 adding media effects sample to sdk 
Change-Id: I8fc55e1ac5409c0262bfda930e6db3d34ce6ae08
 2012-04-16 10:48:24 -07:00
Andrew Hsieh
5d610bfe13 am 46ead86b: Merge "Refresh development/ndk/platforms/android-9/arch-x86/include/machine" 
* commit '46ead86b0234fd514c7a1adc306ee37de00d59fb':
  Refresh development/ndk/platforms/android-9/arch-x86/include/machine
 2012-04-05 22:49:46 -07:00
Andrew Hsieh
46ead86b02 Merge "Refresh development/ndk/platforms/android-9/arch-x86/include/machine" 2012-04-05 22:30:09 -07:00
Andrew Hsieh
dab6072046 Refresh development/ndk/platforms/android-9/arch-x86/include/machine 
Apply changes in bionic/libc/arch-x86/include/machine to
development/ndk/platforms/android-9/arch-x86/include/machine:

   commit 5fbf2e09921723cfdea75e83c1fac2080f0ad564

Change-Id: Ie0fe711ae4c866d9c1300430d5e9613ccb82da22
 2012-04-06 13:29:08 +08:00
Scott Main
350b2b401d am cbece732: Merge "Sample app for Android U class: Displaying Bitmaps Efficiently" into ics-mr1 
* commit 'cbece7322a7c74b74f2fc43cdff9bd9d7ab38632':
  Sample app for Android U class: Displaying Bitmaps Efficiently
 2012-04-05 11:31:27 -07:00
Scott Main
cbece7322a Merge "Sample app for Android U class: Displaying Bitmaps Efficiently" into ics-mr1 2012-04-05 11:29:42 -07:00
Trevor Johns
406c9c7155 am a539e4e3: Update activity-lifecycle sample: Use unique package name 
* commit 'a539e4e377cab1785b86af2f0260b63544fb6ff9':
  Update activity-lifecycle sample: Use unique package name
 2012-04-04 17:39:20 -07:00
Trevor Johns
a539e4e377 Update activity-lifecycle sample: Use unique package name 
Changing the package name for activity-lifecycle sample from
com.example.android to com.example.android.lifecycle.

Change-Id: I8c17762fde0895408da0b2e1b17b425bcb9e7abb
 2012-04-04 17:21:53 -07:00
Scott Main
bb3a773817 am dfd2ae22: Merge "uploading sample code for AU class on Activity Lifecycle" into ics-mr1 
* commit 'dfd2ae2278fba8654d9c8f81a16e8fb833c6e4f0':
  uploading sample code for AU class on Activity Lifecycle
 2012-04-04 16:27:18 -07:00
Scott Main
dfd2ae2278 Merge "uploading sample code for AU class on Activity Lifecycle" into ics-mr1 2012-04-04 16:25:14 -07:00
Scott Main
b2d2933cfd am 96f6139c: Merge "first draft of sample code for AU basic training class on fragments" into ics-mr1 
* commit '96f6139c59b30755ca4e7d70bc34d6391eea8c2b':
  first draft of sample code for AU basic training class on fragments
 2012-04-04 16:24:28 -07:00
Scott Main
96f6139c59 Merge "first draft of sample code for AU basic training class on fragments" into ics-mr1 2012-04-04 16:22:49 -07:00
Xavier Ducrohet
e3e74aa50e am 2a57c793: Merge "Move stuff from prebuilt to prebuilts/tools" 
* commit '2a57c79366dcdac42e330a8af752e44410556f31':
  Move stuff from prebuilt to prebuilts/tools
 2012-04-04 14:01:30 -07:00
Xavier Ducrohet
2a57c79366 Merge "Move stuff from prebuilt to prebuilts/tools" 2012-04-04 13:02:37 -07:00
Fred Chung
d074f7505e am 607ac0bc: Merge "Sample app for Android Training lesson: Making your app location aware." into ics-mr1 
* commit '607ac0bc7caaf02851f5ebb6b2a883491e2527e3':
  Sample app for Android Training lesson: Making your app location aware.
 2012-04-04 12:41:37 -07:00
Fred Chung
607ac0bc7c Merge "Sample app for Android Training lesson: Making your app location aware." into ics-mr1 2012-04-04 12:39:21 -07:00
Fred Chung
137dce1528 Sample app for Android Training lesson: Making your app location aware. 
Change-Id: I205a9e3f98823fbd90c5b770de8fe6ce8a9e345b
 2012-04-03 22:46:10 -07:00
Billy Rutledge
87a714c17c uploading sample code for AU class on Activity Lifecycle 
Change-Id: Ieefd55823eaa7ce7042a5dd8739a8ab7c4b992fc
 2012-04-03 20:39:32 -07:00
Adam Koch
2bab0137e0 Sample app for Android U class: Displaying Bitmaps Efficiently 
Change-Id: I21da4e60f719b7159ada83894cca8d108bedd3d5
 2012-04-03 23:15:18 -04:00
Billy Rutledge
d2d0d4feb2 first draft of sample code for AU basic training class on fragments 
Change-Id: I15b04de5e63ecbfaa1d911a2070c5c0b01542211
 2012-04-03 20:10:48 -07:00
Scott Main
230d469ee9 am 202b6523: docs: add GP Licensing redirect 
* commit '202b6523763cb4562300b89a8c85f45646980a07':
  docs: add GP Licensing redirect
 2012-04-03 18:23:46 -07:00
Scott Main
202b652376 docs: add GP Licensing redirect 
Change-Id: I0ee44dd4ff001275b06c6bc4663e2f2b54afff34
 2012-04-03 18:19:35 -07:00
Xavier Ducrohet
40525ef472 Move stuff from prebuilt to prebuilts/tools 
Also move some atree copy to sdk.git where they belong.

Change-Id: Iab62343806917f24f47d15b9dea75e44422d8764
 2012-04-03 16:33:35 -07:00
Raphael Moll
07ef63f4db am 2edb02ab: SDK: generate repo in xsd v6. DO NOT MERGE. 
* commit '2edb02ab24e0ba19065cb4d2919892c6ac268921':
  SDK: generate repo in xsd v6. DO NOT MERGE.
 2012-04-03 11:19:34 -07:00
Andrew Hsieh
6ad643e1a9 am 34ccdaa8: Merge "ndk: ANativeActivity: Fix \'clazz\' member documentation." 
* commit '34ccdaa87b25c2456a76aafcf09a66b2fab236ff':
  ndk: ANativeActivity: Fix 'clazz' member documentation.
 2012-04-03 07:25:15 -07:00
Andrew Hsieh
34ccdaa87b Merge "ndk: ANativeActivity: Fix 'clazz' member documentation." 2012-04-03 04:32:21 -07:00
David 'Digit' Turner
16c0f25354 ndk: ANativeActivity: Fix 'clazz' member documentation. 
As discussed on android-ndk, the member is misnamed

Change-Id: I2a5a1c8dce327ddf9ab7a4d14f4e2fdf62808753
 2012-04-03 19:30:08 +08:00
Raphael Moll
2edb02ab24 SDK: generate repo in xsd v6. DO NOT MERGE. 
Requires change Ib6f5b03c and change I6ba33a96.

Change-Id: Ib42676359289e731d045c4a1e26c85fe5868d633
 2012-04-02 15:21:41 -07:00
Trevor Johns
9be60a23cd am 4947ffb9: Merge "Docs: Fixing broken link in TtsEngine/_index.html" into ics-mr1 
* commit '4947ffb99b5fd271549c33ff9aa3d3f88a27b0d7':
  Docs: Fixing broken link in TtsEngine/_index.html
 2012-04-02 14:51:42 -07:00
Trevor Johns
4947ffb99b Merge "Docs: Fixing broken link in TtsEngine/_index.html" into ics-mr1 2012-04-02 14:49:32 -07:00
Andrew Hsieh
d63680fbc4 am 9487df9a: Merge "Remove auto-gen project.properties" 
* commit '9487df9a0f54bc1b572dff04a6b4c9f741d88d42':
  Remove auto-gen project.properties
 2012-04-02 07:55:47 -07:00
Andrew Hsieh
ed42b4b02d am 2bbd700e: Merge "ndk: <dlfcn.h>: dladdr() takes a \'const void*\' parameter, not \'void*\'" 
* commit '2bbd700ef64579a9b0abcf1a538294ae0b1fec3d':
  ndk: <dlfcn.h>: dladdr() takes a 'const void*' parameter, not 'void*'
 2012-04-02 07:55:46 -07:00
Andrew Hsieh
e3f5656b94 am 48aaee2c: Merge "Native media sample app for NDK API level 14" 
* commit '48aaee2cd0ca157b4c789bf017cd2ff6e9404664':
  Native media sample app for NDK API level 14
 2012-04-02 07:55:44 -07:00
Andrew Hsieh
93e83437cc am 2c10ade9: Merge "ndk: android-9: Add missing <sys/eventfd.h> header" 
* commit '2c10ade96c1eb1f9849eacecfd3739ccbd668e42':
  ndk: android-9: Add missing <sys/eventfd.h> header
 2012-04-02 07:55:43 -07:00
Andrew Hsieh
f12cbd4097 am ea94d94a: Merge "ndk: <signal.h>: Increase _NSIG definition to 64" 
* commit 'ea94d94a3b248e290aa66b71625b72f17814eacc':
  ndk: <signal.h>: Increase _NSIG definition to 64
 2012-04-02 07:55:37 -07:00
Andrew Hsieh
964684ba5b am 535478dd: Merge "ndk: <pthread.h>: formatting + updates" 
* commit '535478dd4de9bfe4cf4668d6d767ce48e2919f69':
  ndk: <pthread.h>: formatting + updates
 2012-04-02 07:55:36 -07:00
Andrew Hsieh
87d906b243 am 5f37cda9: Merge "ndk: <unistd.h>: minor cleanup" 
* commit '5f37cda9b9cca301c839e868464ab4890c2c7c9e':
  ndk: <unistd.h>: minor cleanup
 2012-04-02 07:55:35 -07:00