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

123982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
bcb433b43a am b1903653: am 128599e4: am 2b3c14bf: Merge "libandroidfw: fix build error for 64-bit" 
* commit 'b1903653e4177a9394d7c30e3834fc8469485325':
  libandroidfw: fix build error for 64-bit
 2014-02-20 11:59:46 +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
Narayan Kamath
a1226a7a8a Make LruCache.resize(int) public 
bug: https://code.google.com/p/android/issues/detail?id=65062
bug: https://code.google.com/p/android/issues/detail?id=35349
Change-Id: Ia271bc45ba2b4c0f81b61b6147be5530ee2dfd67
 2014-02-20 10:27:55 +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
Guang Zhu
c4f6c351e1 Merge "use min app launch time in AppLaunch perf test" 2014-02-20 03:17:23 +00:00
Michael Wright
d2c3adc9c9 Make deliverInputEvent tracing asynchronous 
Change-Id: I640ed4003194d6d4b202680e5c8fffc81749d60f
 2014-02-19 19:11:21 -08:00
Guang Zhu
2861a89bed use min app launch time in AppLaunch perf test 
Change-Id: Id3a5872ff29fba5daeff058f0842fd011e50a0a1
 2014-02-19 18:59:00 -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
John Reck
a13a69f0e5 Merge "Fix layer recycling for GLRenderer" 2014-02-20 02:37:40 +00:00
John Reck
0b2c8df7a6 Fix layer recycling for GLRenderer 
Bug: 13007905

Change-Id: I1589f2bb14429099e391c03d7dfb1650da145f28
 2014-02-19 18:31:08 -08:00
Scott Main
5ef8d14d38 am 72eff55b: am d43ad2f3: am 4c68c4ed: am 24a8e1d0: am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs 
* commit '72eff55b2c54446bda219d0b32c7355b0ccf83a0':
  update intent examples for maps bug: 12661490 bug: 12957723
 2014-02-20 02:29:08 +00: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
RoboErik
5f105a1efb Another javadoc fix 
Change-Id: I7a569a1583f87153f68d492a7500ffceac2ed3ae
 2014-02-19 17:33:14 -08:00
RoboErik
9524ed59a4 Fix build (bad javadoc reference) 
Change-Id: Ifddab9f61fda81858ab429bbd2ec9d0821577c23
 2014-02-19 17:07:18 -08:00
RoboErik
c4ef836104 Merge "Initial commit for MediaSession test app" 2014-02-20 01:01:49 +00:00
Dan Stoza
b88a904dfe Merge "Allow disabling layer rotation during screenshots" 2014-02-20 00:56:33 +00:00
Alan Viverette
498aa8bb3c Merge "Always redraw background display list when view is redrawn" 2014-02-20 00:47:40 +00:00
Alan Viverette
81547effac Always redraw background display list when view is redrawn 
BUG: 12974357
Change-Id: I358351257e8b099a681e93be8f64e396fdfd6720
 2014-02-19 16:31:03 -08:00
RoboErik
3328868544 Merge "Initial round of MediaSession APIs" 2014-02-20 00:25:10 +00:00
Alan Viverette
ff699570f6 Check item type before re-binding transient state views 
BUG: 12701797
Change-Id: I180613cc342d24b63f80fd699937c7543c38fc20
 2014-02-19 15:25:10 -08:00
Alan Viverette
621e1e8493 Merge "Fix for reveal animated drawables" 2014-02-19 22:41:56 +00:00
Alan Viverette
7f610fed10 Fix for reveal animated drawables 
Includes fixes for RevealDrawable clipping, touch feedback constant
state, and action bar background display lists.

BUG: 13065159
Change-Id: Ie4bf03f59da69047e18a8fe9233c3d24b0160576
 2014-02-19 14:40:12 -08:00
Baligh Uddin
39ac60f998 Merge "Import translations. DO NOT MERGE" 2014-02-19 22:14:31 +00:00
Baligh Uddin
992d0b889f Merge "Import translations. DO NOT MERGE" 2014-02-19 22:14:17 +00:00
RoboErik
bfa153b64b Initial commit for MediaSession test app 
This app creates a service and UI in separate processes and uses
the new MediaSession APIs. This is still a rough work in progress.

Change-Id: I9692c95bf2fdbee7255da86dff59044c893e3a1f
 2014-02-19 13:41:38 -08:00
RoboErik
01fe661ae5 Initial round of MediaSession APIs 
This is far from complete but puts the basic components in place
for an app to interact with media sessions.

Change-Id: Icfe313f90ad76ae56badbe42b0e43fc5f68db36f
 2014-02-19 13:41:37 -08:00
Patrick Tjin
a1cd90bc8f Merge "Modify unexpected mtu debug message to print mtu" 2014-02-19 21:21:19 +00:00
Patrick Tjin
a45610fc1f Modify unexpected mtu debug message to print mtu 
Change-Id: Iacc78582c5e3d6b156e8e2eda25e89e0e5be6eda
 2014-02-19 12:53:04 -08:00
Adam Lesinski
9baacf02dc Merge "Fix build due to change in SystemServiceManager" 2014-02-19 20:31:41 +00:00
Adam Lesinski
f542a33c8d Fix build due to change in SystemServiceManager 
Change-Id: I0fabb98b7b84e5c721757d20df4eac501ca21cc0
 2014-02-19 12:29:58 -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