1717 Commits

Author SHA1 Message Date
Alan Viverette
47dcb469db Manual merge of e4ccb864 from frameworks/base/tools to frameworks/tools
Change-Id: I4893e72caf3dfd68bd503fd8daeabc8550d770a2
2014-01-27 10:31:07 -08:00
Adam Lesinski
8ff15b4cad AAPT emits error for res with no 'default' product
Rather than ignoring resources that do not match the specified
product, we keep track of the ignored ones and make sure that
some variant of the resource that matches the product was processed.

bug:10860838
Change-Id: I7a35f37fda2c9561634f75323bd4cb2b9047e29b
2014-01-27 10:31:07 -08:00
John Reck
492d16434a Update layoutlib
Change-Id: Ifafe5a47fbef7ff0894e679d04d71942eb8d1237
2014-01-27 10:31:07 -08:00
Marco Nelissen
c363be85de Update fake powermanager to new interface
Change-Id: I6f14498d7002b4720293a1c77f4fbb66869c36fb
2014-01-27 10:31:07 -08:00
Jim Miller
29e7462118 resolved conflicts for merge of fb2e3c8d to master
Change-Id: I159b529adae04a33a965ec0d43fc9a47e82b6417
2014-01-27 10:31:06 -08:00
Adam Lesinski
94fc9124f5 resolved conflicts for merge of 0c923b7c to master
Change-Id: I4f314b48c7714706329509d931d2c53079f5e248
2014-01-27 10:31:06 -08:00
Adam Lesinski
a5018c900f resolved conflicts for merge of 5223a5ff to master
Change-Id: I6523e4b7df88f21fbe0ecd3ab8f493e5a9867305
2014-01-27 10:31:06 -08:00
Deepanshu Gupta
e98d2cb65c Fix ClassCastException when rendering ListView
Bug: b.android.com/59300
Change-Id: I1e73910cf42de1b02f11cc77f575af9492320a19
2014-01-27 10:31:06 -08:00
Kenny Root
8732bd893a Add new getOpPackageName for BridgeContext
Change-Id: Ib39b0bd2d1eb794ae4565e54251e4355fa139a14
2014-01-27 10:31:06 -08:00
Jonathan Dixon
6ee095ba7a Merge 'Preparation for deleting WebViewClassic'
Originally from I4d6773a88ea2932982278127a3c96d38be54ddf5

- file has move to a different git project in master, so manually
  re-applied the diff that landed in klp-dev

Change-Id: I813210bd6160ab71c7a4dff9c221db31d8cc305c
2014-01-27 10:31:05 -08:00
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
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
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
Adam Lesinski
09384303de Add support for multiple asset dirs (-A)
Bug: 12608034
Change-Id: I02c5a1a73b83498d799570428cca3dd914f8ac11
2014-01-23 12:43:42 -08:00
Deepanshu Gupta
35d56c0d67 Optimize layout rendering in layoutlib
The height of a layout should be zero if it is assigned a layout_weight.
This way, the layout is measured only once and prevents spurious errors.

Bug: https://code.google.com/p/android/issues/detail?id=58398
Change-Id: If49a7480e5eb82cb86780e00f2f5b65ee053fc2a
2014-01-20 17:02:37 -08:00
Deepanshu Gupta
58037a4404 Add missing files to fix libphonenumber for layoutlib.
Change-Id: I8102da6c1c4625e887293a8823770d199521c53f
2014-01-17 18:26:38 -08:00
Deepanshu Gupta
5ad7c183f3 Fix the measurement of text bounds.
Bug: 12366230
Change-Id: I203b678363dc7b688c744503ee10216baca658a9
2014-01-07 12:07:45 -08:00
Narayan Kamath
39d7630234 am 3da645f3: Merge "Don\'t pseudolocalize untranslatable strings."
* commit '3da645f307695949623d78f280ce12e932eb057c':
  Don't pseudolocalize untranslatable strings.
2013-12-18 05:00:02 -08:00
Narayan Kamath
3da645f307 Merge "Don't pseudolocalize untranslatable strings." 2013-12-18 12:46:41 +00:00
Narayan Kamath
336bf2fb49 am d21752df: Merge "Reimplement ZipFileRO in terms of libziparchive."
* commit 'd21752dff45c7d8856e63026cfddc303a302df14':
  Reimplement ZipFileRO in terms of libziparchive.
2013-12-11 03:45:58 -08:00
Narayan Kamath
d21752dff4 Merge "Reimplement ZipFileRO in terms of libziparchive." 2013-12-11 11:41:10 +00:00
Narayan Kamath
7e1b8ff3e1 Don't pseudolocalize untranslatable strings.
bug: https://code.google.com/p/android/issues/detail?id=63004
Change-Id: I8e47a53d887144dc867111e42313d0e113b83ea1
2013-12-10 13:37:32 +00:00
Narayan Kamath
afd31e0829 Reimplement ZipFileRO in terms of libziparchive.
This lets us share zip archive processing code with both
the runtime (Art, dalvik) and critical java code
(StrictJarFile).

This change also moves several utility methods to ZipUtils
and dedups code across several zip inflation methods.

One of the side effects of this change is that several
processing loops are now O(n) instead of O(n^2).

bug: 10193060

Change-Id: I3c7188496837a47246c4f342e45485a70fef3169
2013-12-09 16:23:16 +00:00
Xavier Ducrohet
1d3205f62a am b6f3708d: am 1044a1dc: Merge "Update delegate methods in layoutlib." into klp-dev
* commit 'b6f3708d330872232a6a57a1a5c0d2243fd7419e':
  Update delegate methods in layoutlib.
2013-11-26 17:58:26 -08:00
Deepanshu Gupta
24541255c3 Update delegate methods in layoutlib.
Change-Id: I1f0fc274b6a74dbcf0ed46175c4a2fa4c2dd9a63
2013-11-25 19:59:54 -08:00
The Android Open Source Project
dbccd44a63 Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD
Change-Id: I938755073e70602cc8f51ce9bd420fdcf870cecd
2013-11-22 11:18:57 -08:00
Deepanshu Gupta
bdfa8a1ae0 am 5a0fd1fd: am 9d5a9434: Merge "Update ICU_Delegate methods. DO NOT MERGE" into klp-dev
* commit '5a0fd1fd0fb5d734bf65d26e56e413dba2821b07':
  Update ICU_Delegate methods. DO NOT MERGE
2013-11-18 16:25:04 -08:00
Deepanshu Gupta
0baec410c2 Update ICU_Delegate methods. DO NOT MERGE
Bug: 11435966
Change-Id: Ib8ed2011fe62b2496795075b33b9ca7d5907b87a
2013-11-18 10:20:37 -08:00
Deepanshu Gupta
5b95025059 am ea04da7a: am 9570ed56: Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev
* commit 'ea04da7a183b526cdc79366822e4fc794d28cbd2':
  Add libphonenumber to layoutlib.jar. DO NOT MERGE
2013-11-18 10:15:44 -08:00
Deepanshu Gupta
f6ee080570 am 42453ede: am 599105a9: Merge "Fix NPE in layoutlib. DO NOT MERGE" into klp-dev
* commit '42453ede3335aa5f7007a5b36749e84df83a08d4':
  Fix NPE in layoutlib. DO NOT MERGE
2013-11-18 10:15:40 -08:00
Deepanshu Gupta
f7400aa1da am 6870d29c: am 78cfdf31: Update changed delegate method in Bitmap_Delegate. DO NOT MERGE
* commit '6870d29c340008919dcd9e547236b74301b3b9ef':
  Update changed delegate method in Bitmap_Delegate. DO NOT MERGE
2013-11-13 08:43:34 -08:00
Deepanshu Gupta
1f92d7fc0f Add libphonenumber to layoutlib.jar. DO NOT MERGE
Issue: http://b.android.com/59497
Change-Id: Ief11e602703b6041db66241f1699cc1de72e65a5
2013-11-13 18:15:51 +05:30
Deepanshu Gupta
d0581d271e Fix NPE in layoutlib. DO NOT MERGE
Change-Id: I36623304d83b344ea078044001577b8005a63c02
2013-11-13 18:15:51 +05:30
Deepanshu Gupta
78cfdf31b7 Update changed delegate method in Bitmap_Delegate. DO NOT MERGE
Issue: https://code.google.com/p/android/issues/detail?id=60167
Change-Id: I3e1d6b9d52ca899889ba758b0ea91bd742cf5005
2013-11-13 18:15:51 +05:30
Craig Mautner
bf581034f9 am 679ba4e8: am 6cd206b2: Merge "Relayout windows that handle their own config change." into klp-dev
* commit '679ba4e86e4fecb6dbfe48d6c49205c32f995a1c':
  Relayout windows that handle their own config change.
2013-11-12 16:00:54 -08:00
Craig Mautner
5d9f547720 Relayout windows that handle their own config change.
If a window claims to handle its own configuration change then we
won't destroy and recreate its window on a configuration change.
Normally that recreation triggers the first layout following
orientation change because mHaveFrame is false. Windows that handle
their own configuration changes never got a relayout pass following a
change in orientation.

This change passes the configuration changes that an application
handles into the AppWindowToken. If the app says it handles
orientation or screen size changes then a relayout will occur when the
configuration has changed.

Fixes bug 11647107.

Change-Id: Ie8d49fd050442ebbdcf0b805087894e3a2fc4be9
2013-11-12 14:02:52 -08:00
Deepanshu Gupta
35631bccd4 am 76b715e5: am e45d8b2d: Merge "Fix text size in Fake Action Bar" into klp-dev
* commit '76b715e556a110d4aa1fec0d4de195e18def8295':
  Fix text size in Fake Action Bar
2013-11-10 22:54:13 -08:00
Deepanshu Gupta
f4800bc3b1 Fix text size in Fake Action Bar
The density multiplier was being applied twice to the title text in
the fake action bar.

Bug: 11436018
Change-Id: Id74c11037cb43d01f6cd79126623c84edfc37aaf
2013-11-08 16:43:07 +05:30
Elliott Hughes
ed84dea928 am 8f592378: am 69920427: Merge "Fix a variety of small publicly-reported bugs."
* commit '8f592378a1ea7f31d57253dc202f42707ef4da36':
  Fix a variety of small publicly-reported bugs.
2013-10-29 13:35:04 -07:00
Elliott Hughes
8f592378a1 am 69920427: Merge "Fix a variety of small publicly-reported bugs."
* commit '69920427ea01421d34f3a7576bdd135527b20859':
  Fix a variety of small publicly-reported bugs.
2013-10-29 13:32:33 -07:00
Elliott Hughes
c367d48c55 Fix a variety of small publicly-reported bugs.
Possible NULL dereference in cmds/bootanimation/BootAnimation.cpp.
https://code.google.com/p/android/issues/detail?id=61556

Missing fclose in core/jni/android_os_Debug.cpp.
https://code.google.com/p/android/issues/detail?id=61546

Bad loop guards in core/jni/android_util_Process.cpp.
https://code.google.com/p/android/issues/detail?id=61557

Assignment to wrong variable in libs/androidfw/AssetManager.cpp.
https://code.google.com/p/android/issues/detail?id=61560

Missing delete[]s in libs/androidfw/ObbFile.cpp.
https://code.google.com/p/android/issues/detail?id=61549

Leaks on error in tools/aapt/Images.cpp.
https://code.google.com/p/android/issues/detail?id=61552

Two missing fclose calls in tools/aapt/Resource.cpp.
https://code.google.com/p/android/issues/detail?id=61553

Missing fclose in tools/aidl/aidl.cpp.
https://code.google.com/p/android/issues/detail?id=61554

Change-Id: I5820f3824e72d07a9acb776cf0af3e7443f5694a
2013-10-29 13:12:55 -07:00
Marco Nelissen
a22010ebe5 am d19385bf: am 21657181: Merge "Add a method to set a list of uids for a wake lock" into klp-dev
* commit 'd19385bf58225069c8ea0a7ce5075ed28861b039':
  Add a method to set a list of uids for a wake lock
2013-10-25 15:01:34 -07:00
Marco Nelissen
738ffdc9da Add a method to set a list of uids for a wake lock
Cherrypicked from master.

b/9464621

Change-Id: Ia6a9d36d55129ae87d3ec070fbf10dc02f4b6cb4
2013-10-25 12:49:55 -07:00