119004 Commits

Author SHA1 Message Date
Baligh Uddin
8027100fdb am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'e9adafd1b95a7934bb813cb168e33a85a762a504':
  Import translations. DO NOT MERGE
2014-02-20 17:59:47 +00:00
Baligh Uddin
e69b7b3474 am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '46a02249d7bde3fb88cc5312f88dab6d1690e20e':
  Import translations. DO NOT MERGE
2014-02-20 17:59:45 +00:00
Baligh Uddin
554b43a066 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-02-20 17:59:40 +00:00
Baligh Uddin
aa20b27472 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-02-20 17:55:33 +00:00
Baligh Uddin
e9adafd1b9 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-02-20 17:55:23 +00:00
Baligh Uddin
46a02249d7 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-02-20 17:55:13 +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
55542ee644 am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev
* commit '3e6370425ea3ac4e5d89ce042512913062212ccc':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
2014-02-20 17:42:58 +00:00
Deepanshu Gupta
e92c8542a5 am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit '01825b7aa3c864426c78c08c2f6004a8362c2b47':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
2014-02-20 17:42:54 +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
Baligh Uddin
6fb89ba641 Import translations. DO NOT MERGE
Change-Id: I9accaa37043e730ad6ec4aa98901a48e0858b132
Auto-generated-cl: translation import
2014-02-19 22:16:02 -08:00
Baligh Uddin
dab7a9ed70 Import translations. DO NOT MERGE
Change-Id: I0c823200179a75e0444f6e86ecc6813a6e662fa0
Auto-generated-cl: translation import
2014-02-19 22:08:21 -08:00
Baligh Uddin
b3425a65aa Import translations. DO NOT MERGE
Change-Id: If9205c555286daf7dea68702d2da39752b59def4
Auto-generated-cl: translation import
2014-02-19 19:42:43 -08:00
Baligh Uddin
da799ef3a0 Import translations. DO NOT MERGE
Change-Id: I31e5b7b7aa453a0455fd31eca6a11520730a26a7
Auto-generated-cl: translation import
2014-02-19 18:54:52 -08:00
Baligh Uddin
69046bb06c Import translations. DO NOT MERGE
Change-Id: I3003f43c32943496e855ba2744a7492232dbd56b
Auto-generated-cl: translation import
2014-02-19 18:49:33 -08:00
Baligh Uddin
8807558c32 Import translations. DO NOT MERGE
Change-Id: I3300523019b91cffd6f36d02434c521ab7368f37
Auto-generated-cl: translation import
2014-02-19 18:45:30 -08:00
Scott Main
4c68c4ed46 am 24a8e1d0: am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs
* commit '24a8e1d0e9a32c571403bfc730ce18dd138a529c':
  update intent examples for maps bug: 12661490 bug: 12957723
2014-02-20 02:20:30 +00:00
Scott Main
24a8e1d0e9 am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs
* commit 'af87e19bdbf6b16240dcdbfd31fe4f33eca4e51d':
  update intent examples for maps bug: 12661490 bug: 12957723
2014-02-20 02:17:20 +00:00
Scott Main
af87e19bdb Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs 2014-02-20 02:14:40 +00:00
Scott Main
8ad4275640 update intent examples for maps
bug: 12661490
bug: 12957723

Change-Id: Ice25ef430901b155c00d59402c5f9f50dcb48390
2014-02-19 18:08:33 -08: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
Mike Lockwood
c62f918e0e UsbDeviceManager: Fix race condition entering USB accessory mode
When switching USB modes there are often spurious connect and disconnect events
that occur before reenumeration is complete.  There is currently a 1000ms timer
to "debounce" the disconnect events. But with some USB accessories, this timeout
is not long enough, which results in an endless cycle of attempts to enter
USB accessory mode when the phone is connected.

To fix this, we now wait up to 10 seconds for the host to successfully configure
the device when entering USB accessory mode before giving up.
This is separate from the existing debounce timer, so the behavior of the
USB state change broadcasts are not affected.

Bug: 12877769
Change-Id: I7aa61f8a618546d749a7ddfc97bf103029a73d03
2014-02-19 11:23:19 -08:00
John Spurlock
9dd87081e4 am 99873565: am ba231fca: Fix bad @links in PendingIntent.java
* commit '998735652d2449e3ccbac7686b71bf40dca06e94':
  Fix bad @links in PendingIntent.java
2014-02-19 13:47:52 +00:00
John Spurlock
998735652d am ba231fca: Fix bad @links in PendingIntent.java
* commit 'ba231fcabfdf8f8bd72dbb428b8d35ae14a1a14d':
  Fix bad @links in PendingIntent.java
2014-02-19 13:44:14 +00:00
John Spurlock
ba231fcabf Fix bad @links in PendingIntent.java
Change-Id: I0a0014e17907f5cf16c3536a99e41efa9dafc963
2014-02-18 13:19:57 -05:00
Narayan Kamath
92a09fbdeb am a14d9c31: Merge "Move Json{Reader,Writer} test to cts."
* commit 'a14d9c318a1d358902a76aff733303c5509bb5fc':
  Move Json{Reader,Writer} test to cts.
2014-02-17 10:23:56 -08:00
Narayan Kamath
a14d9c318a Merge "Move Json{Reader,Writer} test to cts." 2014-02-17 18:20:34 +00:00
Narayan Kamath
94ccb6bf95 Move Json{Reader,Writer} test to cts.
These tests aren't really run automatically (or perhaps
even manually) in their present location, and increasing
CTS coverage is never a bad thing.

Change-Id: I81cce1211021011dca551fde62e725e177ca4df0
2014-02-17 17:51:43 +00:00
Narayan Kamath
28879bbfe8 am be57fca4: Merge "Extended locales in AAPT / AssetManager."
* commit 'be57fca41a731217010d9f92554cf48708b06ecf':
  Extended locales in AAPT / AssetManager.
2014-02-17 03:03:49 -08:00
Narayan Kamath
183e5e038b am 49024bac: Merge "AssetManager support for 3 letter lang/country codes."
* commit '49024bacf63db39467e7f318c682ad771ec0de22':
  AssetManager support for 3 letter lang/country codes.
2014-02-17 03:03:46 -08:00
Narayan Kamath
be57fca41a Merge "Extended locales in AAPT / AssetManager." 2014-02-17 11:00:30 +00:00
Narayan Kamath
49024bacf6 Merge "AssetManager support for 3 letter lang/country codes." 2014-02-17 11:00:15 +00:00
Tim Murray
4870c813fe am 7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter."
* commit '7d1a6c5cac16795e5953d2b4d34671e34e907632':
  Fix destruction issues relating to AllocationAdapter.
2014-02-14 15:53:59 -08:00
Tim Murray
7d1a6c5cac Merge "Fix destruction issues relating to AllocationAdapter." 2014-02-14 23:50:08 +00:00
Tim Murray
6d63c84f44 Fix destruction issues relating to AllocationAdapter.
bug 12971201

Change-Id: I3d9f66f527a35837ac866a695bdcc41d908a2562
2014-02-14 15:48:03 -08:00
Ben Gruver
da37944785 am 509a243c: Merge "Check the return value of listFiles on the ifw directory"
* commit '509a243c2c5ebc9cc55324bd9a03a5b560d81cfb':
  Check the return value of listFiles on the ifw directory
2014-02-14 13:57:24 -08:00
Ben Gruver
509a243c2c Merge "Check the return value of listFiles on the ifw directory" 2014-02-14 21:15:50 +00:00
Ben Gruver
26c6b783d2 Check the return value of listFiles on the ifw directory
listFiles can return null if the directory doesn't exist

Bug: 10497143
Change-Id: Ie4cbdf18a259a9641669a4e6b9bf49b4879acc67
2014-02-14 13:07:11 -08:00
Tim Murray
b25a6936a1 am d7043f00: Merge "Add hidden minor version ID for support lib workarounds."
* commit 'd7043f0084237200b6aab5d101c8ab6d3ab495c6':
  Add hidden minor version ID for support lib workarounds.
2014-02-14 12:51:32 -08:00
Tim Murray
d7043f0084 Merge "Add hidden minor version ID for support lib workarounds." 2014-02-14 20:47:34 +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
Narayan Kamath
48620f1d1b AssetManager support for 3 letter lang/country codes.
- 3 letter codes are packed into the existing 32 bit locale
  field in ResTable_config
- We introduce new fields for script / variant information.

Note that we define a "match" between two ResTable_config
structures to be purely on the basis of their language &
country (disregarding the script and the variant). However,
configs with scripts and variants are considered to be more
specific than those without.

(cherry picked from commit 378c6775a62d9c461cde51f06c1b14bb014c78fd)

Change-Id: I7dce82a3fe2412834252723f458826ae41535a78
2014-02-14 14:08:23 +00:00
Narayan Kamath
3bec0fbb34 am fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class"
* commit 'fa8f95e9b96e3a12e98269c8a31ed34df6a323ca':
  AArch64: Use long for pointers in SurfaceSession class
2014-02-14 05:14:07 -08:00
Narayan Kamath
fa8f95e9b9 Merge "AArch64: Use long for pointers in SurfaceSession class" 2014-02-14 13:10:44 +00:00
Dianne Hackborn
01de243263 am 24d8fa73: Merge "frameworks/base: move idmap from frameworks/native"
* commit '24d8fa739b7ca0791174af260ed95cdc139e0903':
  frameworks/base: move idmap from frameworks/native
2014-02-13 17:50:53 -08:00
Wink Saville
ea56c795b0 am bbba8211: Merge "Telephony: Handle DATA_CALL_LIST in DCC."
* commit 'bbba8211f9eca938d5d482583fd6e047615b4334':
  Telephony: Handle DATA_CALL_LIST in DCC.
2014-02-13 17:50:51 -08:00
Dianne Hackborn
24d8fa739b Merge "frameworks/base: move idmap from frameworks/native" 2014-02-14 01:45:12 +00:00
Wink Saville
bbba8211f9 Merge "Telephony: Handle DATA_CALL_LIST in DCC." 2014-02-13 23:37:04 +00:00