drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
119,712 Commits 1 Branch 0 Tags
Commit Graph

119712 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
749e6b9cf2 am 5da96060: (-s ours) am f887a67d: (-s ours) am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '5da96060e61c3076d0a5cbd87a3f17254414afeb':
  Import translations. DO NOT MERGE
 2014-02-20 18:06:24 +00:00
Baligh Uddin
bf2226ec7f am 8b297fb6: (-s ours) am 8027100f: (-s ours) am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '8b297fb6ef42650a1126287aa0b610aa9a503167':
  Import translations. DO NOT MERGE
 2014-02-20 18:06:21 +00:00
Baligh Uddin
699991c8a2 am 08394af2: (-s ours) am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '08394af265b02db7a76c4f4f4ae16b9d238e7580':
  Import translations. DO NOT MERGE
 2014-02-20 18:06:17 +00:00
Baligh Uddin
1af20cc576 am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '554b43a066b6a084dbb9b7dba014de4b12ba1175':
  Import translations. DO NOT MERGE
 2014-02-20 18:03:38 +00:00
Baligh Uddin
5da96060e6 am f887a67d: (-s ours) am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'f887a67dbd1fd22c16cadc58b8f23bfd4eeba4ef':
  Import translations. DO NOT MERGE
 2014-02-20 18:03:07 +00:00
Baligh Uddin
8b297fb6ef am 8027100f: (-s ours) am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '8027100fdb13c046838f9af12ef7bf2bc3ad511f':
  Import translations. DO NOT MERGE
 2014-02-20 18:03:05 +00:00
Baligh Uddin
08394af265 am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'e69b7b3474c356438fbd65e43438e72ebda0bacb':
  Import translations. DO NOT MERGE
 2014-02-20 18:03:02 +00:00
Baligh Uddin
f887a67dbd am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'aa20b27472552ebc812dfbb3cbe260115ee43db1':
  Import translations. DO NOT MERGE
 2014-02-20 17:59:50 +00:00
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
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
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
Justin Koh
a79ac472d7 am 744d3473: Merge "Add hardware feature describing a watch." into klp-modular-dev 
* commit '744d3473f8a0f9f95e3fdf83670faf6d1551839e':
  Add hardware feature describing a watch.
 2014-02-20 17:41:31 +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
Justin Koh
744d3473f8 Merge "Add hardware feature describing a watch." into klp-modular-dev 2014-02-20 17:38:03 +00:00
Narayan Kamath
c95ed62111 am fca204a4: am 05cebdc2: Merge "Fix several bad function definitions." 
* commit 'fca204a4b8771b800383c91465a48eb2cd8b3ba2':
  Fix several bad function definitions.
 2014-02-20 13:02:25 +00:00
Narayan Kamath
520a5673fb am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible" 
* commit 'b152473f46d8176e7eb2c55b54342a7a29c525cf':
  AArch64: Make AssetAtlasService 64-bit compatible
 2014-02-20 13:02:21 +00:00
Narayan Kamath
fca204a4b8 am 05cebdc2: Merge "Fix several bad function definitions." 
* commit '05cebdc2abd05b0dca351306cb039245d50c67ae':
  Fix several bad function definitions.
 2014-02-20 04:58:52 -08:00
Narayan Kamath
b152473f46 am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible" 
* commit '9fce8535851fc696997bd3c251d00e34179d6482':
  AArch64: Make AssetAtlasService 64-bit compatible
 2014-02-20 04:58:45 -08:00
Narayan Kamath
05cebdc2ab Merge "Fix several bad function definitions." 2014-02-20 12:55:27 +00:00
Narayan Kamath
9fce853585 Merge "AArch64: Make AssetAtlasService 64-bit compatible" 2014-02-20 12:55:20 +00:00
Narayan Kamath
047b938f71 Fix several bad function definitions. 
We claim these functions want jlong as input (8 bytes wide)
but the definitions use pointer types or jints
(4 bytes wide for 32 bit).

bug: 12890271

(cherry picked from 017546e65280a3389b6167f5fc3b5d1c3001154a)

Change-Id: Iede02be90e6a3c9a2db1fe04dcd0db99abe37097
 2014-02-20 12:52:16 +00:00
Ashok Bhat
4de3f481bc AArch64: Make AssetAtlasService 64-bit compatible 
Changes in this patch include

[x] Long(64-bit) is used to store native pointers in
    AssetAtlasService and related classes as they can be 64-bit.

[x] Some minor changes have been done to conform with
    standard JNI practice (e.g. use of jint instead of int
    in JNI function prototypes)

Change-Id: Ib4c77c134e3ad5b21732e20cde9a54a0b16bdab1
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
 2014-02-20 12:10:24 +00:00
Narayan Kamath
b1903653e4 am 128599e4: am 2b3c14bf: Merge "libandroidfw: fix build error for 64-bit" 
* commit '128599e4496bd7ceb9d70f4addde0eba65103709':
  libandroidfw: fix build error for 64-bit
 2014-02-20 11:57:19 +00:00
Narayan Kamath
128599e449 am 2b3c14bf: Merge "libandroidfw: fix build error for 64-bit" 
* commit '2b3c14bf75c71524a0fcbc3e9d1fdab9aa6c3473':
  libandroidfw: fix build error for 64-bit
 2014-02-20 03:53:36 -08:00
Narayan Kamath
2b3c14bf75 Merge "libandroidfw: fix build error for 64-bit" 2014-02-20 11:50:59 +00:00
Patrik Bannura
443dd9313f libandroidfw: fix build error for 64-bit 
Fixed casting int to pointer in logging code.
Previously ints where printed as pointers and
the %p format specifier was used for convenience
to get hex output. This change uses %x and also
gets rid of the casts.

Change-Id: Ia2539769d245f50c0f3884119f80682defe69d61
 2014-02-20 10:06:23 +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
72eff55b2c am d43ad2f3: am 4c68c4ed: am 24a8e1d0: am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs 
* commit 'd43ad2f35abcc647f7985abd09ed9de5899faf18':
  update intent examples for maps bug: 12661490 bug: 12957723
 2014-02-20 02:25:57 +00:00
Scott Main
d43ad2f35a am 4c68c4ed: am 24a8e1d0: am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs 
* commit '4c68c4ed463f7f83d05f86ed11046195829028ed':
  update intent examples for maps bug: 12661490 bug: 12957723
 2014-02-20 02:23:52 +00: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