1508 Commits

Author SHA1 Message Date
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
Mike Lockwood
9f6a119c8a Move frameworks/base/tools/ to frameworks/tools/
Change-Id: I3ffafdab27cc4aca256c3a5806b630795b75d5c8
2013-08-28 09:44:17 -07:00
Ying Wang
6af62e1165 am 62f16fe9: am d3373c29: Merge "Better aidl generated dependency" into klp-dev
* commit '62f16fe93deaa451d2bfc2d3409cf6e655513ca3':
  Better aidl generated dependency
2013-08-26 15:11:38 -07:00
Jeff Sharkey
98e154c039 am d0fcacd9: am 98d62123: Merge "Add CancellationSignal support to file operations." into klp-dev
* commit 'd0fcacd949cd8b42b37d238a4ba74e3c29325277':
  Add CancellationSignal support to file operations.
2013-08-26 15:11:01 -07:00
Ying Wang
d3373c292a Merge "Better aidl generated dependency" into klp-dev 2013-08-26 19:18:35 +00:00
Ying Wang
0f91c63602 Better aidl generated dependency
Previously if an imported aidl file has been deleted or moved,
the generated dependency file still contains the stale file name,
and make will fail with "No rule to make target <the deleted/moved
file>".
This change uses technique described in section "Automatic Dependency
Generation", Chapter 8 of "Managing Projects with GNU Make (3d
Edition)".
The same technique is used by the Android platform build system to
generate C/C++ header dependencies.

Bug: 10459179
Change-Id: Ib0c01a4234ef1af994487fdc846cdf8d13a675f6
2013-08-23 17:19:17 -07:00
Jeff Sharkey
98d6212327 Merge "Add CancellationSignal support to file operations." into klp-dev 2013-08-23 23:17:47 +00:00
Jeff Sharkey
bd3b902567 Add CancellationSignal support to file operations.
Since ContentProvider file operations can end up doing substantial
network I/O before returning the file, allow clients to cancel their
file requests with CancellationSignal.

Ideally this would only be needed for openFile(), but ContentResolver
heavily relies on openAssetFile() and openTypedAssetFile() for common
cases.

Also improve documentation to mention reliable ParcelFileDescriptors
and encourage developers to move away from "rw" combination modes,
since they restrict provider flexibility.  Mention more about places
where pipes or socket pairs could be returned.

Improve DocumentsContract documentation.

Bug: 10329944
Change-Id: I49b2825ea433eb051624c4da3b77612fe3ffc99c
2013-08-23 11:27:25 -07:00
satok
9e10408797 DO NOT MERGE. Fix test breakage
Change-Id: I0b2b7ce4b9f50910b4795cb480aa86a662b16f7d
2013-08-23 20:08:15 +09:00
satok
af71b1a342 Merge "Fix test breakage" 2013-08-23 11:07:21 +00:00
satok
85cac210dd Fix test breakage
Change-Id: I0b2b7ce4b9f50910b4795cb480aa86a662b16f7d
2013-08-23 19:59:50 +09:00
Maurice Chu
0c1edf4f6a Merge "Modify 'aapt dump badging' to output <meta-data> tags" 2013-08-22 15:55:24 +00:00
Maurice Chu
681c4f45bf Modify 'aapt dump badging' to output <meta-data> tags
This enables output of <meta-data> tags within the <application>
element of the AndroidManifest.xml if the --include-meta-data
command line option is invoked.  For example, by

  aapt dump --include-meta-data badging Foo.apk

Bug: 10257318
Change-Id: I88da1a14ab21146b64ac947e0eeb1107816acd4d
2013-08-21 18:06:50 -07:00
Chris Craik
ed2515e853 am 908d9bfa: am dc70afae: Merge "Add inPremutiplied option to BitmapFactory.Options, functionality in Bitmap" into klp-dev
* commit '908d9bfafd576755d06f0566fc4cac3831476f63':
  Add inPremutiplied option to BitmapFactory.Options, functionality in Bitmap
2013-08-21 10:26:23 -07:00
Chris Craik
1abf5d6242 Add inPremutiplied option to BitmapFactory.Options, functionality in Bitmap
bug:2248948

Change-Id: I8fdd649332667598504a1076d5a447572bd53086
2013-08-20 18:29:33 -07:00
John Reck
6c16fff219 Fixes for libpng 1.6
png_set_filler() now fails if the color type doesn't support
 a filler (such as RGB_ALPHA)
 png_set_unknown_chunk location bug was fixed and now enforces
 proper location setting

Change-Id: If3834e3744d9618c308cc442e66d85e9cffcea38
2013-08-14 14:15:06 -07:00
John Reck
48b15b1e1d Fix libpng API usage
Remove usage of deprecated APIs no longer in 1.6

Change-Id: I04cbceba718533312e900e62ddcf3872b61765ec
2013-08-13 13:29:15 -07:00
Jeff Sharkey
c2f8da8756 Merge "Bring along BridgeContext for the ride." into klp-dev 2013-08-12 02:09:51 +00:00
Jeff Sharkey
b9be11c370 Bring along BridgeContext for the ride.
Change-Id: Ic11c0df447c82be3922d529f18a290cfdfec6b05
2013-08-11 19:08:39 -07:00
Jonathan Dixon
667fe1039f Refactor Canvas.drawPicture() to delegate to Picture
Bug: 9814370

To allow WebView.capturePicture() to return a subclass, we need to
ensure the subclass is always consulted when being drawn into a canvas.

Change-Id: Ia0357f95b6fafb3ac81e6bcfaef05739e619897a
2013-08-08 17:22:48 -07:00
Satoshi Kataoka
b3c21ac7c6 Reduce the transaction fee of getEnabledInputMethodSubtypeList
Bug: 8467480
Change-Id: If18cce8fbe567df51f29adcdcedff3f743460b8b
2013-08-08 11:32:31 +09:00
Wink Saville
f2c89b9ed6 am 9516ed45: am cfc23ac6: Merge "Add support for MNC=00"
* commit '9516ed4598948eea5623c57e443bce08c1f48ab6':
  Add support for MNC=00
2013-07-30 12:28:05 -07:00
Wink Saville
9516ed4598 am cfc23ac6: Merge "Add support for MNC=00"
* commit 'cfc23ac688be9de1ecd2e659455ea1ebcceb63dc':
  Add support for MNC=00
2013-07-30 12:24:39 -07:00
Mattias Petersson
1d766b5321 Add support for MNC=00
This adds support for operators with MNC (Mobile Network Code) zero
to add customized resources. For example, it makes it possible to
add a folder called "/res/values-mnc00/" in an application. This will
cause resources in that folder to be used when MNC is zero.
(There is a total of 14 countries that have an operator with MNC
zero.)

Without this fix, the resource framework gets confused, because MNC 0
is normally used when the MNC is undefined (not set).

Bug: 7170488
Change-Id: Icfd39fd0c739216e89446252ea0e7ceba6f002c6
2013-07-26 18:42:34 +00:00
Kenny Root
ba23a6677e Exclude magic inner-class name from preload
Add a magic subclass name that will exclude inner classes that are meant
to prevent object instatiation but allow class preloading. This will
allow classes that have undesired side-effects to delay initialization
until the side-effects are no longer disruptive.

Bug: 9984058
Change-Id: I46b0784760d84a2a2da1f9f41d87ee7f70a3fc16
2013-07-23 22:37:37 -07:00
Craig Mautner
acb837fe63 Merge "Fix home activity and user switch interactions." 2013-07-19 23:07:51 +00:00
Craig Mautner
ac6f843c91 Fix home activity and user switch interactions.
- Make sure Home activity goes in the correct task and on the correct
stack.
- Do not allow different users to be in the same task.
- Do not set stacks aside for each user.

Fixes bug 9775492.

Change-Id: I0e7954e917aac8482a1015a36923e02914e2b692
2013-07-19 16:05:59 -07:00
Deepanshu Gupta
903709d738 am 388f85eb: am a2f41b23: am bf8be2ee: Merge "Add orientation to configuration for layoutlib." into jb-mr2-dev
* commit '388f85eb451bd0b61c8f48b500de5db6bca941f1':
  Add orientation to configuration for layoutlib.
2013-07-19 13:42:34 -07:00
Deepanshu Gupta
388f85eb45 am a2f41b23: am bf8be2ee: Merge "Add orientation to configuration for layoutlib." into jb-mr2-dev
* commit 'a2f41b23b6328b0ff3bb04d4a88ccf4a84a50375':
  Add orientation to configuration for layoutlib.
2013-07-19 13:37:32 -07:00
Jeff Brown
b9ff71375a Fix build.
Change-Id: Ie83f51ab4b8fddceda8d4f0ac24c532eab7458b8
2013-07-18 16:37:44 -07:00
Deepanshu Gupta
d97d60c0fa Add orientation to configuration for layoutlib.
Update the configuration with the device orientation before rendering.

Change-Id: Icd40901204fd13f90b18353e53a15e25e5b2176c
2013-07-12 15:54:08 -07:00
Jeff Brown
9d3b1a424c Move input library code to frameworks/native.
No longer compile libandroidfw as a static library on the device
since it already exists as a shared library.  Keeping the static
library would force us to provide a static library version of
libinput for the device as well which doesn't make sense.

Change-Id: I3517881b87b47dcc209d80dbd0ac6b5cf29a766f
2013-07-01 20:11:42 -07:00
Stephen Hines
5675b97f65 Switch to shared libpng/libz dependency.
Bug: 9593270
Change-Id: I1eec2590cca046d6e030c73d31a6b400019e1ebd
2013-06-26 17:27:35 -07:00
Craig Mautner
144a6ae7e6 Fix build.
Change-Id: Icdfc6bcbe8603cf9bd3f8982a595336c0407e7d6
2013-06-24 12:25:57 -07:00
John Spurlock
80f00c1f23 Remove concept of system bar from window manager.
It was already hardcoded to false, this change removes the dead code.

Change-Id: I5e543344e60f69cb9882a70ba29f7c09404ad9fc
2013-06-14 13:20:17 -04:00
Adam Powell
04fe6ebb9f Fix a bug resolving the correct icon/logo in action bars
Remove some abstraction-breaking magic in ActionBarView and replace it
with proper resolution of the icon/logo when creating a window. The
old implementation relied on the ActionBarView's context being an
Activity.

Bug 9171554

Change-Id: Idbbb1942622195dcb55e8119f2d64287b07bb509
2013-05-31 15:00:24 -07:00