Commit Graph

1907 Commits

Author SHA1 Message Date
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
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
Jack Palevich
83d8d83ad1 Remove unused getConfigSpec methods from ApiDemos sample code
At one time during the development of GLSurfaceView, the
GLSurfaceView.Renderer interface had a getConfigSpec method that was used to
select the frame buffer format. This method was removed from the
Renderer interface before GLSurfaceView became a public API, but
the sample code still defined these now-unused methods.

To reduce the chance of confusing a developer who uses the sample code,
this change removes the dead, no-longer-called getConfigSpec
implementations from the three samples.

See GLSurfaceView.setEGLConfigChooser for the replacement
technique.
2009-08-21 11:48:50 -07:00
Xavier Ducrohet
9f944d673b Add basic support for full height rendering. 2009-08-21 11:32:17 -07:00
Raphael
ff3f831140 am eec015ad: am 8fccf9eb: mgwz.dll must be packaged next to tools/zipalign.exe in the Windows SDK.
Merge commit 'eec015ad1465431b0942214c730f6bd6344c8c76'

* commit 'eec015ad1465431b0942214c730f6bd6344c8c76':
  mgwz.dll must be packaged next to tools/zipalign.exe in the Windows SDK.
2009-08-20 21:49:47 -07:00
Raphael
eec015ad14 am 8fccf9eb: mgwz.dll must be packaged next to tools/zipalign.exe in the Windows SDK.
Merge commit '8fccf9eb7c099a42729d0ff4a8a250f73a68c3f9' into eclair

* commit '8fccf9eb7c099a42729d0ff4a8a250f73a68c3f9':
  mgwz.dll must be packaged next to tools/zipalign.exe in the Windows SDK.
2009-08-20 21:46:18 -07:00
Raphael
8fccf9eb7c mgwz.dll must be packaged next to tools/zipalign.exe in the Windows SDK.
BUG 2068812
2009-08-20 21:12:01 -07:00
Dianne Hackborn
2b53aab112 am da48bed5: Tweaks to make pointer location a little easier to see.
Merge commit 'da48bed5d70832013f76e3d3fa79cd744fe2327d'

* commit 'da48bed5d70832013f76e3d3fa79cd744fe2327d':
  Tweaks to make pointer location a little easier to see.
2009-08-20 19:51:58 -07:00
Dianne Hackborn
da48bed5d7 Tweaks to make pointer location a little easier to see. 2009-08-20 19:40:35 -07:00
Scott Main
cc73aca73e am 42c7eaa6: am fab096cb: Merge change 22103 into donut
Merge commit '42c7eaa6bc522f31fe19a9cdfeb953f511ec1fa2'

* commit '42c7eaa6bc522f31fe19a9cdfeb953f511ec1fa2':
  new transparent icon for searchable dictionary
2009-08-20 16:06:14 -07:00
Scott Main
42c7eaa6bc am fab096cb: Merge change 22103 into donut
Merge commit 'fab096cbcf98cb98eef25e7541121ae8e3898a10' into eclair

* commit 'fab096cbcf98cb98eef25e7541121ae8e3898a10':
  new transparent icon for searchable dictionary
2009-08-20 16:00:56 -07:00
Android (Google) Code Review
fab096cbcf Merge change 22103 into donut
* changes:
  new transparent icon for searchable dictionary
2009-08-20 15:07:08 -07:00
Scott Main
ec633d5aea new transparent icon for searchable dictionary 2009-08-20 12:21:15 -07:00
Xavier Ducrohet
28b9bf94f0 am c22870b7: am c7d0cec7: Merge change 22040 into donut
Merge commit 'c22870b7ba5c4c9d8941304888a048fa8d89541c'

* commit 'c22870b7ba5c4c9d8941304888a048fa8d89541c':
  Fix broken XML generated during "Extract string"
2009-08-19 22:31:06 -07:00
Xavier Ducrohet
c22870b7ba am c7d0cec7: Merge change 22040 into donut
Merge commit 'c7d0cec7e83d5194c35e88b17d3acc937fa87511' into eclair

* commit 'c7d0cec7e83d5194c35e88b17d3acc937fa87511':
  Fix broken XML generated during "Extract string"
2009-08-19 22:26:20 -07:00
Android (Google) Code Review
c7d0cec7e8 Merge change 22040 into donut
* changes:
  Fix broken XML generated during "Extract string"
2009-08-19 18:54:59 -07:00
Xavier Ducrohet
6849e85918 Fix broken XML generated during "Extract string"
BUG: 2066455
2009-08-19 18:53:41 -07:00
Xavier Ducrohet
e95e57d238 am 900234fc: Move ConfigComposite in its own package.
Merge commit '900234fc0ab8dcc0d6e9a715e6a53a3167e3c29b'

* commit '900234fc0ab8dcc0d6e9a715e6a53a3167e3c29b':
  Move ConfigComposite in its own package.
2009-08-19 18:24:13 -07:00
Xavier Ducrohet
f7508d9ae1 am ffb7b7f8: Refactor Config UI out of Layout Editor.
Merge commit 'ffb7b7f81dda0fac6dd261112ba4dc5ec522cd56'

* commit 'ffb7b7f81dda0fac6dd261112ba4dc5ec522cd56':
  Refactor Config UI out of Layout Editor.
2009-08-19 18:24:11 -07:00
Xavier Ducrohet
900234fc0a Move ConfigComposite in its own package. 2009-08-19 18:18:37 -07:00
Xavier Ducrohet
ffb7b7f81d Refactor Config UI out of Layout Editor. 2009-08-19 17:52:23 -07:00
Xavier Ducrohet
5a7fc6d9f6 am 14404927: am a457ef41: Merge change 21988 into donut
Merge commit '144049270b26ce1628c6a7e3afe7624588816ba9'

* commit '144049270b26ce1628c6a7e3afe7624588816ba9':
  Add OS version to ping service (win/mac only)
2009-08-19 16:51:08 -07:00
Xavier Ducrohet
144049270b am a457ef41: Merge change 21988 into donut
Merge commit 'a457ef41e82b67a31a06f6ffb602cd39c43a1018' into eclair

* commit 'a457ef41e82b67a31a06f6ffb602cd39c43a1018':
  Add OS version to ping service (win/mac only)
2009-08-19 16:37:33 -07:00
Android (Google) Code Review
a457ef41e8 Merge change 21988 into donut
* changes:
  Add OS version to ping service (win/mac only)
2009-08-19 16:20:22 -07:00
Xavier Ducrohet
1f49fa9b7c Add OS version to ping service (win/mac only) 2009-08-19 16:14:18 -07:00
Xavier Ducrohet
499436179d am a4876df2: Update some version number for Eclair SDK.
Merge commit 'a4876df288c02ca6e176877ab6b1b0065b069a49'

* commit 'a4876df288c02ca6e176877ab6b1b0065b069a49':
  Update some version number for Eclair SDK.
2009-08-19 11:02:08 -07:00