git.saurik.com Git - android/aapt.git/log

Fix 1840639 to support overlays with zz_ZZ.
Everything but strings worked fine before but a new default string would generate a build error.

merge cupcake into donut

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

AI 144547: Fix change 144342 by making it active only during overlay processing.
BUG=1754390

Automated import of CL 144547

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

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

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

commit | commitdiff | tree

The Android Open Source Project [Thu, 5 Mar 2009 22:34:35 +0000 (14:34 -0800)]