Merge commit '1ddc0077ac0c26a9dc74875791bfea3f34a8cc7b' into eclair-mr2-plus-aosp
* commit '1ddc0077ac0c26a9dc74875791bfea3f34a8cc7b':
Minor fix for the parent style computation in the layoutlib.
Merge commit '19e420c52dbe42e5b4b8b3580a5e7908cebec89d' into eclair-plus-aosp
* commit '19e420c52dbe42e5b4b8b3580a5e7908cebec89d':
Minor fix for the parent style computation in the layoutlib.
Merge commit 'eac4222f7f30bf1df14b223cf62e594914dd32d4'
* commit 'eac4222f7f30bf1df14b223cf62e594914dd32d4':
Add a way for wallpapers to know the delta between virtual screens.
Merge commit '949ffa3da5231772425c3bde50caeab6c4d08ec5' into eclair-mr2-plus-aosp
* commit '949ffa3da5231772425c3bde50caeab6c4d08ec5':
Add a way for wallpapers to know the delta between virtual screens.
Merge commit '11cff8cd30f03b5adb137e985532543da5e960c4' into eclair-plus-aosp
* commit '11cff8cd30f03b5adb137e985532543da5e960c4':
Add a way for wallpapers to know the delta between virtual screens.
Merge commit 'aa10b9fb52db88e3cc9045019f42fa83e9da9868' into eclair-mr2-plus-aosp
* commit 'aa10b9fb52db88e3cc9045019f42fa83e9da9868':
Support for fallback fonts in layoutlib.
Merge commit 'e6ab011b8b8aa6c461e64cabb9b25d890d68edb1' into eclair-plus-aosp
* commit 'e6ab011b8b8aa6c461e64cabb9b25d890d68edb1':
Support for fallback fonts in layoutlib.
Merge commit '8e59b032c34b1b9fe42235ce59c5daaba59ee30c'
* commit '8e59b032c34b1b9fe42235ce59c5daaba59ee30c':
Fix layoutlib tests so they pas when run from Eclipse workbench.
Merge commit '4899daa0c8e747cd3c0ecf1c6ceeec022f6c7524' into eclair-mr2-plus-aosp
* commit '4899daa0c8e747cd3c0ecf1c6ceeec022f6c7524':
Fix layoutlib tests so they pas when run from Eclipse workbench.
Merge commit 'c54e0ce964f4d38089def7ecee850a659f84bbe5' into eclair-plus-aosp
* commit 'c54e0ce964f4d38089def7ecee850a659f84bbe5':
Fix layoutlib tests so they pas when run from Eclipse workbench.
Merge commit 'c6bead14fe6fe70bcfd8802ee9f0259476a074ce' into eclair-mr2-plus-aosp
* commit 'c6bead14fe6fe70bcfd8802ee9f0259476a074ce':
Implement feature #2117336: Create event communication APIs for live wallpaper
Merge commit '7580493b014a2c7ea883cd291255798dc72ebbff' into eclair-plus-aosp
* commit '7580493b014a2c7ea883cd291255798dc72ebbff':
Implement feature #2117336: Create event communication APIs for live wallpaper
Merge commit '617262d8f57362536ddc00a070c1c0994741de44' into eclair-plus-aosp
* commit '617262d8f57362536ddc00a070c1c0994741de44':
add "junk path" -k option to aapt (DO NOT MERGE)
Adds a "junk path" option to aapt so that you can do:
aapt add -k archive.zip path/to/some.file
and have the file stored in the zip under the name "some.file"
(without the path). Needed so that we can use 'aapt add' in place of
'zip -j' when building jar files, which will lead to smaller
incremental OTAs.
(This is a cherry-pick of a change already submitted to eclair-mr2;
the change was approved for mr1.)
Adds a "junk path" option to aapt so that you can do:
aapt add -k archive.zip path/to/some.file
and have the file stored in the zip under the name "some.file"
(without the path). Needed so that we can use 'aapt add' in place of
'zip -j' when building jar files, which will lead to smaller
incremental OTAs.
Merge commit '66ce0f07fcb79b97dc52aa0a1c5fce1565f4f090'
* commit '66ce0f07fcb79b97dc52aa0a1c5fce1565f4f090':
Add a test to make sure the replaced classes in layoutlib are correct.
Merge commit '3557d5bc9eb8ac33641430ca52d8e2121d0f1a4b'
* commit '3557d5bc9eb8ac33641430ca52d8e2121d0f1a4b':
Reimplement all the method of Paint for layoutlib
Merge commit '636d9cd63b77a87e6cb627a90cc8f37e81bedb14'
* commit '636d9cd63b77a87e6cb627a90cc8f37e81bedb14':
Fix the layoutlib test to run from adt-tests.
Merge commit '0a9d46b7e741ccf7272bb69a4eef3c1f2adc91b7' into eclair-plus-aosp
* commit '0a9d46b7e741ccf7272bb69a4eef3c1f2adc91b7':
Add a test to make sure the replaced classes in layoutlib are correct.
Merge commit '841a8eea78479ad8a3c10e69a788adbeaef5a53d' into eclair-plus-aosp
* commit '841a8eea78479ad8a3c10e69a788adbeaef5a53d':
Reimplement all the method of Paint for layoutlib
Merge commit 'a970bf52581667e88d82e0801e0774d7c9cdcb8f' into eclair-plus-aosp
* commit 'a970bf52581667e88d82e0801e0774d7c9cdcb8f':
Fix the layoutlib test to run from adt-tests.
Merge commit '71060f29855745893c122e8b93cf7a723186931b' into eclair-plus-aosp
* commit '71060f29855745893c122e8b93cf7a723186931b':
Refactor class/method names used by layoutlib_create.
Merge commit 'c7bade2a910d3fd34275440d1cc8bb9c0c9a989a' into eclair-mr2-plus-aosp
* commit 'c7bade2a910d3fd34275440d1cc8bb9c0c9a989a':
Add a test to make sure the replaced classes in layoutlib are correct.
- Move test files to their own package for easy binary inclusion
in adt-test
- fix some tests and remove obsolete ones.
Change-Id: I5b967f29074fdad74073f9b37d903eabe8dc29e6
Merge commit '9cf2bbb08c0eb66bcfa45a03d4b21cac78be8e99' into eclair-mr2-plus-aosp
* commit '9cf2bbb08c0eb66bcfa45a03d4b21cac78be8e99':
Reimplement all the method of Paint for layoutlib
