LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,336 Commits 2 Branches 0 Tags
d0c00c8da42e16d583aa14fba6fb90a42f95f1ea
Commit Graph

10336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
d890524c3b am 8fe69d78: am 934e8508: am ba1636e4: Add new sample for 101 class on fragments. 
* commit '8fe69d78bb20061ea6121c329c4c5e162fba08cd':
 2012-04-24 13:57:18 -07:00
The Android Automerger
ebeca628a1 merge in jb-release history after reset to master 2012-04-24 07:00:35 -07:00
Gilles Debunne
a11d0eb32e Merge "Fixed the XMLAdapters example" 2012-04-23 15:52:48 -07:00
Raphael Moll
931eb3a400 am 497c9183: am 6a04b5bb: Merge "Support for Windows SDK pre-requisite module list." 
* commit '497c91834be1be005add05c0be0770b6440970f6':
  Support for Windows SDK pre-requisite module list.
 2012-04-23 15:49:22 -07:00
Raphael Moll
497c91834b am 6a04b5bb: Merge "Support for Windows SDK pre-requisite module list." 
* commit '6a04b5bb4e1655c274cc0f2b3d5e4954c1911792':
  Support for Windows SDK pre-requisite module list.
 2012-04-23 15:45:33 -07:00
Raphael Moll
6a04b5bb4e Merge "Support for Windows SDK pre-requisite module list." 2012-04-23 14:26:53 -07:00
Raphael Moll
3fb225fbfd Support for Windows SDK pre-requisite module list. 
Requires sdk.git change I08fc98f2e1

Change-Id: I7388d7292d175ceac221ce6790655b37f85e8a32
 2012-04-23 13:16:16 -07:00
Robert Ly
4b8b75264e am 41ab7fd7: am 018c9eeb: Merge "adding media effects sample to sdk" into ics-mr1 
* commit '41ab7fd7ae04a87a9e3ab9dae292a92df6125385':
 2012-04-23 10:44:57 -07:00
Robert Ly
9642d03bda am 3fd0c48b: am 018c9eeb: Merge "adding media effects sample to sdk" into ics-mr1 
* commit '3fd0c48b8e0f1297dee8ffa6103fd19ebe03da82':
  adding media effects sample to sdk
 2012-04-23 10:44:42 -07:00
Robert Ly
13a086893a am f6199950: am 018c9eeb: Merge "adding media effects sample to sdk" into ics-mr1 
* commit 'f6199950068eda60c47d07d1e41b588c8fd729a4':
  adding media effects sample to sdk
 2012-04-23 10:43:12 -07:00
Robert Ly
41ab7fd7ae am 018c9eeb: Merge "adding media effects sample to sdk" into ics-mr1 
* commit '018c9eeb8e05e4dd6965655d9f120b595efcd758':
  adding media effects sample to sdk
 2012-04-23 10:41:40 -07:00
Robert Ly
f619995006 am 018c9eeb: Merge "adding media effects sample to sdk" into ics-mr1 
* commit '018c9eeb8e05e4dd6965655d9f120b595efcd758':
  adding media effects sample to sdk
 2012-04-23 10:41:26 -07:00
Robert Ly
3fd0c48b8e am 018c9eeb: Merge "adding media effects sample to sdk" into ics-mr1 
* commit '018c9eeb8e05e4dd6965655d9f120b595efcd758':
  adding media effects sample to sdk
 2012-04-23 10:41:00 -07:00
Robert Ly
018c9eeb8e Merge "adding media effects sample to sdk" into ics-mr1 2012-04-23 10:38:30 -07:00
Raphael Moll
56b077812c am a5965405: am 186f007a: Merge "Split build/targets/product/sdk.mk" 
* commit 'a596540506a8cd3d4ea780f48e8a9306d4481476':
  Split build/targets/product/sdk.mk
 2012-04-23 10:15:57 -07:00
Raphael Moll
a596540506 am 186f007a: Merge "Split build/targets/product/sdk.mk" 
* commit '186f007a741bebdc5ad364df9eda1a9b383e2e15':
  Split build/targets/product/sdk.mk
 2012-04-23 10:11:32 -07:00
Raphael Moll
186f007a74 Merge "Split build/targets/product/sdk.mk" 2012-04-23 09:48:51 -07:00
The Android Automerger
62bad7555e merge in jb-release history after reset to master 2012-04-23 07:00:31 -07:00
Xavier Ducrohet
ad3600bb6e Merge "Add .classpath/.project/readme to gridlayout support package." 2012-04-20 17:02:54 -07:00
Xavier Ducrohet
8957faa8d0 Add .classpath/.project/readme to gridlayout support package. 
Change-Id: I1f8a08a8f21572fe011964c230a6d45d5ac4b530
 2012-04-20 17:02:10 -07:00
Svetoslav Ganov
a185badacb Fixing the build 
Change-Id: Iece94781e42cf2e9e0b0d8e447c0754c8bb17003
 2012-04-20 16:41:47 -07:00
Raphael Moll
01d30e1a87 Split build/targets/product/sdk.mk 
Change-Id: I6bbc6644a1dbf19ac768c2ea65d0e383b5dd23ef
 2012-04-20 14:19:51 -07:00
Alex Sakhartchouk
58808efa0c Merge "Renderscript is deprecated. Removing from the sdk." 2012-04-20 08:57:37 -07:00
Andrew Hsieh
c7d6505358 am 9de85641: am bdd8dd7d: Merge "Fixed compilation error #include <android/*h>" 
* commit '9de856419244f1b89b1a9c9d153771dd8e0aa277':
  Fixed compilation error #include <android/*h>
 2012-04-20 01:20:59 -07:00
Andrew Hsieh
9de8564192 am bdd8dd7d: Merge "Fixed compilation error #include <android/*h>" 
* commit 'bdd8dd7d1fa6fa2f791e4e85e924333add90bb58':
  Fixed compilation error #include <android/*h>
 2012-04-20 01:18:01 -07:00
Andrew Hsieh
bdd8dd7d1f Merge "Fixed compilation error #include <android/*h>" 2012-04-20 00:52:04 -07:00
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
b9f2743062 am ab57af2f: am 1583b7c6: Delete the fragment-UI sample in favor of the FragmentBasics sample for the 101 training class on fragments 
* commit 'ab57af2f90565b25703dad9055fa8a2937af50dc':
  Delete the fragment-UI sample in favor of the FragmentBasics sample for the 101 training class on fragments
 2012-04-19 16:56:15 -07:00
Scott Main
96e958ef28 am 7b797e3b: am 1583b7c6: Delete the fragment-UI sample in favor of the FragmentBasics sample for the 101 training class on fragments 
* commit '7b797e3bb56d6491bcc8682bddee1ab7b3e9a917':
 2012-04-19 16:55:58 -07:00
Scott Main
8637322b12 am 452f9d66: am 1583b7c6: Delete the fragment-UI sample in favor of the FragmentBasics sample for the 101 training class on fragments 
* commit '452f9d66039c88f3bd2b132e84fb30b9bc158665':
  Delete the fragment-UI sample in favor of the FragmentBasics sample for the 101 training class on fragments
 2012-04-19 16:55:28 -07:00
Scott Main
ab57af2f90 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:30 -07: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
452f9d6603 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:15 -07:00
Scott Main
aa69042b97 am d3263a75: am ff329d74: Merge "Rename the activity lifecycle sample\'s directory" into ics-mr1 
* commit 'd3263a75d5b2bc856c97500c45284af2d8ac13d3':
  Rename the activity lifecycle sample's directory
 2012-04-19 16:52:55 -07:00
Scott Main
c180eaccf0 am dc8be81a: am ff329d74: Merge "Rename the activity lifecycle sample\'s directory" into ics-mr1 
* commit 'dc8be81ab0656d73e491209ce149594d10b6cb0b':
 2012-04-19 16:52:27 -07:00
Scott Main
c1855ef322 am fe90e4b1: am ff329d74: Merge "Rename the activity lifecycle sample\'s directory" into ics-mr1 
* commit 'fe90e4b1cf27f41b939590d775406d7021fc8014':
  Rename the activity lifecycle sample's directory
 2012-04-19 16:52:05 -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
4555973dd4 am 8c8597eb: am ba1636e4: Add new sample for 101 class on fragments. 
* commit '8c8597eb058b86bd69ed558828e38c6671b13f0e':
  Add new sample for 101 class on fragments.
 2012-04-19 16:49:44 -07:00
Scott Main
fe90e4b1cf 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:49:27 -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
d3263a75d5 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:49:04 -07:00
Scott Main
f9715d5654 am 11f9ad8c: am ba1636e4: Add new sample for 101 class on fragments. 
* commit '11f9ad8c3d32620062edd38a9ed5a405d3608e37':
 2012-04-19 16:48:48 -07:00
Scott Main
8fe69d78bb am 934e8508: am ba1636e4: Add new sample for 101 class on fragments. 
* commit '934e8508a88fffb55b81834ed8ddac98656207fa':
  Add new sample for 101 class on fragments.
 2012-04-19 16:48:27 -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
8c8597eb05 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:53 -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
934e8508a8 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:22 -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
Alex Sakhartchouk
4c5f2d2735 Renderscript is deprecated. Removing from the sdk. 
Change-Id: I4963ec4e9287003772d5818789d2de72b72f59c3
 2012-04-19 11:42:38 -07:00