summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
...
| * AI 144547: Fix change 144342 by making it active only during overlay processing.Robert Greenwalt2009-04-031-2/+5
| | | | | | | | | | | | BUG=1754390 Automated import of CL 144547
| * AI 144342: Fix bag (string-array,etc) behavior with overlays.Robert Greenwalt2009-04-022-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * AI 144309: am: CL 144308 aapt extensions: required sdk version, dependent ↵Suchi Amalapurapu2009-04-021-69/+142
| | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'readonly-p4-master'Marco Nelissen2009-04-204-13/+20
|\ \
| * | AI 147028: Fix up aapt so it runs cleanly under the valgrind leak checker.Marco Nelissen2009-04-204-13/+20
| | | | | | | | | | | | Automated import of CL 147028
* | | Merge branch 'readonly-p4-master'Xavier Ducrohet2009-04-181-2/+2
|\ \ \ | |/ /
| * | AI 146586: am: CL 146485 am: CL 146411 Fix BridgeCanvas#drawRoundRectXavier Ducrohet2009-04-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Original author: xav Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146586
* | | Merge branch 'readonly-p4-master'Robert Greenwalt2009-04-031-2/+5
|\ \ \ | |/ /
| * | AI 144548: am: CL 144547 Fix change 144342 by making it active only during ↵Robert Greenwalt2009-04-031-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | overlay processing. Original author: rgreenwalt Automated import of CL 144548
* | | Merge branch 'readonly-p4-master'Robert Greenwalt2009-04-022-4/+24
|\ \ \ | |/ /
| * | AI 144413: am: CL 144342 Fix bag (string-array,etc) behavior with overlays.Robert Greenwalt2009-04-022-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch 'readonly-p4-master'Suchi Amalapurapu2009-04-021-69/+142
|\ \ \ | |/ /
| * | AI 144406: am: CL 144309 am: CL 144308 aapt extensions: required sdk ↵Suchi Amalapurapu2009-04-021-69/+142
| |/ | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge commit 'korg/cupcake'The Android Open Source Project2009-03-271-5/+6
|\ \ | |/ | | | | | | | | | | Conflicts: core/java/android/webkit/WebView.java core/java/android/widget/TwoLineListItem.java preloaded-classes
| * auto import from //branches/cupcake_rel/...@140373The Android Open Source Project2009-03-181-5/+6
| |
* | localize: include <cstdio> in files that uses the printf family ofScott Tsai2009-03-218-0/+8
| | | | | | | | | | | | | | 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.
* | Include stdio.h in tools/aidl/AST.h to make the code build on gcc-4.4Scott Tsai2009-03-211-0/+1
| |
* | Merge commit 'remotes/korg/cupcake' into mergeJean-Baptiste Queru2009-03-1825-225/+784
|\ \ | |/ | | | | | | | | | | | | | | | | 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
| * auto import from //branches/cupcake_rel/...@138607The Android Open Source Project2009-03-133-7/+85
| |
| * auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-053-33/+47
| |
| * auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03190-0/+42108
| |
| * auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03190-42010/+0
| |
| * auto import from //depot/cupcake/@132589The Android Open Source Project2009-03-035-120/+22
| |
| * auto import from //depot/cupcake/@137055The Android Open Source Project2009-03-025-22/+120
| |
| * auto import from //branches/cupcake/...@132569The Android Open Source Project2009-02-201-0/+10
| |
| * auto import from //branches/cupcake/...@131421The Android Open Source Project2009-02-131-0/+6
| |
| * auto import from //branches/cupcake/...@130745The Android Open Source Project2009-02-1019-165/+518
| |
* | Removing "import" statements from AIDL-generated .java files.Adrian Taylor2009-02-132-20/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | Merge branch 'cupcake'The Android Open Source Project2009-01-201-3/+2
|\ \ | |/
| * auto import from //branches/cupcake/...@127101The Android Open Source Project2009-01-201-3/+2
| |
* | Merge branch 'cupcake'android-build SharedAccount2009-01-159-183/+373
|\ \ | |/
| * auto import from //branches/cupcake/...@126645The Android Open Source Project2009-01-159-183/+373
| |
* | auto import from //branches/cupcake/...@125939The Android Open Source Project2009-01-0916-98/+611
|\ \ | |/
| * auto import from //branches/cupcake/...@125939The Android Open Source Project2009-01-0920-98/+616
| |
* | Merge commit 'remotes/korg/cupcake'Jean-Baptiste Queru2008-12-1929-125/+547
|\ \ | |/ | | | | | | | | | | | | 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
| * Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-1729-126/+548
| |
* | Fix typo. It's "picasa", not "picassa".raphael2008-10-281-1/+1
| |
* | Add a few missing headers.Alexey Zaytsev2008-10-226-0/+8
| | | | | | | | | | | | Fixes build with gcc 4.3.2 on Debian. Signed-off-by: Alexey Zaytsev <alexey.zaytsev@gmail.com>
* | Add a few missing headersAlexey Zaytsev2008-10-214-0/+5
|/ | | | | | Fixes build with gcc 4.3.2 Signed-off-by: Alexey Zaytsev <alexey.zaytsev@gmail.com>
* Initial ContributionThe Android Open Source Project2008-10-21186-0/+40512