122539 Commits

Author SHA1 Message Date
Deepanshu Gupta
70f5cc1d5b Add isPremultiplied option to Bitmap_Delegate in LayoutLib
Change-Id: I2398af48913682ec698389b695aa256204c8aa47
2014-01-27 10:31:05 -08:00
Narayan Kamath
f6ee5fa3e2 Fix build, fallout from change 451f6b981a2cd
Change-Id: Id85d06221eccbda786721a05f3f6d9d94c1cbb74
2014-01-27 10:31:05 -08:00
Michael Wright
ec4fdec76f Add support for supports-input element to aapt
Change-Id: Ie8c8c44f126383c351f2ebb9ae7c3694fb0a9b16
2014-01-27 10:31:05 -08:00
John Reck
859e19f97d libpng usage tweaks
Bug: 10447005

 Call png_set_interlace_handling explicitly instead of relying on
 implicit handling that logs warnings

 Include filename when printing warnings

Change-Id: Ia343427f5522dc8ab1010f8d7017e86f389caf99
2014-01-27 10:31:05 -08:00
Deepanshu Gupta
19acfb8e87 Fix text rendering
There are still some errors
1. Little vertical clippping for extra tall glyphs.
2. Breaking into scripts isn't perfect which results in incorrect layout
of text.

Change-Id: Ib7b008b4ab5e689038678825289199aeb4bd815b
2014-01-27 10:31:04 -08:00
Deepanshu Gupta
8930cb4f37 Fix layout rendering for RTL locales
This changeset adds the framework resources for RTL locales and mirrors
the layout if the application is RTL aware.
Use ICU to check the character orientation of the locale - right to left
or left to right. Set the layout direction on the top level layout
accordingly. Also, load the RTL resources for Nav Bar when the locale is
RTL.

Change-Id: Icbb57ee2ac7c6d8dfc34c2f04dce34d820b9b1ed
2014-01-27 10:31:04 -08:00
Chet Haase
7cce7bb5d8 Remove scenes from Resource.cpp
Part of the Transition API changes, except that the tools/ directory
got moved between klp and master, so re-making the same changes here.

Issue #10460684 KLP API Review: android.view.transition and android.animation

Change-Id: Icedca1dc689285b4b213f9376656b26f18c7f23e
2014-01-27 10:31:04 -08:00
Adam Lesinski
282e181b58 Revert "Move frameworks/base/tools/ to frameworks/tools/"
This reverts commit 9f6a119c8aa276432ece4fe2118bd8a3c9b1067e.
2014-01-27 10:31:04 -08:00
Narayan Kamath
7023df08f1 Revert "AArch64: Make graphics classes 64-bit compatible"
This reverts commit 18b4cbeedef21c1fa666a110a157bab66edff976.

Change-Id: I0c52983a3ab1ace3ff743de546a43eca28e5cb0e
2014-01-27 14:22:45 +00:00
Narayan Kamath
477d7d1be9 Revert "Follow up for change 18b4cbeedef21c1fa666a110a157b."
This reverts commit c5b281c981d7290e3615d105cf2e23afc32c304d.

Change-Id: Id36f463e73068e14bc8fac0a289180be078ffbf9
2014-01-27 14:21:22 +00:00
Narayan Kamath
c5b281c981 Follow up for change 18b4cbeedef21c1fa666a110a157b.
Fix a few functions that were not converted correctly.

Change-Id: Ieb6bd9ea90af595080f1248a1d5892c460228290
2014-01-27 13:36:57 +00:00
Ashok Bhat
18b4cbeede AArch64: Make graphics classes 64-bit compatible
This a merger of two commits submitted to AOSP by
the following authors:

ashok.bhat@arm.com, david.butcher@arm.coma
craig.barber@arm.com, kevin.petit@arm.com and
marcus.oakland@arm.com

Due to the very large number of internal conflicts, I
have chosen to cherry-pick this change instead
of letting it merge through AOSP because the merge
conflict resolution would be very hard to review.

Commit messages below:

================================================
AArch64: Make graphics classes 64-bit compatible

Changes in this patch include

[x] Long is used to store native pointers 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)

[x] AssetAtlasManager is not completely 64-bit compatible
    yet. Specifically mAtlasMap member has to be converted
    to hold native pointer using long. Added a TODO to
    AssetAtlasManager.java to indicate the change required.

Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>

==================================================================

AArch64: Use long for pointers in graphics/Camera

For storing pointers, long is used in
android/graphics/Camera class, as native
pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use of
jint instead of int in JNI function prototypes)

Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>

===================================================================

Change-Id: Ib3eab85ed97ea3e3c227617c20f8d213f17d4ba0
2014-01-27 13:28:16 +00:00
Narayan Kamath
4507ea9e3c resolved conflicts for merge of 1cd2834f to master 2014-01-27 12:12:07 +00:00
Narayan Kamath
1cd2834fde am 30e20ac5: am ebd43d46: am dff83e2b: am d5970e9c: Merge "AssetManager cookies should be int32_t and not void*."
* commit '30e20ac528731a778eec45506d1e57c8839b318a':
  AssetManager cookies should be int32_t and not void*.
2014-01-27 12:07:15 +00:00
Narayan Kamath
30e20ac528 am ebd43d46: am dff83e2b: am d5970e9c: Merge "AssetManager cookies should be int32_t and not void*."
* commit 'ebd43d46ebf53005ae60af59948f8ed634f9bafb':
  AssetManager cookies should be int32_t and not void*.
2014-01-27 12:04:30 +00:00
Narayan Kamath
ebd43d46eb am dff83e2b: am d5970e9c: Merge "AssetManager cookies should be int32_t and not void*."
* commit 'dff83e2b121b356a264e908f8a7d64584eab9b73':
  AssetManager cookies should be int32_t and not void*.
2014-01-27 04:01:15 -08:00
Narayan Kamath
dff83e2b12 am d5970e9c: Merge "AssetManager cookies should be int32_t and not void*."
* commit 'd5970e9ca34038051f694c7349fa5f3548ee9499':
  AssetManager cookies should be int32_t and not void*.
2014-01-27 03:58:32 -08:00
Narayan Kamath
d5970e9ca3 Merge "AssetManager cookies should be int32_t and not void*." 2014-01-27 11:56:03 +00:00
Narayan Kamath
745d4efc83 AssetManager cookies should be int32_t and not void*.
Cookies are really indices into vectors and arrays, so
they don't need to be void*. We choose int32_t instead
of size_t to allow their width to be well specified.

(cherry picked from commit ebfdd0f467e39c3af8d92cade78263935340acb7)
(cherry picked from commit a7fa2e592e2e579e5acdb903dba83fc074ebc215)
(cherry picked from commit a9d5701b034ed2d9771b3f0943e1add00741d7cd)

Change-Id: I2aed3db568b6fdc487bf99e2c5dd123206736fda
2014-01-27 11:20:24 +00:00
Narayan Kamath
a7fa2e592e AssetManager cookies are now int32_t, not void*.
This makes cookies on both the java & native side
4 byte signed integral values.

Change-Id: I6843d6c5ba7ff42dc454f20240844a158ae8e818
2014-01-27 11:11:48 +00:00
Wink Saville
5197d0740c am dafb2420: am d4b688cf: am d165f365: am 5d2d911a: am d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8."
* commit 'dafb2420a34a5b39aca6ddf993e86778edd76b5d':
  Telephony: Modify code to check that PUK code length is always 8.
2014-01-26 16:58:24 +00:00
Wink Saville
dafb2420a3 am d4b688cf: am d165f365: am 5d2d911a: am d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8."
* commit 'd4b688cf97736eb4c543149686ab851b9ea21161':
  Telephony: Modify code to check that PUK code length is always 8.
2014-01-26 16:55:49 +00:00
Wink Saville
d4b688cf97 am d165f365: am 5d2d911a: am d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8."
* commit 'd165f365b394b7632d8a0cfbc14bbf4004858333':
  Telephony: Modify code to check that PUK code length is always 8.
2014-01-26 16:52:26 +00:00
Wink Saville
d165f365b3 am 5d2d911a: am d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8."
* commit '5d2d911ad1f69392cf2a56237ce7ad3bb9e78ffa':
  Telephony: Modify code to check that PUK code length is always 8.
2014-01-26 08:49:09 -08:00
Wink Saville
5d2d911ad1 am d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8."
* commit 'd1eeb6747820f549ec724546a84e3860b4580587':
  Telephony: Modify code to check that PUK code length is always 8.
2014-01-26 08:43:28 -08:00
Wink Saville
d1eeb67478 Merge "Telephony: Modify code to check that PUK code length is always 8." 2014-01-25 21:51:34 +00:00
Craig Mautner
921f4f9264 am 38eda9c4: Remove unnecessary logging.
* commit '38eda9c42bf327f6f521c766ea716305e5f71c05':
  Remove unnecessary logging.
2014-01-25 01:30:58 +00:00
Craig Mautner
38eda9c42b Remove unnecessary logging.
Fixes bug 12593710.

Change-Id: I55c33bb4d6c9e17e810be7cc033e01fb9d2d6cf7
2014-01-24 17:26:52 -08:00
Dianne Hackborn
31d9989e75 Merge "Add app version codes to procstats." 2014-01-24 23:30:51 +00:00
Chris Craik
bb615a6ffb Clear root level reorder lists to prevent accessing stale DisplayLists
bug:12581401

Adds temporary logging which should log/crash earlier on incorrectly
reordering hierarchies.

Change-Id: Iee00940718c3cc868161e754aff93cd3b2747094
2014-01-24 15:01:40 -08:00
Narayan Kamath
8435cf0d8b Merge "Hide android.os.Parcel.obtain(int)." 2014-01-24 14:59:06 +00:00
Narayan Kamath
01664b3709 am 5d094b94: am aa43eb51: am 7866f2fc: am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetManager."
* commit '5d094b947b328d2631a0203c1527b0c7c20ce219':
  Remove unused field from AssetManager.
2014-01-24 09:52:55 +00:00
Narayan Kamath
5d094b947b am aa43eb51: am 7866f2fc: am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetManager."
* commit 'aa43eb518ce3c50c1b9a64fc526c8d1360d3789e':
  Remove unused field from AssetManager.
2014-01-24 09:48:36 +00:00
Narayan Kamath
aa43eb518c am 7866f2fc: am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetManager."
* commit '7866f2fcfa753154a492bfb3fb21061f6fcce709':
  Remove unused field from AssetManager.
2014-01-24 09:45:13 +00:00
Narayan Kamath
7866f2fcfa am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetManager."
* commit '8005b9af11ea366672d739769510240f931f3050':
  Remove unused field from AssetManager.
2014-01-24 01:42:08 -08:00
Narayan Kamath
8005b9af11 am 3c30eff6: Merge "Remove unused field from AssetManager."
* commit '3c30eff63fb33901df4e040ecce78f7755be588f':
  Remove unused field from AssetManager.
2014-01-24 01:39:47 -08:00
Narayan Kamath
3c30eff63f Merge "Remove unused field from AssetManager." 2014-01-24 09:27:48 +00:00
Dianne Hackborn
8472e6189c Add app version codes to procstats.
Now the per-package proc stats data is also per-app-version-code.

In addition to changing the data structure to have one more
SparseArray and passing a version code all over, this also required
improving how we reset the stats so that we can prune a multi-package
process record back to a single package.  Otherwise, as you install
updates to apps, the proc stats data would continue to explode as
the data for each of those app's processes got turned to a
multi-package due to tracking the old and new versions at the
same time.

This also bumps the checkin version code, since the package entries
also include a new field for the app version code.

Change-Id: I80de36addb0a75c7b08aef747c6f6c8012d01ee4
2014-01-23 18:00:11 -08:00
Selim Gurun
d3dac575aa Merge commit '2474ebe8' into manualmerge 2014-01-23 15:40:34 -08:00
Selim Gurun
632f160463 Merge commit '647c5160' into manualmerge 2014-01-23 15:07:53 -08:00
Selim Gurun
2474ebe879 am 0a33c4f9: am 6735020a: am d261243c: am a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView.""
* commit '0a33c4f9f54b59dac4e745e09db05990d53a1aba':
  Revert "Adding freeMemoryForTests static method to WebView."
2014-01-23 22:46:56 +00:00
Selim Gurun
0a33c4f9f5 am 6735020a: am d261243c: am a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView.""
* commit '6735020adbcc7028185ca536e2b2cb49ec7687fb':
  Revert "Adding freeMemoryForTests static method to WebView."
2014-01-23 22:42:00 +00:00
Selim Gurun
6735020adb am d261243c: am a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView.""
* commit 'd261243c146515184cb4caf2284c6764a045443a':
  Revert "Adding freeMemoryForTests static method to WebView."
2014-01-23 14:39:53 -08:00
Selim Gurun
d261243c14 am a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView.""
* commit 'a3106d1dbe5141a6df742262f4bbe8cf2c8ea915':
  Revert "Adding freeMemoryForTests static method to WebView."
2014-01-23 14:37:15 -08:00
Selim Gurun
a3106d1dbe Merge "Revert "Adding freeMemoryForTests static method to WebView."" 2014-01-23 22:26:33 +00:00
Selim Gurun
355ed4ac43 Revert "Adding freeMemoryForTests static method to WebView."
This reverts commit c6a2a6e20f7ddd5a903e9395f6c574c316960694.

Change-Id: If9e1b3420ee239ab3166850e853d5949821f99e1
2014-01-23 22:13:40 +00:00
Selim Gurun
647c5160a2 am b311739d: am d9c2e3d3: am 01607523: am f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView."
* commit 'b311739d6fd2fdc5a3607ad79a1547af8500cfae':
  Adding freeMemoryForTests static method to WebView.
2014-01-23 19:59:19 +00:00
Selim Gurun
b311739d6f am d9c2e3d3: am 01607523: am f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView."
* commit 'd9c2e3d30f7af615ae78848f6a7f52ed5c539d33':
  Adding freeMemoryForTests static method to WebView.
2014-01-23 19:54:15 +00:00
Selim Gurun
d9c2e3d30f am 01607523: am f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView."
* commit '016075239fc28704bb0e2b78a3c5540fde711eea':
  Adding freeMemoryForTests static method to WebView.
2014-01-23 11:51:22 -08:00
Selim Gurun
016075239f am f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView."
* commit 'f6d69ae0f9215e08137b010acb4076a30e3d28c6':
  Adding freeMemoryForTests static method to WebView.
2014-01-23 11:49:00 -08:00