1655 Commits

Author SHA1 Message Date
Narayan Kamath
6393875024 am c0232642: am 629daddd: Merge "Fix layoutlib build."
* commit 'c0232642b74517aa2717673f0811ba65c620f491':
  Fix layoutlib build.
2014-03-14 14:22:30 +00:00
Narayan Kamath
c73991bda0 Fix layoutlib build.
Was using private data structures from libcore.

Change-Id: I5bd43190081891659e18b5c871686e6078efcc81
2014-03-14 14:10:30 +00:00
Deepanshu Gupta
f978f16e50 resolved conflicts for merge of c76345a3 to klp-modular-dev-plus-aosp
Change-Id: Id0aae224e17651bc07aa3f5b1a06923603d025b8
2014-03-11 16:39:13 -07:00
Deepanshu Gupta
792f38ddd9 Merge "Fix the delegate method signatures in LayoutLib" 2014-03-11 21:22:40 +00:00
Narayan Kamath
8272c84cb5 am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."
* commit 'bbf826659e8e5d0be683b2459207c495303d53b6':
  LP64: Make 9 patches architecture agnostic.
2014-03-10 10:47:45 +00:00
Narayan Kamath
6381dd4ff2 LP64: Make 9 patches architecture agnostic.
The Res_png_9patch struct had several pointer members
whose size differed between 32 and 64 bit platforms.

These members have been replaced by uint32_t offsets
to serialized data. The serialized form for 9patches
places a Res_png_9patch object at the beginning of
serialized data, followed by int32_t arrays of xDivs,
yDivs and colors.

Note that these offsets are not strictly required,
since they can be computed from the values of numXDivs,
numYDivs & numColors, however they are called in tight
loops so having them computed once is a beneficial.

This change also removed the unused patch_equals function
from aapt's Image.cpp.

Change-Id: I3b9ac8ae5c05510d41377cae4dff1c69b40c2531
2014-03-10 10:00:02 +00:00
Tim Kilbourn
032305fbcf am b559b371: Merge "Dump leanback info in aapt dump badging." into klp-modular-dev
* commit 'b559b37150d24411f0b5ef102ced8d5acf858a0e':
  Dump leanback info in aapt dump badging.
2014-03-08 01:55:00 +00:00
Ying Wang
f5f4d93060 am 74bebf6f: Exclude the host aapt and aidl from PDK build.
* commit '74bebf6faed2d34814ffc3d46664330ea568f7b2':
  Exclude the host aapt and aidl from PDK build.
2014-03-08 01:54:52 +00:00
Tim Kilbourn
b559b37150 Merge "Dump leanback info in aapt dump badging." into klp-modular-dev 2014-03-08 00:55:48 +00:00
Tim Kilbourn
0a5a5d6996 Dump leanback info in aapt dump badging.
Leanback launcher activities are reported, including the banner.

Change-Id: Ifa496736ad3ba4239ec95e166768af895ff4dc53
2014-03-07 16:47:42 -08:00
Ying Wang
74bebf6fae Exclude the host aapt and aidl from PDK build.
Bug: 13028632
Change-Id: I0f774b19be77462d0fa271088a4a5a152729d13c
2014-03-07 15:56:14 -08:00
Deepanshu Gupta
0d7ebc51ff Fix the delegate method signatures in LayoutLib
Change-Id: I262c285c1047958afdb024724959d5afb3552802
2014-03-05 19:23:48 -08:00
David 'Digit' Turner
a05e752615 am 9c6f41e3: am be7b8f4f: Merge "aidl: Support building with updated host sysroot."
* commit '9c6f41e3eb2258d52480be04dd8916a10f8be8db':
  aidl: Support building with updated host sysroot.
2014-03-05 23:18:20 +00:00
David 'Digit' Turner
be7b8f4f4c Merge "aidl: Support building with updated host sysroot." 2014-03-05 23:10:45 +00:00
David 'Digit' Turner
ea6d2197ba aidl: Support building with updated host sysroot.
This patch fixes tools/aidl/Type.cpp to compile with
a more recent SDK host toolchain sysroot (that has not
been submitted yet).

The main issue is that the code uses ssize_t which is
defined in <sys/types.h>, but didn't include the header
directly.

Apparently, this no longer compiles when using the Ubuntu
10.04 libc6-dev headers (the current SDK toolchain is
based on Ubuntu 8.04), so perform an explicit include
to fix this.

NOTE: This doesn't break the Windows SDK build.

Change-Id: Idcacf8f8d1c606b39bf8aa75ab409aa0c2a3cd5a
2014-03-05 23:57:46 +01:00
Ying Wang
160c39d8a5 am 26026c62: am dd72b6e7: Merge "Fix indirect misuse of ."
* commit '26026c62788f508f9de0df608dd7043e7d1399f6':
  Fix indirect misuse of $(my-dir).
2014-03-01 17:30:34 +00:00
Ying Wang
f794d63425 Fix indirect misuse of $(my-dir).
Change-Id: I20a98a8e1378da3a53e6a6d599c8fc0100f7f87a
2014-02-28 18:04:37 -08:00
Xavier Ducrohet
ec84ada6e8 am 5e5602da: am 0c72b769: Merge "Update layoutlib method for SystemClock"
* commit '5e5602da5fa9cd2e1d135b2310af2a8352f65e8d':
  Update layoutlib method for SystemClock
2014-02-27 23:34:34 +00:00
Deepanshu Gupta
5ac6a9e9b7 Update layoutlib method for SystemClock
Update layoutlib to reflect changes from
http://android-review.googlesource.com/83061/

Change-Id: If7326f3af2a97271ad1465382944e1f078b965d8
2014-02-24 14:22:29 -08:00
Xavier Ducrohet
21c5c8e600 am 9edf7a11: am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev
* commit '9edf7a1159b528afa056e0d61ee4487ed310fe4c':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
2014-02-20 17:53:20 +00:00
Deepanshu Gupta
c139177b13 am 65521c3c: am ca4b9a77: am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit '65521c3cf169808cd02ce09a7344bc633d51c1fc':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
2014-02-20 17:53:17 +00:00
Xavier Ducrohet
9edf7a1159 am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev
* commit '2cb9147fc49e6474eaf30fd833e43df10e42b899':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
2014-02-20 17:49:32 +00:00
Deepanshu Gupta
65521c3cf1 am ca4b9a77: am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit 'ca4b9a77e7d20703287b33b203b2582bd43f7792':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
2014-02-20 17:49:27 +00:00
Xavier Ducrohet
2cb9147fc4 am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev
* commit '55542ee6449bd580f61bc005726b5c87773fbe25':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
2014-02-20 17:46:05 +00:00
Deepanshu Gupta
ca4b9a77e7 am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit 'e92c8542a5cf1160a1b701b9f176af64ba46d68d':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
2014-02-20 17:46:02 +00:00
Xavier Ducrohet
3e6370425e Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev 2014-02-20 17:41:08 +00:00
Deepanshu Gupta
01825b7aa3 Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
For these font families, text was always rendered as italic. This
changeset fixes the issue.

Bug: http://b.android.com/57221
Change-Id: Ic8a299bd1e555f5bb914cd3d2fe72917ec7f471a
(cherry picked from commit e327212adde1136807bbdf052e8cc3861f8a6aba)
2014-02-19 20:17:47 +00:00
Deepanshu Gupta
13aea18b34 Set default text style in layoutlib as NORMAL [DO NOT MERGE]
If a style doesn't specify text style (normal/bold/italic/bold-italic)
then default to normal instead of throwing an error.

Bug: http://b.android.com/61358
Change-Id: I0138c73807a5ff6e4d938a99ece3044333110aa1
(cherry picked from commit 0acfb16dcd95468fe032204f54618e86becfd1eb)
2014-02-19 20:17:00 +00:00
Narayan Kamath
8c1fc83445 am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager."
* commit '28879bbfe89dc4bf2067a7183975ecffb82f68e6':
  Extended locales in AAPT / AssetManager.
2014-02-17 11:06:38 +00:00
Narayan Kamath
788fa41482 Extended locales in AAPT / AssetManager.
Support 3 letter language codes, script codes &
variants. The bulk of the changes are related to
the implementation of command line filtering of
locales etc. The previous code assumed that the
value of each "axis" (locale, density, size etc.)
could be represented by a 4 byte type. This is
no longer the case.

This change introduces a new class, AaptLocaleValue
which holds a (normalized) locale parsed from a
directory name or a filter string. This class takes
responsibility for parsing locales as well as
writing them to ResTable_config structures, which is
their representation in the resource table.

This includes minor changes at the java / JNI level
for AssetManager. We now call locale.toLanguageTag()
to give the native layer a well formed BCP-47 tag.
I've removed some duplicated parsing code in
AssetManager.cpp and replaced them with functions on
ResTable_config. The native getLocales function has
been changed to return well formed BCP-47 locales as
well, so that the corresponding java function can use
Locale.forLanguageTag to construct a Locale object
out of it.

Finally, this change introduces default and copy
constructors for ResTable_config to prevent having
to memset() the associated memory to 0 on every
stack allocation.

(cherry-picked from commit 91447d88f2bdf9c2bf8d1a53570efef6172fba74)

Change-Id: I1b43086860661012f949fb8e5deb7df44519b854
2014-02-14 14:08:57 +00:00
Deepanshu Gupta
f7193bf897 am d9f9da39: am 56b86deb: am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement.
* commit 'd9f9da396b41f394991f676bc74dcfc59c7070a8':
  Improve text rendering and measurement.
2014-02-10 19:56:58 +00:00
Deepanshu Gupta
d9f9da396b am 56b86deb: am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement.
* commit '56b86debcfaf8f661011702d31854bb3804f5fe1':
  Improve text rendering and measurement.
2014-02-10 19:53:48 +00:00
Deepanshu Gupta
56b86debcf am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement.
* commit '1c91b1f7a2da5e5b1996217228399ef958c2be0c':
  Improve text rendering and measurement.
2014-02-10 19:50:58 +00:00
Deepanshu Gupta
45dbfcc781 Improve text rendering and measurement.
1. Fix a bug where baseline of the run was modified while rendering
resulting in crooked text in some cases.

2. Use GlyphVector.getLogicalBounds() for text measurement which is more
accurate than getVisualBounds().

3. This change also optimizes text rendering by not computing the advances
for individual glyphs when not needed.

Change-Id: I66792c4d8f50eaf29afa70bccca1e6c812a3fa28
2014-02-06 16:27:14 -08:00
Deepanshu Gupta
7bd287b70a am ea2ec77f: am 3adb34ee: am 9fcfbfe2: am 3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev
* commit 'ea2ec77f9538de2ea795d3e257f19e8cff659665':
  Add methods for Time_Delegate
2014-02-06 03:06:38 +00:00
Deepanshu Gupta
6a9cbd5a2d am a0023027: am 23de8dc2: am 28e049ef: am 0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev
* commit 'a0023027e5b7245e2cef304d96826a7ae1c361aa':
  Optimize layout rendering in layoutlib
2014-02-06 03:06:35 +00:00
Deepanshu Gupta
f9021e48be am bd762373: am 096e4359: am f2f108fe: am a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev
* commit 'bd762373964eb3cb71bdd79cbf82c27faa22699d':
  Add missing files to fix libphonenumber for layoutlib.
2014-02-06 03:06:32 +00:00
Deepanshu Gupta
1bcc286def am db0427a0: am 5800b19a: am 50b0ce4e: am fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev
* commit 'db0427a0ac986e0823e7bbe9b7c12a97aabe133e':
  Fix the measurement of text bounds.
2014-02-06 03:06:29 +00:00
Deepanshu Gupta
1bceb9823f am 650d30c5: am b156c019: am d5129e75: am 8a892279: Fix a bug in Nine Patch library.
* commit '650d30c5ec3c0b345651a56c45eb334fabf51b17':
  Fix a bug in Nine Patch library.
2014-02-06 03:06:26 +00:00
Deepanshu Gupta
ea2ec77f95 am 3adb34ee: am 9fcfbfe2: am 3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev
* commit '3adb34ee079504b5854d23bc7a38dafc0a985219':
  Add methods for Time_Delegate
2014-02-06 03:03:54 +00:00
Deepanshu Gupta
a0023027e5 am 23de8dc2: am 28e049ef: am 0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev
* commit '23de8dc2625d4aeb4dc9085c5865ed571f96261a':
  Optimize layout rendering in layoutlib
2014-02-06 03:03:50 +00:00
Deepanshu Gupta
bd76237396 am 096e4359: am f2f108fe: am a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev
* commit '096e43590381b218cec88adeac4261427c19e139':
  Add missing files to fix libphonenumber for layoutlib.
2014-02-06 03:03:45 +00:00
Deepanshu Gupta
db0427a0ac am 5800b19a: am 50b0ce4e: am fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev
* commit '5800b19a7a3422620cb28e2327a96bf824f5cc9c':
  Fix the measurement of text bounds.
2014-02-06 03:03:41 +00:00
Deepanshu Gupta
650d30c5ec am b156c019: am d5129e75: am 8a892279: Fix a bug in Nine Patch library.
* commit 'b156c0197d052dd4be71ad2b858acc01f50ad49f':
  Fix a bug in Nine Patch library.
2014-02-06 03:03:36 +00:00
Deepanshu Gupta
3adb34ee07 am 9fcfbfe2: am 3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev
* commit '9fcfbfe296d7033ee031171f61b3a33044abee42':
  Add methods for Time_Delegate
2014-02-06 02:59:51 +00:00
Deepanshu Gupta
23de8dc262 am 28e049ef: am 0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev
* commit '28e049ef73f5d9301a198ac53535442b697b7ef4':
  Optimize layout rendering in layoutlib
2014-02-06 02:59:48 +00:00
Deepanshu Gupta
096e435903 am f2f108fe: am a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev
* commit 'f2f108fe86337a429a0940f264761dbc27f817fe':
  Add missing files to fix libphonenumber for layoutlib.
2014-02-06 02:59:45 +00:00
Deepanshu Gupta
5800b19a7a am 50b0ce4e: am fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev
* commit '50b0ce4e8ed353ed841782aeb58963bc084f2e16':
  Fix the measurement of text bounds.
2014-02-06 02:59:41 +00:00
Deepanshu Gupta
b156c0197d am d5129e75: am 8a892279: Fix a bug in Nine Patch library.
* commit 'd5129e75968030620a1372e39fcfbc17fe584e17':
  Fix a bug in Nine Patch library.
2014-02-06 02:59:38 +00:00
Deepanshu Gupta
3bf38b4165 Merge "Add methods for Time_Delegate" into klp-dev 2014-02-06 02:06:02 +00:00