Commit Graph

2131 Commits

Author SHA1 Message Date
Nate Karstens
582fcd428d Updated to better distinguish between options and operands 2009-08-26 10:10:57 -07:00
Muthu Ramadoss
8f5361ba0d Enhancement: ApiDemos - App - Dialog - AlertDialog with MultipleChoices backed by Cursor
Added an example for using AlertDialog in Multichoice mode backed up by Cursor. This example can be used to test the following bug: http://code.google.com/p/android/issues/detail?id=955

AMEND:
	Added a Toast to display readonly status of cursor, so data will not be updated.
	Removed empty code blocks, which did nothing.
2009-08-26 08:48:03 -07:00
Xavier Ducrohet
99a59811ec am 6e0e0187: Make sure older rules files can find the SDK Location.
Merge commit '6e0e0187515f38a2a919373283f4a41bb9fcee8b'

* commit '6e0e0187515f38a2a919373283f4a41bb9fcee8b':
  Make sure older rules files can find the SDK Location.
2009-08-25 19:29:34 -07:00
Xavier Ducrohet
6e0e018751 Make sure older rules files can find the SDK Location.
Change-Id: Idb2463f07c233015927181e79955ae71e10dcb19
2009-08-25 18:17:07 -07:00
Piotr Gurgul
b01f2c55e8 am 2de42410: Merge change 22697 into eclair
Merge commit '2de4241074b761fc4d17f6d3928950cf23d258b9'

* commit '2de4241074b761fc4d17f6d3928950cf23d258b9':
  Ant clean target added
2009-08-25 17:31:24 -07:00
Android (Google) Code Review
2de4241074 Merge change 22697 into eclair
* changes:
  Ant clean target added
2009-08-25 17:27:37 -07:00
Xavier Ducrohet
4b4d609b05 am 338bc1cc: Move from arbitrary resource filters to fix ones
Merge commit '338bc1cc45b370dcb16f581bb5e9625dc67ec63a'

* commit '338bc1cc45b370dcb16f581bb5e9625dc67ec63a':
  Move from arbitrary resource filters to fix ones
2009-08-25 17:22:37 -07:00
Piotr Gurgul
e2c37d4f44 Ant clean target added
Removes output files created by other targets.
2009-08-25 17:19:00 -07:00
Xavier Ducrohet
338bc1cc45 Move from arbitrary resource filters to fix ones
Resource filters are used when generating additional APK containing only
specific resources.
The previous UI allowed for any type of filters, but we are moving to a
simpler way with fixed filters.
The first one is the density. Selecting the filter will generate 4 APKs per
application: default (all resources), hdpi (only hdpi/nodpi and default
resources), mdpi, ldpi.
2009-08-25 17:17:15 -07:00
Piotr Gurgul
19286c66fb am 68a7a11d: Merge change 22676 into eclair
Merge commit '68a7a11d24f7f3bf6704d848a5f77ad5b7e2c5bc'

* commit '68a7a11d24f7f3bf6704d848a5f77ad5b7e2c5bc':
  Ant properties names legacy support
2009-08-25 16:55:48 -07:00
Android (Google) Code Review
68a7a11d24 Merge change 22676 into eclair
* changes:
  Ant properties names legacy support
2009-08-25 16:52:21 -07:00
Piotr Gurgul
3259661b26 Ant properties names legacy support
Support for old property names in SetupTask.java, in order to maintain
compatibility with Donut and earlier.
2009-08-25 16:48:17 -07:00
Raphael
ef07519918 am b8a74f45: ADT: Fix some potential NPE in the configuration composite.
Merge commit 'b8a74f45519830f2695b74f39fc9097659e28969'

* commit 'b8a74f45519830f2695b74f39fc9097659e28969':
  ADT: Fix some potential NPE in the configuration composite.
2009-08-25 16:39:48 -07:00
Raphael
b8a74f4551 ADT: Fix some potential NPE in the configuration composite.
This is just based on Eclipse static analysis of potential null pointers.
It doesn't mean we were ever going to have any NPE there.

Change-Id: I2a326048d2eb6afff7598f9300f48e35495ff3c2
2009-08-25 16:19:25 -07:00
Raphael
c428ad14a9 am 5837c3cc: ADT: Tag classes with "@since GLE1"
Merge commit '5837c3cc34e1408781479ea1c4d77260de288647'

* commit '5837c3cc34e1408781479ea1c4d77260de288647':
  ADT: Tag classes with "@since GLE1"
2009-08-25 16:16:17 -07:00
Raphael
5837c3cc34 ADT: Tag classes with "@since GLE1"
This adds a @since GLE1 to all classes involved in the current GLE
and a @since GLE2 to the new classes. The idea is that both classes
are going to be mixed in the same packages and it will help later
to remove the old GLE by just searching for this specific tag.

The alternative would be to move the classes in a sub-package
layout.gle1 vs layout.gle2, but that seems unecessary.

Change-Id: I577cd81819db4c6e0209ebbd910a393fc2182619
2009-08-25 15:29:51 -07:00
Raphael
01025c7461 am c216dea0: Merge change 22555 into eclair
Merge commit 'c216dea016c0546a184ef941d2827b5413be7a12'

* commit 'c216dea016c0546a184ef941d2827b5413be7a12':
  ADT: Skeleton for GLE2.
2009-08-25 14:48:23 -07:00
Android (Google) Code Review
c216dea016 Merge change 22555 into eclair
* changes:
  ADT: Skeleton for GLE2.
2009-08-25 14:43:37 -07:00
Piotr Gurgul
82a9544045 am dfed3cda: Merge change 22632 into eclair
Merge commit 'dfed3cda60d8be7c1a5deb94dde70659eb39cffd'

* commit 'dfed3cda60d8be7c1a5deb94dde70659eb39cffd':
  Alias rules properties names update
2009-08-25 14:00:06 -07:00
Android (Google) Code Review
dfed3cda60 Merge change 22632 into eclair
* changes:
  Alias rules properties names update
2009-08-25 13:55:41 -07:00
Mike Reed
37a8366ed4 am 1cafac5c: allow gamma change using Volume up/down
Merge commit '1cafac5ce78cb88a8dd12ff949065cc635787eff'

* commit '1cafac5ce78cb88a8dd12ff949065cc635787eff':
  allow gamma change using Volume up/down
2009-08-25 11:02:01 -07:00
Piotr Gurgul
9fccdf5b88 Alias rules properties names update
android-tools change to android.tools.dir
sdk-folder to sdk.dir
resource-dir to resource.dir
out-package to out.package
Some minor style changes introduced.
2009-08-25 10:59:55 -07:00
Mike Reed
1cafac5ce7 allow gamma change using Volume up/down 2009-08-25 13:47:03 -04:00
Piotr Gurgul
311407dbb5 am 1fd0534f: Merge change 22569 into eclair
Merge commit '1fd0534f4823852aa8f61eedd817a1ebbf7933b6'

* commit '1fd0534f4823852aa8f61eedd817a1ebbf7933b6':
  Ant properties names changed
2009-08-25 10:05:00 -07:00
Android (Google) Code Review
1fd0534f48 Merge change 22569 into eclair
* changes:
  Ant properties names changed
2009-08-25 10:00:59 -07:00
Piotr Gurgul
2968aa3020 Ant properties names changed
application-package to application.package
sdk-location to sdk.dir
android-jar to android.jar
android-aidl to android.aidl
in order to make their names compliant with the ant standards and rest
of the property names.
Properties names in alias rules deliberately ommited in this CL.
Some minor style changes introduced.
2009-08-24 23:06:56 -07:00
Raphael
59aac85f63 ADT: Skeleton for GLE2.
This refactors the GLE base class into an interface, to make it
possible to not depend on GEF at all.

The GLE2 editor part displays and does nothing. It's just an empty shell.
To enable, setenv USE_GLE2 to anything. Unset to remove it.

Change-Id: I7a95b4a1a5a8ddf5a3f18acf7a04b1f9b3439655
2009-08-24 20:16:28 -07:00
Dianne Hackborn
8c9213216d am 945b2362: Update sample code for new service semantics.
Merge commit '945b2362908e9f08e252d63f564d17c044527632'

* commit '945b2362908e9f08e252d63f564d17c044527632':
  Update sample code for new service semantics.
2009-08-24 17:07:29 -07:00
Dianne Hackborn
945b236290 Update sample code for new service semantics. 2009-08-24 16:28:39 -07:00
Scott Main
f063d92183 am 1ef50a9d: am 04680858: docs only. Add new web pages for sample apps included in the SDK. Revise the existing sample app web pages. Delete screenshots for notepad and lunar lander (these have moved into frameworks/base/docs/html/guide/samples/image/.
Merge commit '1ef50a9d953ead7fd13693965f9644d3582ad16e'

* commit '1ef50a9d953ead7fd13693965f9644d3582ad16e':
  docs only.
2009-08-24 16:25:06 -07:00
Scott Main
1ef50a9d95 am 04680858: docs only. Add new web pages for sample apps included in the SDK. Revise the existing sample app web pages. Delete screenshots for notepad and lunar lander (these have moved into frameworks/base/docs/html/guide/samples/image/.
Merge commit '04680858a0671ad615f088edeea87b61ea243f24' into eclair

* commit '04680858a0671ad615f088edeea87b61ea243f24':
  docs only.
2009-08-24 16:20:14 -07:00
Scott Main
04680858a0 docs only.
Add new web pages for sample apps included in the SDK.
Revise the existing sample app web pages.
Delete screenshots for notepad and lunar lander (these have
moved into frameworks/base/docs/html/guide/samples/image/.
2009-08-24 15:27:00 -07:00
Andrew Stadler
68ed6fccf4 am 0dd6085f: Remove IM sources which no longer build.
Merge commit '0dd6085f0d2cdbba305889187a9ac56396d70adf'

* commit '0dd6085f0d2cdbba305889187a9ac56396d70adf':
  Remove IM sources which no longer build.
2009-08-24 15:09:38 -07:00
Andrew Stadler
0dd6085f0d Remove IM sources which no longer build. 2009-08-24 14:47:39 -07:00
Piotr Gurgul
42613e414e am 424b833e: Updated build.xml template
Merge commit '424b833edfc655cb8e23fd508a3b0d0a8968ab55'

* commit '424b833edfc655cb8e23fd508a3b0d0a8968ab55':
  Updated build.xml template
2009-08-22 15:20:26 -07:00
Piotr Gurgul
424b833edf Updated build.xml template
build.template file has been updated to make it up-to-date with new
android_rules.xml file. Besides, some minor style changes have been introduced.
2009-08-22 14:45:00 -07:00
Piotr Gurgul
0f6fc27e11 am 832c8596: Refactoring of android_rules.xml file
Merge commit '832c859693e32819639fa428b2b96872c47c0114'

* commit '832c859693e32819639fa428b2b96872c47c0114':
  Refactoring of android_rules.xml file
2009-08-22 14:33:01 -07:00
Piotr Gurgul
832c859693 Refactoring of android_rules.xml file
This is a new CL because of merge conflict in the old one.
Naming changed to 'property.name' style for property names.
Property 'value' attributes changed to 'location' for props containing location.
Suffix '.dir' added to properties' names indicating directories.
'-description' prefix added to intermediate/internal targets.
'*.location' properties removed, as 'location' attribute should take care of
full paths, adding $basedir implicitly, so hopefully there is no need to
define them explicitly.
External property names (taken from other files or hardcoded somewhere)
stayed untouched in this CL.
Some minor improvements to comments in order to make them more consistent.
2009-08-22 13:15:26 -07:00
Xavier Ducrohet
ffbab142a9 am 53b3190a: am e95a86cf: Merge change 22346 into donut
Merge commit '53b3190a47434a324eb352cdb95d61b252d1ed5a'

* commit '53b3190a47434a324eb352cdb95d61b252d1ed5a':
  Fix target for ApiDemos (API is now 4)
2009-08-22 07:50:28 -07:00
Xavier Ducrohet
53b3190a47 am e95a86cf: Merge change 22346 into donut
Merge commit 'e95a86cfec18836ddbff149690a13766bfc9ada3' into eclair

* commit 'e95a86cfec18836ddbff149690a13766bfc9ada3':
  Fix target for ApiDemos (API is now 4)
2009-08-22 07:44:12 -07:00
Android (Google) Code Review
e95a86cfec Merge change 22346 into donut
* changes:
  Fix target for ApiDemos (API is now 4)
2009-08-21 16:08:11 -07:00
Xavier Ducrohet
c86903288c Fix target for ApiDemos (API is now 4)
Also add some progress output to the ant rules.
2009-08-21 15:59:02 -07:00
Xavier Ducrohet
629043b40e am 8535518c: Device hardware profile for config selector in GLE
Merge commit '8535518cb2202c7dfcdc378d762b0c1199e40e3b'

* commit '8535518cb2202c7dfcdc378d762b0c1199e40e3b':
  Device hardware profile for config selector in GLE
2009-08-21 15:27:22 -07:00
Xavier Ducrohet
8535518cb2 Device hardware profile for config selector in GLE
- Built-in device list for now
- Config selector in GLE is changed to only have
  - MCC/MNC
  - Locale
  - Device List
  - Device config.
2009-08-21 15:03:54 -07:00
Xavier Ducrohet
6cbf2d1a8c am f051ea0d: Merge change 22138 into eclair
Merge commit 'f051ea0d38c70a4469df26e41bf77013246d8479'

* commit 'f051ea0d38c70a4469df26e41bf77013246d8479':
  Add basic support for full height rendering.
2009-08-21 13:31:20 -07:00
Android (Google) Code Review
f051ea0d38 Merge change 22138 into eclair
* changes:
  Add basic support for full height rendering.
2009-08-21 13:26:30 -07:00
Anonymous Coward
64c33cf480 am 978ec5ab: am 3e83e8bc: Remove SearchableDictionary sample app as it is a demo of third party inclusion in quick search box.
Merge commit '978ec5abe1fe33418205d96edb8003cb4fc9a163'

* commit '978ec5abe1fe33418205d96edb8003cb4fc9a163':
  Remove SearchableDictionary sample app as it is a demo of third party inclusion in quick search box.
2009-08-21 12:51:56 -07:00
Anonymous Coward
978ec5abe1 am 3e83e8bc: Remove SearchableDictionary sample app as it is a demo of third party inclusion in quick search box.
Merge commit '3e83e8bc8b969a993b026dab9d13b99b315d9af0' into eclair

* commit '3e83e8bc8b969a993b026dab9d13b99b315d9af0':
  Remove SearchableDictionary sample app as it is a demo of third party inclusion in quick search box.
2009-08-21 12:47:14 -07:00
Anonymous Coward
3e83e8bc8b Remove SearchableDictionary sample app as it is a demo of third party inclusion in quick search box.
update: remove entry from build.sdk
2009-08-21 12:43:21 -07:00
Jack Palevich
88d79d2bc1 am 83d8d83a: Remove unused getConfigSpec methods from ApiDemos sample code
Merge commit '83d8d83ad1f2c9aee0db9a5a1329cfc64801bc3a'

* commit '83d8d83ad1f2c9aee0db9a5a1329cfc64801bc3a':
  Remove unused getConfigSpec methods from ApiDemos sample code
2009-08-21 11:55:01 -07:00