Commit Graph

4426 Commits

Author SHA1 Message Date
Xavier Ducrohet
1cabf853fd remove apkbuilder.jar from the sdk build.
Change-Id: I82cca5c159c1f3210b98deebfd78e2844728b2ac
2010-06-15 18:04:44 -07:00
Xavier Ducrohet
e389abdc29 am 442396be: remove jarutils from the sdk packaging.
Merge commit '442396be27a82850f99d4a891d02b8c95c9c1ef1' into gingerbread-plus-aosp

* commit '442396be27a82850f99d4a891d02b8c95c9c1ef1':
  remove jarutils from the sdk packaging.
2010-06-15 15:36:47 -07:00
Xavier Ducrohet
442396be27 remove jarutils from the sdk packaging.
Change-Id: I49beab11b49f09451cbea9bfbc88aa522e7dbd85
2010-06-15 15:35:07 -07:00
The Android Open Source Project
e7a4c0910c merge from open-source master
Change-Id: I3e12f866966fda80db5a0795eba9ff82bfe6547d
2010-06-15 15:02:39 -07:00
Xavier Ducrohet
4c22d2bb7d remove jarutils from the sdk packaging.
Change-Id: Ic3c91ff5e20a5bf6b7c3ad11eb6e6f4250c7613d
2010-06-15 13:00:13 -07:00
Brett Chabot
fa6e5585e3 am 0e968fa2: Merge "Workaround for package-private framework tests in runtest." into gingerbread
Merge commit '0e968fa2eec9dcdbb0ab075be9489cc9e4ad9c99' into gingerbread-plus-aosp

* commit '0e968fa2eec9dcdbb0ab075be9489cc9e4ad9c99':
  Workaround for package-private framework tests in runtest.
2010-06-15 10:49:09 -07:00
Brett Chabot
0e968fa2ee Merge "Workaround for package-private framework tests in runtest." into gingerbread 2010-06-15 10:46:32 -07:00
Brett Chabot
ccae47d0c0 Workaround for package-private framework tests in runtest.
Checks if the test to run is a framework test based on path, and if so
disables the davlik verifier by writing to /data/local.prop and
rebooting device.

Change-Id: Ibf94fb921662b5ddf6136dd12360d5de83a3a284
2010-06-14 15:24:42 -07:00
The Android Open Source Project
8467544d4c merge from froyo-plus-aosp
Change-Id: I1f4c76c89aad748b006cfc1370a767782e4ca3e7
2010-06-14 11:28:22 -07:00
Jeff Brown
28e7280e1a am 69825fa9: Merge "Added test definitions for framework UI and Utils libs." into kraken
Merge commit '69825fa9b898067f07abce3c6e63c6ac8fe89fd6' into gingerbread-plus-aosp

* commit '69825fa9b898067f07abce3c6e63c6ac8fe89fd6':
  Added test definitions for framework UI and Utils libs.
2010-06-14 11:05:05 -07:00
Jeff Brown
69825fa9b8 Merge "Added test definitions for framework UI and Utils libs." into kraken 2010-06-14 11:01:17 -07:00
The Android Open Source Project
ffe072e1a2 merge from open-source master
Change-Id: I7d0f3b08f6e632b689c870017374741a544bc7e8
2010-06-14 10:49:52 -07:00
The Android Open Source Project
1424c5daa1 merge from open-source master
Change-Id: Icb039ab90287961b1ad358b78eaead4a9aa2ae59
2010-06-14 10:01:48 -07:00
The Android Open Source Project
cc60f1b869 merge from open-source master
Change-Id: I6d060597c1dffd56aacc0072104464ad651ef877
2010-06-14 09:31:39 -07:00
The Android Open Source Project
10afb18820 merge from open-source master
Change-Id: Iedee6a43e23821175148324bc2502a33112e2d59
2010-06-14 09:26:36 -07:00
Jean-Baptiste Queru
e78a6a8d11 Merge "Cleaned up Samples by removing unsed imports and variables. Changed deprecated Config.LOGD to Config.DEBUG Removed unnecessary whitespaces" 2010-06-14 09:20:43 -07:00
Jeff Brown
ec5b11b6dd Added test definitions for framework UI and Utils libs.
Change-Id: Idf1a5741cd60e7402d950a8080bcd5dcbc12be09
2010-06-13 20:09:33 -07:00
Christian Mehlmauer
62e92d7a2a Cleaned up Samples by removing unsed imports and variables.
Changed deprecated Config.LOGD to Config.DEBUG
Removed unnecessary whitespaces

Change-Id: I01414dd83eb6f9a41e56762dd7fc00e7f1115039
2010-06-12 12:13:18 +02:00
Romain Guy
db64fc5c60 Merge "Reduced warnings by removing unused imports, unused variables and adding type arguments" 2010-06-11 18:37:31 -07:00
Jean-Baptiste Queru
aa1792548a Merge "Added missing classpathentry for DeskClock App, Bluetooth, obex, Gallery3D, Launcher2, GlobalSearch and Provision" 2010-06-11 16:10:46 -07:00
Jean-Baptiste Queru
f33fca8fec Merge "Removed unused Imports, Added Type Arguments, removed some Warnings by using unused Methods and Variables" 2010-06-11 15:19:42 -07:00
David 'Digit' Turner
54a02f74e5 am fcefaf88: Add a sample to demonstrate module exports in the NDK. 2010-06-10 17:39:39 -07:00
David 'Digit' Turner
fcefaf88ab Add a sample to demonstrate module exports in the NDK.
+ add .gitignore

Change-Id: Ifa160316e37cf201099ab0d8d89fdd375ee3eb59
2010-06-10 16:56:16 -07:00
David 'Digit' Turner
f2ecc1ea31 am d616e8b2: Fix build 2010-06-09 17:50:03 -07:00
David 'Digit' Turner
d616e8b214 Fix build
Also remove unwanted binary files here

Change-Id: I1b52abbbfd3f67670fb5977f5430a1bb4dac22bb
2010-06-09 17:46:46 -07:00
David 'Digit' Turner
97af2f7605 am c817c521: Copy platforms and samples from ndk/ source tree. 2010-06-09 17:22:29 -07:00
David 'Digit' Turner
c817c5210e Copy platforms and samples from ndk/ source tree.
The idea is to allow developing the NDK in the open, while
having the platforms and samples under a private branch until
the corresponding release are open-sourced.

Change-Id: Iee995fb6c4d3ee1387dea7486e599e079c9e4c6d
2010-06-09 17:02:09 -07:00
Jean-Baptiste Queru
bb6eb408af merge from froyo-plus-aosp
Change-Id: Ib618f0dc9c71938d111648043ebd2fa2b93beda1
2010-06-09 16:01:49 -07:00
Xavier Ducrohet
b2d64706d9 am b9531350: am 71027e1b: Provision the backup manager in the SDK System image. 2010-06-09 10:36:30 -07:00
Xavier Ducrohet
b0d0da2815 am 71027e1b: Provision the backup manager in the SDK System image.
Merge commit '71027e1b75951c90c22c9979a505381fae843ed3' into froyo-plus-aosp

* commit '71027e1b75951c90c22c9979a505381fae843ed3':
  Provision the backup manager in the SDK System image.
2010-06-09 10:35:43 -07:00
Xavier Ducrohet
b95313500a am 71027e1b: Provision the backup manager in the SDK System image.
Merge commit '71027e1b75951c90c22c9979a505381fae843ed3' into kraken

* commit '71027e1b75951c90c22c9979a505381fae843ed3':
  Provision the backup manager in the SDK System image.
2010-06-09 10:34:33 -07:00
Xavier Ducrohet
71027e1b75 Provision the backup manager in the SDK System image.
Change-Id: Ib1c9ef22558e71452cf979e36dd1d1fdbf844ce8
2010-06-07 19:24:17 -07:00
The Android Open Source Project
cc303b81e4 merge from froyo-plus-aosp
Change-Id: I2143b0ab6c94047d36d83a734985e9dfa67efda3
2010-06-07 16:43:33 -07:00
The Android Open Source Project
7acf0f3726 merge from open-source master
Change-Id: Ia3b88d1fc8864903dd67478e972758871730a215
2010-06-07 16:30:52 -07:00
Jean-Baptiste Queru
4067dc52e9 Merge "Added Type Arguments to Samples, to reduce Warnings and get a litle bit more Compiler Code checking for "new" Android Programmers" 2010-06-07 14:29:24 -07:00
Dianne Hackborn
db974ee7bd Dumb.
Change-Id: I05f17560ace880c628c94d676bd908c611348029
2010-06-04 14:13:27 -07:00
Dianne Hackborn
2e952670a2 Add API demo of a heavy-weight application.
Change-Id: I15e2d1c766af8aa7a62beed3069b8d128338ca11
2010-06-04 13:39:37 -07:00
Dan Egnor
4ff90676ae am 7e7d75ee: am 27626c03: Add API key to BackupRestore sample code.
Merge commit '7e7d75eefd23debadb67e894bc152e479bdb714f' into kraken

* commit '7e7d75eefd23debadb67e894bc152e479bdb714f':
  Add API key to BackupRestore sample code.
2010-06-03 14:10:42 -07:00
Dan Egnor
7e7d75eefd am 27626c03: Add API key to BackupRestore sample code.
Merge commit '27626c03e4db54d1edfaa28f10bef1ef9ded9995' into froyo-plus-aosp

* commit '27626c03e4db54d1edfaa28f10bef1ef9ded9995':
  Add API key to BackupRestore sample code.
2010-06-03 14:08:35 -07:00
Dan Egnor
27626c03e4 Add API key to BackupRestore sample code.
Change-Id: If80cbceffc213fdc6059fe22bf0e24520fba5f2d
Bug: 2735063
2010-06-03 13:38:57 -07:00
Guang Zhu
c2b27167dd fix earlier change for coverage_targets.xml
due to previous incorrect change to Makefile, test_defs.xml is missing.
this will add it back in.

Change-Id: I4bd57d24757662477409ba02d3f71122e8e75238
2010-06-02 11:25:59 -07:00
The Android Open Source Project
08a42a053f am 9867f949: merge from open-source master
Merge commit '9867f9491cb0b61a7ddeae616b2fdd4dca709f63' into kraken

* commit '9867f9491cb0b61a7ddeae616b2fdd4dca709f63':
  Replaced Deprecated GestureDetector API Call
2010-06-02 07:47:55 -07:00
The Android Open Source Project
4912afb1a5 am 2d75ee4a: merge from open-source master
Merge commit '2d75ee4ad0034d81350602567b8d76b1278e7edc' into kraken

* commit '2d75ee4ad0034d81350602567b8d76b1278e7edc':
  removed unused imports
2010-06-02 07:46:27 -07:00
The Android Open Source Project
9867f9491c merge from open-source master
Change-Id: If51f538438a5da22d4f04cb6d251603b4abd08f0
2010-06-02 07:45:47 -07:00
The Android Open Source Project
2d75ee4ad0 merge from open-source master
Change-Id: I69d4b5355019fa58ef5a00e6f53e553ea71f2f90
2010-06-02 07:44:48 -07:00
The Android Open Source Project
d31ee22ff2 am aebe000c: merge from open-source master
Merge commit 'aebe000cfa26eb84031f7385bf363868a70f39ff' into kraken

* commit 'aebe000cfa26eb84031f7385bf363868a70f39ff':
  removed unused imports
2010-06-02 07:42:49 -07:00
The Android Open Source Project
4a4484be62 am 4bdec4ab: merge from open-source master
Merge commit '4bdec4ab5d3deb28e29c460100a4e3c0b25d37cf' into kraken

* commit '4bdec4ab5d3deb28e29c460100a4e3c0b25d37cf':
  removed unused imports
2010-06-02 07:41:00 -07:00
The Android Open Source Project
5482eca13a am 032ae72e: merge from open-source master
Merge commit '032ae72e19d9a12fff483664b975392ef63f2fb7' into kraken

* commit '032ae72e19d9a12fff483664b975392ef63f2fb7':
  Removed unused import
2010-06-02 07:37:37 -07:00
The Android Open Source Project
aebe000cfa merge from open-source master
Change-Id: If08c1d42c870c8828b403ed322f3e93f07bb845a
2010-06-02 07:37:13 -07:00
The Android Open Source Project
4bdec4ab5d merge from open-source master
Change-Id: I0d2492c58689315f4caaa9bcb908296c26f53ed6
2010-06-02 07:35:57 -07:00