Commit Graph

9793 Commits

Author SHA1 Message Date
Raphael Moll
186f007a74 Merge "Split build/targets/product/sdk.mk" 2012-04-23 09:48:51 -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
Xavier Ducrohet
262cb246e0 Add skin for 1280x800@213dpi devices.
Change-Id: I60a5f3b4b6dfbce49fbc9da7f2bc627e984e9fba
2012-04-19 10:59:42 -07:00
Jean-Baptiste Queru
850ee01b34 am b8e2f089: am d294027b: Merge 2fa7b9ff
* commit 'b8e2f0896ec6231e28db93d8900f61e8a2e43f67':
  Move emulator GLES from development.git to sdk.git
2012-04-18 19:10:13 -07:00
Jean-Baptiste Queru
b8e2f0896e am d294027b: Merge 2fa7b9ff
* commit 'd294027b1f6a904f407d85169a1d47458274bd4d':
  Move emulator GLES from development.git to sdk.git
2012-04-18 19:08:00 -07:00
Gilles Debunne
968c2e4918 Fixed the XMLAdapters example
Provider package name was incorrect, resulting in a crash at startup

Also added static to the cache
http://stackoverflow.com/questions/10135261/possible-bug-in-android-imagedownloader-class-shardbitmapcache-not-static-when

Change-Id: I833589645f053be52fbc11aec89dd02b6f2f2787
2012-04-18 17:18:24 -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
Fred Chung
b54be1a0a4 am ab543501: am 16266ff7: Updated "Making your App Location Aware" class to include information on location provider enable check.
* commit 'ab543501cf06627feb5b381f766ce55b12623aad':
2012-04-18 09:32:01 -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
Tsu Chiang Chuang
fd16f3927e Merge "change the way we fetch the test result file." 2012-04-17 17:04:37 -07:00
Eino-Ville Talvala
046270578b Merge "Add skeleton implementation of a fake v2 camera device." 2012-04-17 10:44:07 -07:00
Dianne Hackborn
ecd7a90bcc Merge "Add demo for new custom animation." 2012-04-17 10:38:58 -07:00
Eino-Ville Talvala
0819e42a0b Add skeleton implementation of a fake v2 camera device.
Change-Id: Idd2485064548a6036ea318680065b7429463d9cd
2012-04-17 10:05:17 -07:00
Fred Chung
6567b57b0c am feb433d3: am 20b69d0c: am 16266ff7: Updated "Making your App Location Aware" class to include information on location provider enable check.
* commit 'feb433d381ecf053276e1d93119b230cce6decbb':
2012-04-17 09:54:25 -07:00
Fred Chung
f52efd48fb am c6095c4a: am 53bb8173: am 16266ff7: Updated "Making your App Location Aware" class to include information on location provider enable check.
* commit 'c6095c4a9ea40aeca0e84534aa74b90908274957':
  Updated "Making your App Location Aware" class to include information on location provider enable check.
2012-04-17 09:52:22 -07:00
Fred Chung
feb433d381 am 20b69d0c: am 16266ff7: Updated "Making your App Location Aware" class to include information on location provider enable check.
* commit '20b69d0cd3138fcaf316c51d79181f04ec2724fe':
2012-04-17 09:50:20 -07:00
Fred Chung
c6095c4a9e am 53bb8173: am 16266ff7: Updated "Making your App Location Aware" class to include information on location provider enable check.
* commit '53bb817340725cfc6aff4f27544731997192e25d':
  Updated "Making your App Location Aware" class to include information on location provider enable check.
2012-04-17 09:49:29 -07:00
Fred Chung
20b69d0cd3 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:48:42 -07:00