Commit Graph

10347 Commits

Author SHA1 Message Date
Dianne Hackborn
4914a5f37b am 80df91c7: New API demos for retained fragments with loaders.
* commit '80df91c7f2ac155c1cf4c3337f8db5a4bf5426b5':
  New API demos for retained fragments with loaders.
2012-06-04 11:21:34 -07:00
Dianne Hackborn
80df91c7f2 New API demos for retained fragments with loaders.
Also tweak the cursor loader samples to filter out query
callbacks that don't change the filter, to avoid restarting the
loader on a configuration change.

Change-Id: Iac9293fed45e127698be59262d68b0b59a8ec9ce
2012-06-04 11:12:37 -07:00
Chiao Cheng
6b2b55ac2a Merge "Updating intellij idegen project template to use jdk 1.6." 2012-06-04 11:06:16 -07:00
The Android Automerger
2d69b07115 merge in jb-release history after reset to jb-dev 2012-06-03 06:00:33 -07:00
Chiao Cheng
797198bbe0 Updating intellij idegen project template to use jdk 1.6.
Also excluding prebuilt jars from classpath. These include all
previous versions of the android sdk jars. Increased heap size to 800
so google intellij plugin does not complain. Changed default
configuration to use global code style insead of per project code
style.

Change-Id: If97550000fdc282cf6d506eb80b830ff4c1b87b9
2012-06-01 15:27:36 -07:00
Eino-Ville Talvala
4cdc74e854 Merge "EmulatedFakeCamera2: Add opaque stream output support" 2012-06-01 10:47:13 -07:00
Andrew Hsieh
2bcbee88f0 am 295ba8d3: am 93122516: am c424ad10: Merge "ndk: Remove prebuilt C runtime objects. Add sources instead."
* commit '295ba8d381bca730a5caf242871564c0ed1f9319':
  ndk: Remove prebuilt C runtime objects. Add sources instead.
2012-06-01 04:07:11 -07:00
Andrew Hsieh
295ba8d381 am 93122516: am c424ad10: Merge "ndk: Remove prebuilt C runtime objects. Add sources instead."
* commit '93122516a7afb92a4581da51305d2ce208757a22':
  ndk: Remove prebuilt C runtime objects. Add sources instead.
2012-06-01 04:04:52 -07:00
Andrew Hsieh
93122516a7 am c424ad10: Merge "ndk: Remove prebuilt C runtime objects. Add sources instead."
* commit 'c424ad10606977edab8d81a39eca68ddf00ec686':
  ndk: Remove prebuilt C runtime objects. Add sources instead.
2012-06-01 04:02:51 -07:00
Andrew Hsieh
c424ad1060 Merge "ndk: Remove prebuilt C runtime objects. Add sources instead." 2012-06-01 03:51:09 -07:00
Jeff Brown
1ab4de260d am 4a0c2c51: am 50d57364: Fix libutils test package path.
* commit '4a0c2c515149e4dd654c0bf47953f85a3fc52fd9':
  Fix libutils test package path.
2012-05-31 16:56:22 -07:00
Jeff Brown
4a0c2c5151 am 50d57364: Fix libutils test package path.
* commit '50d57364f97135906e3acd627d8c3327057d4bb4':
  Fix libutils test package path.
2012-05-31 16:53:26 -07:00
Jeff Brown
50d57364f9 Fix libutils test package path.
Change-Id: Ibee2db4e75c5872d94984a02ef8bbdc6bd1e4b33
2012-05-31 16:08:05 -07:00
Brett Chabot
5e2129fef0 Merge "Fixed error messages for retrieving environment variables" 2012-05-31 10:54:55 -07:00
David 'Digit' Turner
5e7c4e6a57 ndk: Remove prebuilt C runtime objects. Add sources instead.
This patch removes all prebuilt C runtime object files from
the ndk/platforms/ directory. We replace them with equivalent
assembly sources lifted from the following directories:

  bionic/libc/private/      (for __dso_handle.S and __dso_handle_so.S)
  bionic/libc/arch-$ARCH/   (for all others)

Note: This requires that your NDK's gen-platforms.sh script be
      capable of rebuilding the object files from sources.
      See https://android-review.googlesource.com/36822

The goal here is to make it much easier to update these files,
and track their changes relative to the content of bionic/lib.
For example to fix the following issues in the future:

Change-Id: If4c84e2584b0e58ca3585b034bb8a13a8add8ab9
http://code.google.com/p/android/issues/detail?id=26911
http://code.google.com/p/android/issues/detail?id=23203
2012-05-31 10:58:57 +02:00
Raphael Moll
96a1131788 am d9a06fa8: am a8fd9e0a: am 86ef5ca7: Merge "SDK: Ability to generate repos in XSD repository-7."
* commit 'd9a06fa8a9f303755103f3b2d051b83b352f59d7':
  SDK: Ability to generate repos in XSD repository-7.
2012-05-30 15:25:30 -07:00
Raphael Moll
d9a06fa8a9 am a8fd9e0a: am 86ef5ca7: Merge "SDK: Ability to generate repos in XSD repository-7."
* commit 'a8fd9e0a3bddffb1aa17bc22b86352a1db36160d':
  SDK: Ability to generate repos in XSD repository-7.
2012-05-30 15:21:05 -07:00
Raphael Moll
a8fd9e0a3b am 86ef5ca7: Merge "SDK: Ability to generate repos in XSD repository-7."
* commit '86ef5ca7e3cd1a3b8cac77aa645217d3fcdccfab':
  SDK: Ability to generate repos in XSD repository-7.
2012-05-30 15:18:28 -07:00
Raphael Moll
86ef5ca7e3 Merge "SDK: Ability to generate repos in XSD repository-7." 2012-05-30 15:00:11 -07:00
The Android Open Source Project
7a961223f5 am 62f4d9d3: Reconcile with jb-release
* commit '62f4d9d3a3570aaa24e768a49c48dfb272d70838':
2012-05-30 10:14:36 -07:00
The Android Open Source Project
62f4d9d3a3 Reconcile with jb-release
Change-Id: If7cd3a5fcbf1bfaee64835c6b3ef7bf858f73b88
2012-05-30 10:12:49 -07:00
The Android Automerger
03ffe7fe8a merge in jb-release history after reset to jb-dev 2012-05-30 07:00:17 -07:00
Nick Pelly
a4bfc662ad am 3a8d9ff8: am 6cc9755b: Update device for new location provider configs.
* commit '3a8d9ff84ac46e4f1102cb601b5490c2b04e5802':
  Update device for new location provider configs.
2012-05-29 16:24:41 -07:00
Nick Pelly
3a8d9ff84a am 6cc9755b: Update device for new location provider configs.
* commit '6cc9755baac9cde9b1327cd090c5d6bea6dbbb00':
  Update device for new location provider configs.
2012-05-29 16:22:45 -07:00
Nick Pelly
6cc9755baa Update device for new location provider configs.
Change-Id: I7d3cf81a5ba1ff7e2ac56f125d8b3454a6bd11c4
2012-05-29 15:56:20 -07:00
Chiao Cheng
cda9ca289f Merge "Up line width from 80 to 100." 2012-05-29 14:46:54 -07:00
Michael Wright
5177da5f5b Fixed error messages for retrieving environment variables
Change-Id: Ib84479bfc702de1e1c6a0d09ed7ccf6ad06e1b2b
2012-05-29 11:59:24 -07:00
The Android Open Source Project
b46991523a am dbe89925: Reconcile with jb-release nakasi-factoryrom-release
* commit 'dbe899259b610bef8fcdbc4e23cb8313888848c7':
2012-05-29 09:41:44 -07:00
The Android Open Source Project
dbe899259b Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Ie2368fb992d54d2f97abc7de822b122cd8909941
2012-05-29 09:39:24 -07:00
The Android Automerger
4de07346db merge in jb-release history after reset to jb-dev 2012-05-29 08:55:28 -07:00
Xavier Ducrohet
f63690de4c am 331d69be: am af0576fc: Merge "Remove outdated PDK." into jb-dev
* commit '331d69be99d9662effbb4ae856d9ac16276826cc':
  Remove outdated PDK.
2012-05-25 13:27:04 -07:00
Xavier Ducrohet
331d69be99 am af0576fc: Merge "Remove outdated PDK." into jb-dev
* commit 'af0576fc765118f791a5eb9cdaaeed07c20b166a':
  Remove outdated PDK.
2012-05-25 13:24:43 -07:00
Xavier Ducrohet
af0576fc76 Merge "Remove outdated PDK." into jb-dev 2012-05-25 13:22:18 -07:00
Marc Blank
b337343ed9 am 1d7f5824: am 2476301f: Fix up .classpath for Email/Exchange/emailcommon
* commit '1d7f5824ec5d3b1d7859a5d5b5fd736258680ead':
  Fix up .classpath for Email/Exchange/emailcommon
2012-05-25 10:11:21 -07:00
Marc Blank
1d7f5824ec am 2476301f: Fix up .classpath for Email/Exchange/emailcommon
* commit '2476301f4dce7769b02fe4157f3134254cc1a4d8':
  Fix up .classpath for Email/Exchange/emailcommon
2012-05-25 10:08:41 -07:00
Chiao Cheng
87cfafaa3d Up line width from 80 to 100.
Change-Id: Ic2e2bff15c8eed15a32070909683f6e4e5d96b4e
2012-05-24 19:44:00 -07:00
Xavier Ducrohet
1e284c1477 Remove outdated PDK.
Bug: 6557564

Change-Id: I7d413524c43732056d822e5c1a01f0a26147f24b
2012-05-24 16:57:38 -07:00
Marc Blank
2476301f4d Fix up .classpath for Email/Exchange/emailcommon
Change-Id: I7303f13d4544b81e2a2655319f310a3b6c5243b1
2012-05-24 15:29:47 -07:00
The Android Automerger
3bf34b4979 merge in nakasi-factoryrom-release history after reset to jb-dev 2012-05-24 10:16:18 -07:00
The Android Open Source Project
fa83298c09 am 553e861a: Reconcile with jb-release nakasi-factoryrom-release
* commit '553e861a42c9e7ac8177553f003e288240abf335':
2012-05-24 09:03:43 -07:00
The Android Open Source Project
553e861a42 Reconcile with jb-release nakasi-factoryrom-release
Change-Id: If473fc45ebf7c4abb91113d12ae559be93c8ecdf
2012-05-24 09:01:01 -07:00
Jean-Baptiste Queru
ab0d65975e am beb1f40d: am 34baff19: am 99314f43: Merge "Fix old style edit text drawable display error."
* commit 'beb1f40d677166edbe98fdf1c0aabc34a1c8a6fb':
  Fix old style edit text drawable display error.
2012-05-23 15:09:59 -07:00
Jean-Baptiste Queru
beb1f40d67 am 34baff19: am 99314f43: Merge "Fix old style edit text drawable display error."
* commit '34baff19d88679254d82420f798387f92a7fb912':
  Fix old style edit text drawable display error.
2012-05-23 15:06:55 -07:00
Jean-Baptiste Queru
34baff19d8 am 99314f43: Merge "Fix old style edit text drawable display error."
* commit '99314f432e024720ffb88431ca8535cec5e4ff58':
  Fix old style edit text drawable display error.
2012-05-23 15:04:39 -07:00
Jean-Baptiste Queru
99314f432e Merge "Fix old style edit text drawable display error." 2012-05-23 14:58:09 -07:00
Eino-Ville Talvala
2e0eee2d05 Merge "EmulatedFakeCamera2: Add more static metadata" 2012-05-23 09:52:45 -07:00
The Android Automerger
422c4b33de merge in jb-release history after reset to jb-dev 2012-05-23 07:00:03 -07:00
Xavier Ducrohet
99dbb2b9a8 am 7dd2f15b: am 928c7d66: Add API 16 to the SDK API file.
* commit '7dd2f15b87945794eee35c0e688048e3eb298ef5':
  Add API 16 to the SDK API file.
2012-05-22 17:19:54 -07:00
Xavier Ducrohet
7dd2f15b87 am 928c7d66: Add API 16 to the SDK API file.
* commit '928c7d668e70ea66e21909918f68c509b6f26b5a':
  Add API 16 to the SDK API file.
2012-05-22 17:17:02 -07:00
Xavier Ducrohet
689ef782f0 am d9369bd7: am 9649bee7: Update API file with proper content.
* commit 'd9369bd771b8e46ff4fb7038517b2529fc8b0b1e':
  Update API file with proper content.
2012-05-22 16:01:22 -07:00