]> git.saurik.com Git - android/aapt.git/log
android/aapt.git
15 years agoam 684a2edb: Merge change 3577 into donut
Android (Google) Code Review [Wed, 10 Jun 2009 22:32:56 +0000 (15:32 -0700)] 
am 684a2edb: Merge change 3577 into donut

Merge commit '684a2edbe192a2a76684c5d6855773196d2e1a2e'

* commit '684a2edbe192a2a76684c5d6855773196d2e1a2e':
  Make aapt Error out when an overlay adds a string.

15 years agoMerge change 3577 into donut
Android (Google) Code Review [Wed, 10 Jun 2009 19:36:45 +0000 (12:36 -0700)] 
Merge change 3577 into donut

* changes:
  Make aapt Error out when an overlay adds a string.

15 years agoMake aapt Error out when an overlay adds a string.
Robert Greenwalt [Tue, 9 Jun 2009 16:14:20 +0000 (09:14 -0700)] 
Make aapt Error out when an overlay adds a string.

Final added check (I think) for 1585775 - not letting overlays add
resources.

modified:   ResourceTable.cpp
modified:   ResourceTable.h

15 years agoam fa5c7e1d: Catch when a file resource (non values) added in an overlay.
Robert Greenwalt [Mon, 8 Jun 2009 18:06:48 +0000 (11:06 -0700)] 
am fa5c7e1d: Catch when a file resource (non values) added in an overlay.

Merge commit 'fa5c7e1dfede7e26260789dd2de5175497e9659b'

* commit 'fa5c7e1dfede7e26260789dd2de5175497e9659b':
  Catch when a file resource (non values) added in an overlay.

15 years agoCatch when a file resource (non values) added in an overlay.
Robert Greenwalt [Sat, 6 Jun 2009 01:53:26 +0000 (18:53 -0700)] 
Catch when a file resource (non values) added in an overlay.

File resources are assigned resource id's and if an overlay adds one
it renumbers things and breaks compatability.  Used to segfault
if you tried before, but now catches it and lets you know what file
caused the problem.

15 years agoam 1aa8170e: Add per-named-item overlay ability in res xml.
Robert Greenwalt [Sat, 6 Jun 2009 04:17:43 +0000 (21:17 -0700)] 
am 1aa8170e: Add per-named-item overlay ability in res xml.

Merge commit '1aa8170e6a448afad86e5d62927d3b8ca4cd9707'

* commit '1aa8170e6a448afad86e5d62927d3b8ca4cd9707':
  Add per-named-item overlay ability in res xml.

15 years agoAdd per-named-item overlay ability in res xml.
Robert Greenwalt [Fri, 5 Jun 2009 22:59:15 +0000 (15:59 -0700)] 
Add per-named-item overlay ability in res xml.

Fixes 1899451.
Also errors out if you add a bag via an overlay (which would renumber
resources).  Note that you can still add elements within the bag as they are
not issued resource IDs.  So for example you can now modify the framework
themes.xml file without copying the entire file.

All bag types are now modifable except non-named bag types (how would you
address which element to replace?):
    array
    string_array
    integer_array

15 years agobreak dependency on utils/ZipEntry.h and utils/ZipFile.h, get rid of inet_address...
Mathias Agopian [Fri, 5 Jun 2009 21:56:35 +0000 (14:56 -0700)] 
break dependency on utils/ZipEntry.h and utils/ZipFile.h, get rid of inet_address.h and Socket.h which were not used

15 years agoget rid of utils.h
Mathias Agopian [Mon, 1 Jun 2009 02:13:00 +0000 (19:13 -0700)] 
get rid of utils.h

15 years agoMerge commit 'f479aa0900e9a85afdc78b1048684e37579ebf23'
The Android Open Source Project [Thu, 21 May 2009 05:41:10 +0000 (22:41 -0700)] 
Merge commit 'f479aa0900e9a85afdc78b1048684e37579ebf23'

Conflicts:
api/current.xml
core/res/res/values/public.xml

15 years agoAdd padding to public.xml to avoid breaking from auto-merges.
Dianne Hackborn [Wed, 20 May 2009 23:01:06 +0000 (16:01 -0700)] 
Add padding to public.xml to avoid breaking from auto-merges.

15 years agoam d3f14a62: reconcile donut snapshot
Jean-Baptiste Queru [Wed, 20 May 2009 18:49:58 +0000 (11:49 -0700)] 
am d3f14a62: reconcile donut snapshot

Merge commit 'd3f14a625e74a93e52b8b9aa5363a5de50129ea9'

* commit 'd3f14a625e74a93e52b8b9aa5363a5de50129ea9':
  donut snapshot

15 years agoreconcile donut snapshot
Jean-Baptiste Queru [Wed, 20 May 2009 18:28:11 +0000 (11:28 -0700)] 
reconcile donut snapshot

Merge branch 'donut-snapshot' into HEAD

15 years agodonut snapshot
Jean-Baptiste Queru [Wed, 20 May 2009 18:28:04 +0000 (11:28 -0700)] 
donut snapshot

15 years agoam 656a2726: Merge change 1910 into donut
Android (Google) Code Review [Tue, 19 May 2009 06:56:07 +0000 (23:56 -0700)] 
am 656a2726: Merge change 1910 into donut

Merge commit '656a2726ad977be194c3b8f4bf4ec3068bf3e1c9'

* commit '656a2726ad977be194c3b8f4bf4ec3068bf3e1c9':
  Update aapt badging for native code, configs, density, etc.

15 years agoUpdate aapt badging for native code, configs, density, etc.
Dianne Hackborn [Mon, 18 May 2009 22:22:00 +0000 (15:22 -0700)] 
Update aapt badging for native code, configs, density, etc.

15 years agoMerge commit 'refs/changes/39/1839/1' of ssh://hackbod@android-git.corp.google.com...
Dianne Hackborn [Sat, 16 May 2009 04:15:37 +0000 (21:15 -0700)] 
Merge commit 'refs/changes/39/1839/1' of ssh://hackbod@android-git.corp.google.com:29418/platform/frameworks/base into merge

15 years agoArgh fix another build breakage!
Dianne Hackborn [Sat, 16 May 2009 01:45:15 +0000 (18:45 -0700)] 
Argh fix another build breakage!

15 years agoam 5b3189e0: Fix the build. :(
Dianne Hackborn [Sat, 16 May 2009 01:36:13 +0000 (18:36 -0700)] 
am 5b3189e0: Fix the build. :(

Merge commit '5b3189e03c71bcd276e0b39d0ec5e2f699a1697f'

* commit '5b3189e03c71bcd276e0b39d0ec5e2f699a1697f':
  Fix the build. :(
  Implement compatibility support for WRITE_SDCARD permission.

15 years agoImplement compatibility support for WRITE_SDCARD permission.
Dianne Hackborn [Wed, 13 May 2009 22:06:13 +0000 (15:06 -0700)] 
Implement compatibility support for WRITE_SDCARD permission.

Now old applications will automatically be granted it.  Also renamed it from
SDCARD_WRITE to WRITE_SDCARD to be consistent with our other permissions,
and re-arranged how we do targetSdkVersion to actually be usuable for this
kind of stuff.

Note that right now this results in basically all apps being given the
WRITE_SDCARD permission, because their targetSdkVersion is not set.  I will
be dealing with that in a future change.

15 years agoImplement compatibility support for WRITE_SDCARD permission.
Dianne Hackborn [Wed, 13 May 2009 22:06:13 +0000 (15:06 -0700)] 
Implement compatibility support for WRITE_SDCARD permission.

Now old applications will automatically be granted it.  Also renamed it from
SDCARD_WRITE to WRITE_SDCARD to be consistent with our other permissions,
and re-arranged how we do targetSdkVersion to actually be usuable for this
kind of stuff.

Note that right now this results in basically all apps being given the
WRITE_SDCARD permission, because their targetSdkVersion is not set.  I will
be dealing with that in a future change.

15 years agoam 6ee44d1: Merge change 1258 into donut
Android (Google) Code Review [Mon, 11 May 2009 18:22:25 +0000 (11:22 -0700)] 
am 6ee44d1: Merge change 1258 into donut

Merge commit '6ee44d1ff30627388bf3afa5fa542780af8f4005'

* commit '6ee44d1ff30627388bf3afa5fa542780af8f4005':
  Fix 1840639 to support overlays with zz_ZZ.

15 years agoFix 1840639 to support overlays with zz_ZZ.
Robert Greenwalt [Fri, 8 May 2009 18:45:37 +0000 (11:45 -0700)] 
Fix 1840639 to support overlays with zz_ZZ.
Everything but strings worked fine before but a new default string would generate a build error.

15 years agoMerge donut into master
Jean-Baptiste Queru [Thu, 23 Apr 2009 01:33:17 +0000 (18:33 -0700)] 
Merge donut into master

15 years agomerge cupcake into donut
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:56:58 +0000 (17:56 -0700)] 
merge cupcake into donut

15 years agoMerge donut into master
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:12:34 +0000 (17:12 -0700)] 
Merge donut into master

15 years agoMerge branch 'readonly-p4-master'
Marco Nelissen [Mon, 20 Apr 2009 23:17:25 +0000 (16:17 -0700)] 
Merge branch 'readonly-p4-master'

15 years agoAI 147028: Fix up aapt so it runs cleanly under the valgrind leak checker.
Marco Nelissen [Mon, 20 Apr 2009 23:16:01 +0000 (16:16 -0700)] 
AI 147028: Fix up aapt so it runs cleanly under the valgrind leak checker.

Automated import of CL 147028

15 years agoMerge commit 'korg/cupcake'
The Android Open Source Project [Wed, 15 Apr 2009 01:18:03 +0000 (18:18 -0700)] 
Merge commit 'korg/cupcake'

15 years agoAI 144950: Manual integration of 144342 and 144547 from donutburger to cupcake.
Robert Greenwalt [Wed, 8 Apr 2009 00:19:28 +0000 (17:19 -0700)] 
AI 144950: Manual integration of 144342 and 144547 from donutburger to cupcake.
  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 final result.
  Ex: [A,B,C] default with [D] overlay should give [D] but used to
  give [D,B,C]
  BUG=1754390

Automated import of CL 144950

15 years agoMerge branch 'readonly-p4-master'
Robert Greenwalt [Fri, 3 Apr 2009 23:46:32 +0000 (16:46 -0700)] 
Merge branch 'readonly-p4-master'

15 years agoAI 144548: am: CL 144547 Fix change 144342 by making it active only during overlay...
Robert Greenwalt [Fri, 3 Apr 2009 23:45:18 +0000 (16:45 -0700)] 
AI 144548: am: CL 144547 Fix change 144342 by making it active only during overlay processing.
  Original author: rgreenwalt

Automated import of CL 144548

15 years agoAI 144547: Fix change 144342 by making it active only during overlay processing.
Robert Greenwalt [Fri, 3 Apr 2009 23:44:30 +0000 (16:44 -0700)] 
AI 144547: Fix change 144342 by making it active only during overlay processing.
  BUG=1754390

Automated import of CL 144547

15 years agoMerge branch 'readonly-p4-master'
Robert Greenwalt [Fri, 3 Apr 2009 06:37:35 +0000 (23:37 -0700)] 
Merge branch 'readonly-p4-master'

15 years agoAI 144413: am: CL 144342 Fix bag (string-array,etc) behavior with overlays.
Robert Greenwalt [Fri, 3 Apr 2009 06:36:26 +0000 (23:36 -0700)] 
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

15 years agoMerge branch 'readonly-p4-master'
Suchi Amalapurapu [Fri, 3 Apr 2009 06:19:43 +0000 (23:19 -0700)] 
Merge branch 'readonly-p4-master'

15 years agoAI 144406: am: CL 144309 am: CL 144308 aapt extensions: required sdk version, depende...
Suchi Amalapurapu [Fri, 3 Apr 2009 06:18:34 +0000 (23:18 -0700)] 
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

15 years agoAI 144342: Fix bag (string-array,etc) behavior with overlays.
Robert Greenwalt [Thu, 2 Apr 2009 23:55:50 +0000 (16:55 -0700)] 
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

15 years agoAI 144309: am: CL 144308 aapt extensions: required sdk version, dependent software...
Suchi Amalapurapu [Thu, 2 Apr 2009 22:20:29 +0000 (15:20 -0700)] 
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

15 years agoAI 144308: aapt extensions: required sdk version, dependent software libraries, gadgets
Suchi Amalapurapu [Thu, 2 Apr 2009 22:19:31 +0000 (15:19 -0700)] 
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

15 years agoMerge commit 'remotes/korg/cupcake' into merge
Jean-Baptiste Queru [Wed, 18 Mar 2009 18:33:14 +0000 (11:33 -0700)] 
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

15 years agoauto import from //depot/cupcake/@136594
The Android Open Source Project [Thu, 5 Mar 2009 22:34:35 +0000 (14:34 -0800)] 
auto import from //depot/cupcake/@136594

15 years agoauto import from //depot/cupcake/@135843
The Android Open Source Project [Wed, 4 Mar 2009 03:31:44 +0000 (19:31 -0800)] 
auto import from //depot/cupcake/@135843

15 years agoauto import from //depot/cupcake/@135843
The Android Open Source Project [Wed, 4 Mar 2009 02:28:45 +0000 (18:28 -0800)] 
auto import from //depot/cupcake/@135843

15 years agoauto import from //depot/cupcake/@132589
The Android Open Source Project [Tue, 3 Mar 2009 22:04:24 +0000 (14:04 -0800)] 
auto import from //depot/cupcake/@132589

15 years agoauto import from //depot/cupcake/@137055
The Android Open Source Project [Tue, 3 Mar 2009 06:54:33 +0000 (22:54 -0800)] 
auto import from //depot/cupcake/@137055

15 years agoauto import from //branches/cupcake/...@132569
The Android Open Source Project [Fri, 20 Feb 2009 15:38:31 +0000 (07:38 -0800)] 
auto import from //branches/cupcake/...@132569

15 years agoauto import from //branches/cupcake/...@130745
The Android Open Source Project [Tue, 10 Feb 2009 23:44:00 +0000 (15:44 -0800)] 
auto import from //branches/cupcake/...@130745

15 years agoMerge branch 'cupcake'
The Android Open Source Project [Tue, 20 Jan 2009 22:05:35 +0000 (14:05 -0800)] 
Merge branch 'cupcake'

15 years agoauto import from //branches/cupcake/...@127101
The Android Open Source Project [Tue, 20 Jan 2009 22:03:58 +0000 (14:03 -0800)] 
auto import from //branches/cupcake/...@127101

15 years agoMerge branch 'cupcake'
android-build SharedAccount [Fri, 16 Jan 2009 00:16:01 +0000 (16:16 -0800)] 
Merge branch 'cupcake'

15 years agoauto import from //branches/cupcake/...@126645
The Android Open Source Project [Fri, 16 Jan 2009 00:12:10 +0000 (16:12 -0800)] 
auto import from //branches/cupcake/...@126645

15 years agoauto import from //branches/cupcake/...@125939
The Android Open Source Project [Sat, 10 Jan 2009 02:24:37 +0000 (18:24 -0800)] 
auto import from //branches/cupcake/...@125939

15 years agoauto import from //branches/cupcake/...@125939
The Android Open Source Project [Sat, 10 Jan 2009 01:51:23 +0000 (17:51 -0800)] 
auto import from //branches/cupcake/...@125939

15 years agoMerge commit 'remotes/korg/cupcake'
Jean-Baptiste Queru [Fri, 19 Dec 2008 16:31:54 +0000 (08:31 -0800)] 
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

15 years agoCode drop from //branches/cupcake/...@124589
The Android Open Source Project [Thu, 18 Dec 2008 02:05:43 +0000 (18:05 -0800)] 
Code drop from //branches/cupcake/...@124589

16 years agoFix typo. It's "picasa", not "picassa".
raphael [Tue, 28 Oct 2008 21:44:31 +0000 (14:44 -0700)] 
Fix typo. It's "picasa", not "picassa".

16 years agoInitial Contribution
The Android Open Source Project [Tue, 21 Oct 2008 14:00:00 +0000 (07:00 -0700)] 
Initial Contribution