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

2767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
c193dc5105 am 82bb67e5: am 8dd4e92c: Merge change I74fdf8c6 into eclair 
Merge commit '82bb67e55593074cc83123fe703e99c816463586' into eclair-mr2-plus-aosp

* commit '82bb67e55593074cc83123fe703e99c816463586':
 2009-10-14 16:16:48 -07:00
David 'Digit' Turner
1bda9e1a5e am f9aa7764: am 7fe9c714: Merge change I3986492c into eclair 
Merge commit 'f9aa7764aabb10fc0b7abc9e72d27a38b2547b35' into eclair-mr2-plus-aosp

* commit 'f9aa7764aabb10fc0b7abc9e72d27a38b2547b35':
 2009-10-14 16:16:43 -07:00
Jean-Baptiste Queru
b8f35789df merge from open-source master 2009-10-14 16:12:05 -07:00
Xavier Ducrohet
4b7d624a64 am 8dd4e92c: Merge change I74fdf8c6 into eclair 
Merge commit '8dd4e92cc6838b811b7e8b81cb87bb1533bbf789' into eclair-plus-aosp

* commit '8dd4e92cc6838b811b7e8b81cb87bb1533bbf789':
  Fix device dpi handling in the Layout device parsing/UI.
 2009-10-14 16:07:23 -07:00
David 'Digit' Turner
4662ddee52 am 7fe9c714: Merge change I3986492c into eclair 
Merge commit '7fe9c71413aad609b32fd433278ee1d9db673b2e' into eclair-plus-aosp

* commit '7fe9c71413aad609b32fd433278ee1d9db673b2e':
  Add --prebuilt-ndk=FILE and --no-git options to build/tools/make-release.sh script.
 2009-10-14 16:07:19 -07:00
Xavier Ducrohet
82bb67e555 am 8dd4e92c: Merge change I74fdf8c6 into eclair 
Merge commit '8dd4e92cc6838b811b7e8b81cb87bb1533bbf789' into eclair-mr2

* commit '8dd4e92cc6838b811b7e8b81cb87bb1533bbf789':
  Fix device dpi handling in the Layout device parsing/UI.
 2009-10-14 16:06:26 -07:00
David 'Digit' Turner
f9aa7764aa am 7fe9c714: Merge change I3986492c into eclair 
Merge commit '7fe9c71413aad609b32fd433278ee1d9db673b2e' into eclair-mr2

* commit '7fe9c71413aad609b32fd433278ee1d9db673b2e':
  Add --prebuilt-ndk=FILE and --no-git options to build/tools/make-release.sh script.
 2009-10-14 16:06:21 -07:00
Jean-Baptiste Queru
a7978d3bb0 merge from open-source master 2009-10-14 16:02:09 -07:00
Android (Google) Code Review
8dd4e92cc6 Merge change I74fdf8c6 into eclair 
* changes:
  Fix device dpi handling in the Layout device parsing/UI.
 2009-10-14 18:58:02 -04:00
Android (Google) Code Review
7fe9c71413 Merge change I3986492c into eclair 
* changes:
  Add --prebuilt-ndk=FILE and --no-git options to build/tools/make-release.sh script.
 2009-10-14 18:57:32 -04:00
David 'Digit' Turner
854f820c24 Add --prebuilt-ndk=FILE and --no-git options to build/tools/make-release.sh script. 
This is used to help people easily package experimental versions of the NDK to
test and distribute fixes and improvements. The main idea is to allow external
contributors to play with it in interesting way and share the result easily.
 2009-10-14 15:39:58 -07:00
Raphael
ab34bb51a9 am 5bb5b9ae: am 135ae886: Merge change Idad5a0ab into eclair 
Merge commit '5bb5b9ae1ec5aaba60c6da2bba8beb7dca4546ff'

* commit '5bb5b9ae1ec5aaba60c6da2bba8beb7dca4546ff':
  SDK: Remove STOPSHIP keyword.
 2009-10-14 15:35:16 -07:00
Xavier Ducrohet
3cfed4b8c4 Fix device dpi handling in the Layout device parsing/UI. 
Change-Id: I74fdf8c62a7b005e40e1817d9f39c59d8f99c070
 2009-10-14 15:25:15 -07:00
Raphael
5bb5b9ae1e am 135ae886: Merge change Idad5a0ab into eclair 
Merge commit '135ae88641599194c398cd5dbcee535313921f7a' into eclair-mr2

* commit '135ae88641599194c398cd5dbcee535313921f7a':
  SDK: Remove STOPSHIP keyword.
 2009-10-14 12:27:12 -07:00
Raphael
5ce23b40e7 am 135ae886: Merge change Idad5a0ab into eclair 
Merge commit '135ae88641599194c398cd5dbcee535313921f7a' into eclair-plus-aosp

* commit '135ae88641599194c398cd5dbcee535313921f7a':
  SDK: Remove STOPSHIP keyword.
 2009-10-14 12:26:57 -07:00
Android (Google) Code Review
135ae88641 Merge change Idad5a0ab into eclair 
* changes:
  SDK: Remove STOPSHIP keyword.
 2009-10-14 15:16:28 -04:00
Raphael
44098d157c SDK: Remove STOPSHIP keyword. 
Change-Id: Idad5a0ab0f31c3e513ce19d914e2eb686078d44f
 2009-10-14 12:11:56 -07:00
Raphael
d2a6cedde8 am 369978fd: am 62437b99: Windows SDK: copy SDK Setup.exe at root of SDK. 
Merge commit '369978fd3167a19f3e2e303c8874b66e8429f25f'

* commit '369978fd3167a19f3e2e303c8874b66e8429f25f':
  Windows SDK: copy SDK Setup.exe at root of SDK.
 2009-10-14 11:58:49 -07:00
Raphael
74620545d2 am 62437b99: Windows SDK: copy SDK Setup.exe at root of SDK. 
Merge commit '62437b9984649c80aa3a7d93750efdc5ff206d07' into eclair-plus-aosp

* commit '62437b9984649c80aa3a7d93750efdc5ff206d07':
  Windows SDK: copy SDK Setup.exe at root of SDK.
 2009-10-14 11:39:54 -07:00
Raphael
369978fd31 am 62437b99: Windows SDK: copy SDK Setup.exe at root of SDK. 
Merge commit '62437b9984649c80aa3a7d93750efdc5ff206d07' into eclair-mr2

* commit '62437b9984649c80aa3a7d93750efdc5ff206d07':
  Windows SDK: copy SDK Setup.exe at root of SDK.
 2009-10-14 11:39:42 -07:00
Android (Google) Code Review
e367f3fce8 Merge change I94f75699 
* changes:
  Reimport translations.
 2009-10-14 13:02:18 -04:00
Xavier Ducrohet
f30cc73f37 am 861465a9: am e19c0298: Merge change Idc447b41 into eclair 
Merge commit '861465a93c9634e1c2a345882ae71d0c3e21f4a2'

* commit '861465a93c9634e1c2a345882ae71d0c3e21f4a2':
  UI to manage/create custom Layout Devices.
 2009-10-14 07:56:14 -07:00
Xavier Ducrohet
861465a93c am e19c0298: Merge change Idc447b41 into eclair 
Merge commit 'e19c02984fd10c9fa35b036aafc1181cb8384069' into eclair-mr2

* commit 'e19c02984fd10c9fa35b036aafc1181cb8384069':
  UI to manage/create custom Layout Devices.
 2009-10-14 07:37:28 -07:00
Raphael
62437b9984 Windows SDK: copy SDK Setup.exe at root of SDK. 
Also add a source.properties (we'll install it on the vendor/google
script part of the script).

SDK BUG 2173135

Change-Id: Icb0f22a65ffd819bf7b0f48adbec51cbc1243f71
 2009-10-14 07:21:26 -07:00
Xavier Ducrohet
3f61033c38 am e19c0298: Merge change Idc447b41 into eclair 
Merge commit 'e19c02984fd10c9fa35b036aafc1181cb8384069' into eclair-plus-aosp

* commit 'e19c02984fd10c9fa35b036aafc1181cb8384069':
  UI to manage/create custom Layout Devices.
 2009-10-13 22:57:57 -07:00
Android (Google) Code Review
e19c02984f Merge change Idc447b41 into eclair 
* changes:
  UI to manage/create custom Layout Devices.
 2009-10-14 01:51:44 -04:00
Xavier Ducrohet
c298b5a013 am 18cd1078: am 3b9d33b3: Fix RawImage.getARGB to force alpha to 0xFF for buffers with no alpha. 
Merge commit '18cd10783b01156169c44f76778590cdf25beaa2'

* commit '18cd10783b01156169c44f76778590cdf25beaa2':
  Fix RawImage.getARGB to force alpha to 0xFF for buffers with no alpha.
 2009-10-13 21:05:12 -07:00
Xavier Ducrohet
91e5979865 am 37f35fdc: am bc7c3672: Merge change I6dbcafab into eclair 
Merge commit '37f35fdca099beabcef9220b809c42c7567c9749'

* commit '37f35fdca099beabcef9220b809c42c7567c9749':
  Fix NPE in the parsing of property file.
 2009-10-13 21:05:07 -07:00
Xavier Ducrohet
d18f57f976 am 3b9d33b3: Fix RawImage.getARGB to force alpha to 0xFF for buffers with no alpha. 
Merge commit '3b9d33b3e0295445979ba9a36cb73780bc16fb60' into eclair-plus-aosp

* commit '3b9d33b3e0295445979ba9a36cb73780bc16fb60':
  Fix RawImage.getARGB to force alpha to 0xFF for buffers with no alpha.
 2009-10-13 20:47:22 -07:00
Xavier Ducrohet
1225b9c500 am bc7c3672: Merge change I6dbcafab into eclair 
Merge commit 'bc7c36728c353102ff8b0280b403cf348f47581e' into eclair-plus-aosp

* commit 'bc7c36728c353102ff8b0280b403cf348f47581e':
  Fix NPE in the parsing of property file.
 2009-10-13 20:47:17 -07:00
Xavier Ducrohet
18cd10783b am 3b9d33b3: Fix RawImage.getARGB to force alpha to 0xFF for buffers with no alpha. 
Merge commit '3b9d33b3e0295445979ba9a36cb73780bc16fb60' into eclair-mr2

* commit '3b9d33b3e0295445979ba9a36cb73780bc16fb60':
  Fix RawImage.getARGB to force alpha to 0xFF for buffers with no alpha.
 2009-10-13 20:46:47 -07:00
Xavier Ducrohet
37f35fdca0 am bc7c3672: Merge change I6dbcafab into eclair 
Merge commit 'bc7c36728c353102ff8b0280b403cf348f47581e' into eclair-mr2

* commit 'bc7c36728c353102ff8b0280b403cf348f47581e':
  Fix NPE in the parsing of property file.
 2009-10-13 20:46:42 -07:00
Xavier Ducrohet
3b9d33b3e0 Fix RawImage.getARGB to force alpha to 0xFF for buffers with no alpha. 
Change-Id: I6b95f5758c36979cca06483f1ff797ba67ecd056
 2009-10-13 19:24:58 -07:00
Xavier Ducrohet
8f49a988e3 UI to manage/create custom Layout Devices. 
Change-Id: Idc447b4136a6f709d7a665321af68de552ec613a
 2009-10-13 18:35:13 -07:00
Derek Sollenberger
60bee9c342 am 60e45099: Merge change Ibb660dd5 into eclair-mr2 
Merge commit '60e45099aa404686c3b6d38187306fe5bb90cd8f'

* commit '60e45099aa404686c3b6d38187306fe5bb90cd8f':
  updating sample plugins to support fixed surface dimensions.
 2009-10-13 17:08:26 -07:00
Raphael
ab2d129a89 am f4fe738d: am 96fc3df6: Merge change Ib096f1f0 into eclair 
Merge commit 'f4fe738d0f18f361815c0bdffefece726b622706'

* commit 'f4fe738d0f18f361815c0bdffefece726b622706':
  SDK Manager: suggest install of new platforms, addons or extra packages.
 2009-10-13 17:06:06 -07:00
Raphael
532dd1b213 am 46ab498e: am 9bdf821f: SDK: Support "android.bat update sdk" 
Merge commit '46ab498e50ba71467c71ebe14784706148554b86'

* commit '46ab498e50ba71467c71ebe14784706148554b86':
  SDK: Support "android.bat update sdk"
 2009-10-13 17:03:58 -07:00
Raphael
1c8693f447 am acadcaca: am 5ca98eb0: Merge change I5359971f into eclair 
Merge commit 'acadcaca51b8bedaaa8b188c8800ffc323d0bd06'

* commit 'acadcaca51b8bedaaa8b188c8800ffc323d0bd06':
  New "SDK Launcher" for Windows.
 2009-10-13 17:03:26 -07:00
Raphael
f09d25e5f9 am 8583fb38: am 6fb8880a: Merge change I26a21669 into eclair 
Merge commit '8583fb381bf2bedee8efa85abda42673ba9f7a9c'

* commit '8583fb381bf2bedee8efa85abda42673ba9f7a9c':
  Set SDK Platform/Doc to API 5.
 2009-10-13 17:02:21 -07:00
Raphael
ae827df5e8 am 7dcaccf3: am e4c98c01: SDK Manager: display packages revisions 
Merge commit '7dcaccf359f25586218d33a28cd05ad81af43fb1'

* commit '7dcaccf359f25586218d33a28cd05ad81af43fb1':
  SDK Manager: display packages revisions
 2009-10-13 16:57:25 -07:00
Raphael
aec2e11fca am d3fb418c: am e7ad6a5e: Merge change I2fb42327 into eclair 
Merge commit 'd3fb418c7c82c47c0b2c1d9b5383d4aca428252f'

* commit 'd3fb418c7c82c47c0b2c1d9b5383d4aca428252f':
  SDK Manager: extra packages must respect min-tools-rev too.
 2009-10-13 16:57:21 -07:00
Raphael
a55fb39176 am 7fd178a0: am 52eb73d2: Merge change I408e3eda into eclair 
Merge commit '7fd178a0e0345741cf18bc24ea5e68df2776f6b8'

* commit '7fd178a0e0345741cf18bc24ea5e68df2776f6b8':
  SDK Manager: fix selection of non-expanded remote archives.
 2009-10-13 16:57:17 -07:00
Jack Palevich
2ad8db7a6d am edb55982: Fix Terminal Preferences, Resolution 
Merge commit 'edb55982e1c86b99718bb7ccfd4e1d4cd33d5bd0'

* commit 'edb55982e1c86b99718bb7ccfd4e1d4cd33d5bd0':
  Fix Terminal Preferences, Resolution
 2009-10-13 16:57:13 -07:00
Xavier Ducrohet
0de953622f am 5e04446c: am 126a1950: Add missing override. 
Merge commit '5e04446cb1ce2cd83e85fbf41af8581a73cdfc40'

* commit '5e04446cb1ce2cd83e85fbf41af8581a73cdfc40':
  Add missing override.
 2009-10-13 16:57:08 -07:00
Raphael
85427348f5 am da615ec6: am 31d0121f: Fix adt-tests: remove UpdaterLogicTest 
Merge commit 'da615ec62d1897eee2c36aa20a6e5723bcd40d19'

* commit 'da615ec62d1897eee2c36aa20a6e5723bcd40d19':
  Fix adt-tests: remove UpdaterLogicTest
 2009-10-13 16:57:04 -07:00
Xavier Ducrohet
1f8dfe220e am d2560f89: am 4d59d18a: Merge change Ib18a32c1 into eclair 
Merge commit 'd2560f89dda8adc3226d3aefb429d4b2c07e6bc3'

* commit 'd2560f89dda8adc3226d3aefb429d4b2c07e6bc3':
  Minor label change (size -> resolution)
 2009-10-13 16:55:10 -07:00
Brett Chabot
9a3d2ef78d am 2a910437: am d00a9bcf: Merge change I3e6a5048 into eclair 
Merge commit '2a9104372f9f154b134f5c3386a4f95c8813b89f'

* commit '2a9104372f9f154b134f5c3386a4f95c8813b89f':
  Fix ADT tests failures:
 2009-10-13 16:54:51 -07:00
Brett Chabot
35f7549076 am 4226ff3e: am 8842cfe4: Merge change Ic77859c7 into eclair 
Merge commit '4226ff3e30571af63aaf1548305af35607198b5c'

* commit '4226ff3e30571af63aaf1548305af35607198b5c':
  Remove flaky ApiDemos tests from continuous.
 2009-10-13 16:52:21 -07:00
Raphael
ae8ee4314e am d61dddbb: am 773e9af6: Merge change Ied6c54f1 into eclair 
Merge commit 'd61dddbb18c619b6dfc3fd6d67c4baebc513c35f'

* commit 'd61dddbb18c619b6dfc3fd6d67c4baebc513c35f':
  Fix continuous adt-test: UpdaterLogic is now public.
 2009-10-13 16:52:10 -07:00
Brett Chabot
bcff9211d6 am 0d4f7cd4: am 264d42dd: Merge change Idf5bcb58 into eclair 
Merge commit '0d4f7cd48a2544c6a964bdd86d829692bc25b681'

* commit '0d4f7cd48a2544c6a964bdd86d829692bc25b681':
  Fix ant install when -Dadb.device.arg not provided.
 2009-10-13 16:51:55 -07:00