1484 Commits

Author SHA1 Message Date
Chet Haase
d82c8ac4db Transition API changes from API council recommendations
Issue #10460684 KLP API Review: android.view.transition and android.animation
Issue #10570740 Transitions: inflate transition targets from xml

Change-Id: I7a3f6d3aece2fcafc5efd555d033f79e86635c98
2013-09-04 14:46:38 -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
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
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
Deepanshu Gupta
3d05476b10 am fc691f9d: am 417e512b: Merge "Add missing native methods." into jb-mr2-dev
* commit 'fc691f9df0392a661c4d1708c905f82d50c17f27':
  Add missing native methods.
2013-05-24 13:56:05 -07:00
Deepanshu Gupta
fc691f9df0 am 417e512b: Merge "Add missing native methods." into jb-mr2-dev
* commit '417e512ba1d099583c41bd7595f2124ca77c2aee':
  Add missing native methods.
2013-05-24 13:53:44 -07:00
Deepanshu Gupta
279c00e8e0 Add missing native methods.
Change-Id: I7b34e2ec0164520efc658053a80f307791a992b1
2013-05-23 16:44:01 -07:00
Dianne Hackborn
19849d3c9a Fix build.
Change-Id: I3dc503a3cd30276ac10582db44732d96b68230ee
2013-05-21 10:47:17 -07:00
Dima Zavin
3b9831f6a2 Merge "aapt: move qsort_r_compat here as it is sole client" 2013-05-08 07:35:34 +00:00
Mathias Agopian
60e510af80 desperate attempt to fix linux build.
working on the assumption that the ordering in
LOCAL_STATIC_LIBRARIES matters.

Change-Id: Ibf5b706652049b195bd66c84c9a5fa1122454ca6
2013-05-07 19:52:05 -07:00
Mathias Agopian
1f5762e646 libutils clean-up
Change-Id: I11ee943da23a66828455a9770fc3c5ceb4bbcaa9
2013-05-07 17:09:46 -07:00
Dima Zavin
823abb6314 aapt: move qsort_r_compat here as it is sole client
This code is only used on the host for MacOS X compatibility.
Apparently, glibc and Apple's libc disagree on the parameter
ordering.

Change-Id: I214edcf2870b6ac88316306ac5af43f1dadf9b2e
Signed-off-by: Dima Zavin <dima@android.com>
2013-05-07 16:19:41 -07:00
Jeff Sharkey
f1301d86fb Merge commit 'b3f66877' into afdmerge
Change-Id: I319863cf23b2e6eacfa4508f7b111fba7b1cbc24
2013-04-29 15:29:13 -07:00
Christopher Tate
2167516634 am bd1730de: Merge "Document the \'aapt dump strings\' command"
* commit 'bd1730dec7356e042ee885ff4a63b40f36733062':
  Document the 'aapt dump strings' command
2013-04-29 15:19:24 -07:00
Ying Wang
2120f87cde am 9e69a2ce: am 03ce5b53: Fix build.
* commit '9e69a2ced4e11f74ee979390c3f58ec4318a16c3':
  Fix build.
2013-04-29 11:22:15 -07:00
Kenny Root
b566ebdc92 am f266c6b9: am f99177f3: Merge "Update preloaded classes" into jb-mr2-dev
* commit 'f266c6b93f44fcc674d4c5686af0c1d1b782dab0':
  Update preloaded classes
2013-04-29 11:22:06 -07:00
Bjorn Bringert
7bb9471ea7 Merge "Allow compiling aapt for the device" 2013-04-29 10:10:52 +00:00
Mårten Kongstad
08822df147 Document the 'aapt dump strings' command
Update the usage page for aapt to mention 'strings' as a valid
subcommand to 'dump'.

Change-Id: Iadb2b8ce36951ff36ffbf6b5ea349ba1e2b12582
2013-04-29 09:57:19 +02:00
Ying Wang
03ce5b5366 Fix build.
Change-Id: I1fedbbb521305e02502ddb23a96b5ee96fa43b7b
2013-04-26 15:54:44 -07:00
Kenny Root
f99177f394 Merge "Update preloaded classes" into jb-mr2-dev 2013-04-26 22:20:35 +00:00
Kenny Root
9787b80ea8 Update preloaded classes
Bug: 5213043
Change-Id: I272500ce7f6ea6bfbc624c9705f8c8b8ef1aa0ad
2013-04-26 13:38:07 -07:00
Jeff Brown
5ae02e92e4 am eb6403e9: resolved conflicts for merge of bfdd2566 to jb-mr2-dev-plus-aosp
* commit 'eb6403e95d601b62be7b4610599e72fd329f2666':
  Generate SDK docs for v7 support library packages.
2013-04-26 12:06:15 -07:00
Bjorn Bringert
fb903a45d7 Allow compiling aapt for the device
Changes:

- The static device version of libandroidfw now includes
  the extra functions needed by aapt. I could only find
  a few host tools that use the static library, so this is
  hopefully not a problem.

- The pseudolocalization code is moved into aapt.
  It was previously in libhost, but only used by aapt.

Change-Id: Ib393ebb7dcebee8abbb628cbe5255ea1679674ac
2013-04-26 15:07:09 +01:00
Jeff Brown
caf7b0a155 Generate SDK docs for v7 support library packages.
This change required fixing some bugs in how AAPT handles
qualified symbols such as "android:layout_height"
when generating JavaDoc links.  The links were being
generated using the package name of the generated R file
rather than the package name of the referenced symbol.
These broken links caused the JavaDoc build to fail.

Bug: 8175766
Change-Id: I52fbef27825a25abca960cb44b59c2132267e9d6
2013-04-26 00:20:42 -07:00
Chet Haase
faebd8f079 First draft of Scenes & Transitions feature
This checkin has preliminary API (in flux, definitely changes still
to be made) and implementation for a new "Scenes & Transitions" feature.
The current implementation allows you to define different Scenes
(via layout resource IDs or callbacks) and Transitions to be used when
changing to those scenes. By default, scene changes will use AutoTransition,
which generally does the right thing.

There are no overview docs or tutorials yet. The best way to learn how things
work is to see the code for the various tests in
frameworks/base/tests/TransitionTests.

Expect the API to change. Expect the implementation to change (mostly to add
more functionality). Expect bugs, but tell me if things do not work
as expected.

Change-Id: Ib025a9f565678b225afa4759325cf6d496cc7215
2013-04-18 13:33:13 -07:00
Xavier Ducrohet
974dc1f4f8 am ade20f49: am a068eedd: Revert "Make --non-constant-id generates non final IDs for styleable."
* commit 'ade20f49a1a0226c06a6ae5d8074c9c1cc14a152':
  Revert "Make --non-constant-id generates non final IDs for styleable."
2013-04-13 09:59:07 -07:00
Xavier Ducrohet
a068eeddc9 Revert "Make --non-constant-id generates non final IDs for styleable."
This reverts commit 8730f46ae5ba9021a0e01c068ffc6b552b6c4510.
2013-04-13 09:48:01 -07:00
Xavier Ducrohet
b2d17bc5b4 am 95637018: am 629b1c4f: Merge "Make --non-constant-id generates non final IDs for styleable." into jb-mr2-dev
* commit '95637018052655783a25e8123c5b6f898c4171e6':
  Make --non-constant-id generates non final IDs for styleable.
2013-04-12 18:05:46 -07:00