1037 Commits

Author SHA1 Message Date
Robert Greenwalt
a5ae641b0c Merge branch 'readonly-p4-master' 2009-04-03 16:46:32 -07:00
Robert Greenwalt
304b4de6ba AI 144548: am: CL 144547 Fix change 144342 by making it active only during overlay processing.
Original author: rgreenwalt

Automated import of CL 144548
2009-04-03 16:45:18 -07:00
Robert Greenwalt
9411a39866 AI 144547: Fix change 144342 by making it active only during overlay processing.
BUG=1754390

Automated import of CL 144547
2009-04-03 16:44:30 -07:00
Robert Greenwalt
75817ee3e2 Merge branch 'readonly-p4-master' 2009-04-02 23:37:35 -07:00
Robert Greenwalt
235f4328f4 AI 144413: am: CL 144342 Fix bag (string-array,etc) behavior with overlays.
We used to replace elements in the default with elements from
  the overlay.  This change causes us to empty the array first
  so if the overlay array is smaller we don't end up with elements
  from the default array showing through at the end of the array.
  Ex: [A,B,C] and overlay [D] should give [D] but used to give
  [D,B,C].
  Original author: rgreenwalt

Automated import of CL 144413
2009-04-02 23:36:26 -07:00
Suchi Amalapurapu
8920894814 Merge branch 'readonly-p4-master' 2009-04-02 23:19:43 -07:00
Suchi Amalapurapu
c700c70ccd AI 144406: am: CL 144309 am: CL 144308 aapt extensions: required sdk version, dependent software libraries, gadgets
Add new attributes for sdk version, software libs and gadgets
  BUG = 1730924
  Original author: asuchitra
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144406
2009-04-02 23:18:34 -07:00
Robert Greenwalt
4b4f4a9088 AI 144342: Fix bag (string-array,etc) behavior with overlays.
We used to replace elements in the default with elements from
  the overlay.  This change causes us to empty the array first
  so if the overlay array is smaller we don't end up with elements
  from the default array showing through at the end of the array.
  Ex: [A,B,C] and overlay [D] should give [D] but used to give
  [D,B,C].
  BUG=1754390

Automated import of CL 144342
2009-04-02 16:55:50 -07:00
Suchi Amalapurapu
7ef189d0a9 AI 144309: am: CL 144308 aapt extensions: required sdk version, dependent software libraries, gadgets
Add new attributes for sdk version, software libs and gadgets
  BUG = 1730924
  Original author: asuchitra
  Merged from: //branches/cupcake/...

Automated import of CL 144309
2009-04-02 15:20:29 -07:00
Suchi Amalapurapu
633d8cddb8 AI 144308: aapt extensions: required sdk version, dependent software libraries, gadgets
Add new attributes for sdk version, software libs and gadgets
  BUG = 1730924
  BUG=1730924

Automated import of CL 144308
2009-04-02 15:19:31 -07:00
The Android Open Source Project
e1861133d5 Merge commit 'korg/cupcake'
Conflicts:
	core/java/android/webkit/WebView.java
	core/java/android/widget/TwoLineListItem.java
	preloaded-classes
2009-03-27 15:38:40 -07:00
Scott Tsai
8a2b9083e3 localize: include <cstdio> in files that uses the printf family of
functions to make the code build on gcc-4.4

gcc-4.4 further cleaned up header include dependencies so that e.x.
including <iostream> no longer pulls in printf.
2009-03-21 08:08:36 +08:00
Scott Tsai
bfc9f4f830 Include stdio.h in tools/aidl/AST.h to make the code build on gcc-4.4 2009-03-21 07:06:07 +08:00
The Android Open Source Project
105925376f auto import from //branches/cupcake_rel/...@140373 2009-03-18 17:39:46 -07:00
Jean-Baptiste Queru
2a73de7b21 Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
	core/java/android/view/animation/TranslateAnimation.java
	core/jni/Android.mk
	core/res/res/values-en-rGB/strings.xml
	libs/audioflinger/AudioFlinger.cpp
	libs/surfaceflinger/LayerScreenshot.cpp
	packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
2009-03-18 11:33:14 -07:00
The Android Open Source Project
ba87e3e6c9 auto import from //branches/cupcake_rel/...@138607 2009-03-13 13:04:22 -07:00
The Android Open Source Project
4df2423a94 auto import from //depot/cupcake/@136594 2009-03-05 14:34:35 -08:00
The Android Open Source Project
9066cfe988 auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
The Android Open Source Project
d83a98f4ce auto import from //depot/cupcake/@135843 2009-03-03 18:28:45 -08:00
The Android Open Source Project
076357b856 auto import from //depot/cupcake/@132589 2009-03-03 14:04:24 -08:00
The Android Open Source Project
3dec7d563a auto import from //depot/cupcake/@137055 2009-03-02 22:54:33 -08:00
The Android Open Source Project
15ab3eae2e auto import from //branches/cupcake/...@132569 2009-02-20 07:38:31 -08:00
The Android Open Source Project
da996f390e auto import from //branches/cupcake/...@131421 2009-02-13 12:57:50 -08:00
Adrian Taylor
754270601a Removing "import" statements from AIDL-generated .java files.
AIDL generates unnecessary "import" statements. These cause warnings
within Eclipse when the default Eclipse warnings settings are used.
This is inconvenient since the generated .java files are not
editable. Some pesky organisations have a zero-warnings policy
too, so there's no option but to fiddle with the Eclipse settings.

This patch ensures that all usages of class names within the
generated code are fully-qualified. In practice, they were nearly
all fully-qualified already. And this patch also removes the
generation of the import statements, since they are redundant
if we're using fully-qualified names everywhere.

This should fix issue 43 in the Google Code Android issues tracker.
http://code.google.com/p/android/issues/detail?id=43

I would appreciate if somebody who knows exactly how 'aidl'
works could confirm that there's no reason 'import' statements
would have been necessary except for the bits I've fixed. (I think
unqualified names were used much more frequently in early versions
of aidl, which might explain why import statements are generated
so eagerly).
2009-02-13 09:53:11 +00:00
The Android Open Source Project
d24b8183b9 auto import from //branches/cupcake/...@130745 2009-02-10 15:44:00 -08:00
The Android Open Source Project
7547115694 Merge branch 'cupcake' 2009-01-20 14:05:35 -08:00
The Android Open Source Project
22f7dfd234 auto import from //branches/cupcake/...@127101 2009-01-20 14:03:58 -08:00
android-build SharedAccount
0fda766e53 Merge branch 'cupcake' 2009-01-15 16:16:01 -08:00
The Android Open Source Project
9266c558bf auto import from //branches/cupcake/...@126645 2009-01-15 16:12:10 -08:00
The Android Open Source Project
e570a0fa86 auto import from //branches/cupcake/...@125939 2009-01-09 18:24:37 -08:00
The Android Open Source Project
b798689749 auto import from //branches/cupcake/...@125939 2009-01-09 17:51:23 -08:00
Jean-Baptiste Queru
e1dc1d6dc8 Merge commit 'remotes/korg/cupcake'
Conflicts:
	core/java/com/android/internal/app/AlertController.java
	core/res/res/values/strings.xml
	media/java/android/media/AudioSystem.java
	services/java/com/android/server/LocationManagerService.java
2008-12-19 08:31:54 -08:00
The Android Open Source Project
f013e1afd1 Code drop from //branches/cupcake/...@124589 2008-12-17 18:05:43 -08:00
raphael
9b68d54c0e Fix typo. It's "picasa", not "picassa". 2008-10-28 14:44:31 -07:00
Alexey Zaytsev
862bfdba15 Add a few missing headers.
Fixes build with gcc 4.3.2 on Debian.

Signed-off-by: Alexey Zaytsev <alexey.zaytsev@gmail.com>
2008-10-22 02:05:55 +04:00
Alexey Zaytsev
0aa7fe6876 Add a few missing headers
Fixes build with gcc 4.3.2

Signed-off-by: Alexey Zaytsev <alexey.zaytsev@gmail.com>
2008-10-21 23:52:01 +04:00
The Android Open Source Project
54b6cfa9a9 Initial Contribution 2008-10-21 07:00:00 -07:00