Commit Graph

10056 Commits

Author SHA1 Message Date
The Android Open Source Project
1d1b78daa7 Reconcile with jb-release
Change-Id: I0f90bd02e18ed8b5e8b3e2d39d6462d94969e3e4
2012-06-07 07:48:52 -07:00
Xavier Ducrohet
344e27f238 am e0db6a0c: am 392863b7: Merge "Remove tab only if tab exists."
* commit 'e0db6a0c5523678f42229e99ea4598dc52b862eb':
  Remove tab only if tab exists.
2012-06-06 14:52:36 -07:00
Xavier Ducrohet
e0db6a0c55 am 392863b7: Merge "Remove tab only if tab exists."
* commit '392863b774874dff5ca4df3d336c5d459f014697':
  Remove tab only if tab exists.
2012-06-06 14:50:50 -07:00
Xavier Ducrohet
392863b774 Merge "Remove tab only if tab exists." 2012-06-06 14:44:26 -07:00
Jesse Hall
56513f5ff4 Move emugl system code to development.git
Because of the way the SDK and Android system images are branched,
host code that goes into the SDK tools can't live in the same
repository as code that goes into the system image. This change keeps
the emugl host code in sdk.git/emulator/opengl while moving the emugl
system code to development.git/tools/emulator/opengl.

A few changes were made beyond simply cloning the directories:

(a) Makefiles were modified to only build the relevant components. Not
    doing so would break the build due to having multiple rule
    definitions.

(b) Protocol spec files were moved from the guest encoder directories
    to the host decoder directories. The decoder must support older
    versions of the protocol, but not newer versions, so it makes
    sense to keep the latest version of the protocol spec with the
    decoder.

(c) Along with that, the encoder is now built from checked in
    generated encoder source rather than directly from the protocol
    spec.  The generated code must be updated manually. This makes it
    possible to freeze the system encoder version without freezing the
    host decoder version, and also makes it very obvious when a
    protocol changes is happening that will require special
    backwards-compatibility support in the decoder/renderer.

(d) Host-only and system-only code were removed from the repository
    where they aren't used.

(e) README and DESIGN documents were updated to reflect this split.

No actual source code was changed due to the above.

Change-Id: I2c936101ea0405b372750d36ba0f01e84d719c43
2012-06-06 09:46:29 -07:00
The Android Automerger
50a5d15e3d merge in jb-release history after reset to jb-dev 2012-06-05 06:52:17 -07:00
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
The Android Automerger
2d69b07115 merge in jb-release history after reset to jb-dev 2012-06-03 06:00:33 -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
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
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
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
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
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
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
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
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
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
553e861a42 Reconcile with jb-release nakasi-factoryrom-release
Change-Id: If473fc45ebf7c4abb91113d12ae559be93c8ecdf
2012-05-24 09:01:01 -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
The Android Automerger
422c4b33de merge in jb-release history after reset to jb-dev 2012-05-23 07:00:03 -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
d9369bd771 am 9649bee7: Update API file with proper content.
* commit '9649bee7b2482f7905f7e1ae33f3dc1052cee7f6':
  Update API file with proper content.
2012-05-22 15:59:06 -07:00
Xavier Ducrohet
928c7d668e Add API 16 to the SDK API file.
Change-Id: I4937aa793fed5efc51e0c4ce127b7193148baa5e
2012-05-22 15:57:58 -07:00
Xavier Ducrohet
9649bee7b2 Update API file with proper content.
This doesn't contain API 16 just yet. This is just a new version
based on reading all the android.jar instead of the text-based
files.

This new mechanism filters out all methods coming from super
classes as well as interfaces in an effort to make the file
smaller.

Change-Id: Ieefa7d01c29944b2b77b22e8cb81ee2e67afd555
2012-05-22 15:24:18 -07:00
The Android Automerger
df56b2a246 merge in nakasi-factoryrom-release history after reset to jb-dev 2012-05-22 13:22:24 -07:00
The Android Open Source Project
2455c4916e Reconcile with jb-release
Change-Id: Idb05db9a3cd879261a0ea9ed96a433531e0441b4
2012-05-22 13:04:57 -07:00
The Android Automerger
07e7a1f45c merge in jb-release history after reset to jb-dev 2012-05-22 07:00:23 -07:00
Svetoslav Ganov
ef03d1bae6 am 84710bb8: Merge "Updating the accessibility sample due to a security fix." into jb-dev
* commit '84710bb8b0f3b149feb72d4c29dec35a4ccf327d':
  Updating the accessibility sample due to a security fix.
2012-05-21 13:17:13 -07:00
Svetoslav Ganov
84710bb8b0 Merge "Updating the accessibility sample due to a security fix." into jb-dev 2012-05-21 13:13:41 -07:00
The Android Automerger
7a68eb9bc1 merge in jb-release history after reset to jb-dev 2012-05-21 07:00:31 -07:00
Dianne Hackborn
03239663fc am 7d7d2fb6: Merge "A few little tweaks to system ui flag demos." into jb-dev
* commit '7d7d2fb6d6b8c30cd6549b9cb35e9a0d36f87981':
  A few little tweaks to system ui flag demos.
2012-05-20 21:53:24 -07:00
Dianne Hackborn
7d7d2fb6d6 Merge "A few little tweaks to system ui flag demos." into jb-dev 2012-05-20 10:17:58 -07:00
The Android Automerger
66641b03ad merge in jb-release history after reset to jb-dev 2012-05-20 07:39:37 -07:00
The Android Automerger
091f5c3043 merge in jb-release history after reset to jb-dev 2012-05-19 11:42:46 -07:00
The Android Automerger
967d0604a3 merge in jb-release history after reset to jb-dev 2012-05-19 10:05:42 -07:00