OSDN Git Service
Svetoslav [Mon, 15 Apr 2013 21:56:21 +0000 (14:56 -0700)]
am
289e6497: Merge "Fully setup newly bound service before state management." into jb-mr2-dev
* commit '
289e64974a3be70ff823ee0a0c1fe5ea32a832bb':
Fully setup newly bound service before state management.
Svetoslav [Mon, 15 Apr 2013 21:51:22 +0000 (21:51 +0000)]
Merge "Fully setup newly bound service before state management." into jb-mr2-dev
Chris Craik [Mon, 15 Apr 2013 21:31:02 +0000 (14:31 -0700)]
am
30c990c3: Merge "Draw Operation merging" into jb-mr2-dev
* commit '
30c990c361291ad578ef4ffe4a4dd0fd6080797b':
Draw Operation merging
Chris Craik [Mon, 15 Apr 2013 21:27:10 +0000 (21:27 +0000)]
Merge "Draw Operation merging" into jb-mr2-dev
Brian Colonna [Mon, 15 Apr 2013 21:24:10 +0000 (14:24 -0700)]
am
3f1375e5: Merge "Enabling Face Unlock for user switching (bug
8495282)" into jb-mr2-dev
* commit '
3f1375e50fa29c500f1ce746ec7421bf6afcd8ff':
Enabling Face Unlock for user switching (bug
8495282)
Brian Colonna [Mon, 15 Apr 2013 21:20:08 +0000 (21:20 +0000)]
Merge "Enabling Face Unlock for user switching (bug
8495282)" into jb-mr2-dev
Amith Yamasani [Mon, 15 Apr 2013 21:02:15 +0000 (14:02 -0700)]
am
919e36d5: Merge "Allow non-system apps to use restricted accounts" into jb-mr2-dev
* commit '
919e36d5f689f6a73a879ebd72465f68c1625062':
Allow non-system apps to use restricted accounts
Amith Yamasani [Mon, 15 Apr 2013 20:59:50 +0000 (20:59 +0000)]
Merge "Allow non-system apps to use restricted accounts" into jb-mr2-dev
Chris Craik [Mon, 4 Mar 2013 18:19:31 +0000 (10:19 -0800)]
Draw Operation merging
Merge simple bitmap draw operations and text operations to avoid
issuing individual gl draws for each operation. Merging other ops to
be done eventually.
The methods are different - the bitmap merging generates a single
mesh for reused, unclipped images (esp. repeated images in a listview)
The text approach queries just defers the normal font rendering until
the last drawText in the sequence that can share the same shader.
Patches are sorted and merged, but don't yet have a multiDraw
implementation. For now, the pretending-to-merge gives better sorting
behavior by keeping similar patches together.
Change-Id: Ic300cdab0a53814cf7b09c58bf54b1bf0f58ccd6
Amith Yamasani [Mon, 15 Apr 2013 20:42:57 +0000 (13:42 -0700)]
Allow non-system apps to use restricted accounts
Anyway they need to request account access and user will be asked to approve access to the account
at runtime.
Bug:
8617168
Change-Id: I31de852b9bb25f496becc3e6470265b5c330e6ad
Jeff Tinker [Mon, 15 Apr 2013 20:13:39 +0000 (13:13 -0700)]
am
7fa9667f: Merge "Clarify how release of offline keys is handled in the MediaDrm API" into jb-mr2-dev
* commit '
7fa9667f63fe84a2d17ce899121f32bfcec98864':
Clarify how release of offline keys is handled in the MediaDrm API
Jeff Tinker [Mon, 15 Apr 2013 20:11:17 +0000 (20:11 +0000)]
Merge "Clarify how release of offline keys is handled in the MediaDrm API" into jb-mr2-dev
Kenny Root [Mon, 15 Apr 2013 20:00:53 +0000 (13:00 -0700)]
am
e4753968: Merge "Remove old KeyStore call sites" into jb-mr2-dev
* commit '
e47539684e1431a69893e45bcf9ace4f812edbc8':
Remove old KeyStore call sites
Kenny Root [Mon, 15 Apr 2013 19:54:55 +0000 (19:54 +0000)]
Merge "Remove old KeyStore call sites" into jb-mr2-dev
Jason Sams [Mon, 15 Apr 2013 19:43:39 +0000 (12:43 -0700)]
am
097ed01a: Merge "Revert GC thread changes" into jb-mr2-dev
* commit '
097ed01adca362b7c3e49a9301aacbbf3415384a':
Revert GC thread changes
Jason Sams [Mon, 15 Apr 2013 19:40:47 +0000 (19:40 +0000)]
Merge "Revert GC thread changes" into jb-mr2-dev
Baligh Uddin [Mon, 15 Apr 2013 19:27:57 +0000 (12:27 -0700)]
am
ce370671: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
ce370671785630de03ce15ccf3568e10ff8edfd6':
Import translations. DO NOT MERGE
Kenny Root [Mon, 15 Apr 2013 19:26:49 +0000 (12:26 -0700)]
resolved conflicts for merge of
6fb172b1 to jb-mr2-dev-plus-aosp
Change-Id: I49dcec1d43e7b8dbbb9b89e2454ec5d657e53e02
Baligh Uddin [Mon, 15 Apr 2013 19:25:10 +0000 (19:25 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Svetoslav [Mon, 15 Apr 2013 19:10:36 +0000 (12:10 -0700)]
Fully setup newly bound service before state management.
If the connected service is not entirely setup when calling the method for
handling a change in the current user state we get a potential NPE since
the management method may have discarded the service, thus nullifying the
connection to it. Now the service is fully configured before calling the
state change management method.
bug:
8600489
Change-Id: Ib0bf7c6d575e15c620da419d43ece22f4187fd34
Kenny Root [Mon, 15 Apr 2013 19:01:22 +0000 (12:01 -0700)]
am
5678bacd: Merge "Remove keystore entries when app data cleared"
* commit '
5678bacdffb6871b0d5b428548315cc3bba430bd':
Remove keystore entries when app data cleared
Kenny Root [Mon, 15 Apr 2013 18:29:44 +0000 (18:29 +0000)]
Merge "keystore: Add flag for blobs to be unencrypted"
Kenny Root [Mon, 15 Apr 2013 18:19:31 +0000 (11:19 -0700)]
resolved conflicts for merge of
caf0496d to jb-mr2-dev-plus-aosp
Change-Id: I006f9a5a6b71ab618f88c2ecb848e270128e20a0
Scott Main [Mon, 15 Apr 2013 18:15:33 +0000 (11:15 -0700)]
am
fb5e6bbd: Merge "fix javadoc build" into jb-mr2-dev
* commit '
fb5e6bbd2bf9ad8a71fc798be3ef12b950476f43':
fix javadoc build
Scott Main [Mon, 15 Apr 2013 18:13:17 +0000 (18:13 +0000)]
Merge "fix javadoc build" into jb-mr2-dev
Scott Main [Mon, 15 Apr 2013 18:11:44 +0000 (11:11 -0700)]
fix javadoc build
Change-Id: I9b86dda5aea075832d5e165043f45c8d507b5c16
Kenny Root [Wed, 10 Apr 2013 17:37:55 +0000 (10:37 -0700)]
keystore: Add flag for blobs to be unencrypted
In order to let apps use keystore more productively, make the blob
encryption optional. As more hardware-assisted keystores (i.e., hardware
that has a Keymaster HAL) come around, encrypting blobs start to make
less sense since the thing it's encrypting is usually a token and not
any raw key material.
(cherry picked from commit
a3788b00bb221e20abdd42f747d2af419e0a088c)
Bug:
8122243
Change-Id: Ifc1c64743651b23a4eace208ade0176af47ea989
Scott Main [Mon, 15 Apr 2013 18:06:58 +0000 (11:06 -0700)]
am
d7f67d6f: am
80f8c84e: am
0451003f: am
c0677691: am
92fd5508: am
c70e0f5e: Merge "add oppo and xiaomi driver links bug:
8523141" into jb-mr1.1-docs
* commit '
d7f67d6f0b59c5aa0251127baa4c55037c902e7f':
add oppo and xiaomi driver links bug:
8523141
Daniel Sandler [Mon, 15 Apr 2013 18:06:55 +0000 (11:06 -0700)]
am
bd573049: Merge "Putting the gesture debugging back in the box." into jb-mr2-dev
* commit '
bd573049ec5a0c0d73b4835a2308c6737dfff2f3':
Putting the gesture debugging back in the box.
Scott Main [Mon, 15 Apr 2013 18:04:33 +0000 (11:04 -0700)]
am
80f8c84e: am
0451003f: am
c0677691: am
92fd5508: am
c70e0f5e: Merge "add oppo and xiaomi driver links bug:
8523141" into jb-mr1.1-docs
* commit '
80f8c84e0cf9b2703939af6bb4aeff7000e3fd9e':
add oppo and xiaomi driver links bug:
8523141
Kenny Root [Mon, 15 Apr 2013 18:03:08 +0000 (18:03 +0000)]
Merge "Remove keystore entries when app data cleared"
Daniel Sandler [Mon, 15 Apr 2013 18:02:51 +0000 (18:02 +0000)]
Merge "Putting the gesture debugging back in the box." into jb-mr2-dev
Scott Main [Mon, 15 Apr 2013 18:00:06 +0000 (11:00 -0700)]
am
0451003f: am
c0677691: am
92fd5508: am
c70e0f5e: Merge "add oppo and xiaomi driver links bug:
8523141" into jb-mr1.1-docs
* commit '
0451003f681c830fe626e4e0e6861c0bca8de51f':
add oppo and xiaomi driver links bug:
8523141
Kenny Root [Fri, 12 Apr 2013 17:06:51 +0000 (10:06 -0700)]
Remove keystore entries when app data cleared
When an application's user data is cleared, the keystore entries need to
be cleared as well. Previously we were only clearing entries when the
application was uninstalled for all users. Now we cover the case of
multiuser as well.
(cherry picked from commit
6fd1c85d7f909580582e5ebc357564331ecef283)
Bug:
8566369
Change-Id: Id4df5e50661b676b8f6507b915764400982c01a0
Scott Main [Mon, 15 Apr 2013 17:56:42 +0000 (10:56 -0700)]
am
c0677691: am
92fd5508: am
c70e0f5e: Merge "add oppo and xiaomi driver links bug:
8523141" into jb-mr1.1-docs
* commit '
c06776912d75190966c5f00e617edffbfe01851c':
add oppo and xiaomi driver links bug:
8523141
Scott Main [Mon, 15 Apr 2013 17:52:40 +0000 (10:52 -0700)]
am
92fd5508: am
c70e0f5e: Merge "add oppo and xiaomi driver links bug:
8523141" into jb-mr1.1-docs
* commit '
92fd5508aae8f8b43164405a5b725d0e60e464e1':
add oppo and xiaomi driver links bug:
8523141
Scott Main [Mon, 15 Apr 2013 17:49:35 +0000 (10:49 -0700)]
am
c70e0f5e: Merge "add oppo and xiaomi driver links bug:
8523141" into jb-mr1.1-docs
* commit '
c70e0f5e182ab209ab9b272c1408ac3170ca6345':
add oppo and xiaomi driver links bug:
8523141
The Android Open Source Project [Mon, 15 Apr 2013 17:46:06 +0000 (10:46 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I618d51505419200bc282404ec2af470be97f1fa7
Scott Main [Mon, 15 Apr 2013 17:45:22 +0000 (17:45 +0000)]
Merge "add oppo and xiaomi driver links bug:
8523141" into jb-mr1.1-docs
Kenny Root [Mon, 15 Apr 2013 17:44:59 +0000 (17:44 +0000)]
Merge "Check outInfo is not null"
Kenny Root [Mon, 8 Apr 2013 23:05:00 +0000 (16:05 -0700)]
Check outInfo is not null
Only call keystore if outInfo is not null
(cherry picked from commit
3b9933d0c2f2b9a2e973dca296ee45a69087e31c)
Bug:
8568820
Change-Id: I764980fd396dbc637732ad290eea2bd11036ec28
Jean-Michel Trivi [Mon, 15 Apr 2013 17:19:24 +0000 (10:19 -0700)]
am
74e56f19: Merge "Public APIs for media position in RemoteControlClient" into jb-mr2-dev
* commit '
74e56f19299cd04e2e6c6a9a19af260551750d6a':
Public APIs for media position in RemoteControlClient
Jean-Michel Trivi [Mon, 15 Apr 2013 17:13:45 +0000 (17:13 +0000)]
Merge "Public APIs for media position in RemoteControlClient" into jb-mr2-dev
Baligh Uddin [Mon, 15 Apr 2013 15:59:28 +0000 (08:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifcb746e1bec6ba3252d57feef425738ef84636e6
Auto-generated-cl: translation import
Ben Murdoch [Mon, 15 Apr 2013 15:52:46 +0000 (08:52 -0700)]
am
7e157f32: Merge "Deprectate WebViewDatabase password methods." into jb-mr2-dev
* commit '
7e157f321c690e41f0f18a556f989fd20709469f':
Deprectate WebViewDatabase password methods.
Ben Murdoch [Mon, 15 Apr 2013 15:48:24 +0000 (15:48 +0000)]
Merge "Deprectate WebViewDatabase password methods." into jb-mr2-dev
Brian Colonna [Mon, 15 Apr 2013 15:45:40 +0000 (11:45 -0400)]
Enabling Face Unlock for user switching (bug
8495282)
We had been intentionally disabling FUL when switching to a new user.
The reason was that we were only getting a signal when the user switch
started, not when it completed. If we started FUL at the beginning of
the user switch, it could be completed by the time the user switch
completed. We now have a signal to tell us that the switch completed.
Prior to this change, FUL would start whenever keyguard is created.
For a user switch, keyguard is recreated when we get
onUserSwitching(), but we don't want FUL to start until we get
onUserSwitchComplete(). So with this change, if onResume() happens
because of a user switch it doesn't start FUL until we get
onUserSwitchComplete().
Change-Id: I1d3da0a32b9b4cf0cfa5c577f1697d2a41ee4fda
Andreas Huber [Mon, 15 Apr 2013 15:34:37 +0000 (08:34 -0700)]
am
2de0771d: Merge "MediaExtractor.setDataSource(...) has always thrown IOExceptions from" into jb-mr2-dev
* commit '
2de0771da2b6c07f717d62ae4e4be93702af9a43':
MediaExtractor.setDataSource(...) has always thrown IOExceptions from
Andreas Huber [Mon, 15 Apr 2013 15:34:34 +0000 (08:34 -0700)]
am
5c5c3f3a: Merge "Document that MediaPlayer.getDuration() returns an invalid value (-1)" into jb-mr2-dev
* commit '
5c5c3f3abd8a95bf46378fd93b13160ad52e74ff':
Document that MediaPlayer.getDuration() returns an invalid value (-1)
Andreas Huber [Mon, 15 Apr 2013 15:16:26 +0000 (15:16 +0000)]
Merge "MediaExtractor.setDataSource(...) has always thrown IOExceptions from" into jb-mr2-dev
Andreas Huber [Mon, 15 Apr 2013 15:15:41 +0000 (15:15 +0000)]
Merge "Document that MediaPlayer.getDuration() returns an invalid value (-1)" into jb-mr2-dev
The Android Automerger [Mon, 15 Apr 2013 12:55:51 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Jason Sams [Mon, 15 Apr 2013 02:25:10 +0000 (19:25 -0700)]
am
330a9fe3: Merge "Unhide new RS APIs." into jb-mr2-dev
* commit '
330a9fe323cfb2f492665b73822f056c2c6689c2':
Unhide new RS APIs.
Jason Sams [Mon, 15 Apr 2013 02:22:12 +0000 (02:22 +0000)]
Merge "Unhide new RS APIs." into jb-mr2-dev
Jean-Michel Trivi [Thu, 11 Apr 2013 01:37:43 +0000 (18:37 -0700)]
Public APIs for media position in RemoteControlClient
New APIs in android.media.RemoteControlClient to support application
exposing their current media playback position and speed, and
let the framework request position changes.
Bug
8120740
Change-Id: Ibfc41f60e279413c26147e3276d96f28b7f506e7
Jason Sams [Sun, 14 Apr 2013 02:48:36 +0000 (19:48 -0700)]
Revert GC thread changes
This is not quite a straight revery, some manual edits were necessary.
The original CL didn't undergo sufficient design review or testing. Revert until the regressions can be sorted out.
Bug
8585185
This reverts commit
6dacf8355a0692b52c49f603f43317772cb36175
This reverts commit
f8c033db1edf36a0ab09568c3142054f0be2d1a1
Change-Id: Ie7215bdf881332e822603547e92f810f595077fc
Jason Sams [Fri, 12 Apr 2013 23:40:50 +0000 (16:40 -0700)]
Unhide new RS APIs.
This exposes the fast path handling of YUV data.
bug
8566866
Change-Id: Iaa3700100db61dd51d16d80ea8ae22f2dcc41bb0
Amith Yamasani [Sun, 14 Apr 2013 00:22:09 +0000 (17:22 -0700)]
am
e1375908: Rename isUserLimited to isLinkedUser
* commit '
e1375908a5f05e5c926e95049970c4505e4dfad9':
Rename isUserLimited to isLinkedUser
Amith Yamasani [Sat, 13 Apr 2013 23:48:35 +0000 (16:48 -0700)]
Rename isUserLimited to isLinkedUser
A linked user is derived from another user and shares their accounts.
Change-Id: Ia2e63d573ccb635495ec54f31ac7b174725ad7a8
Amith Yamasani [Sat, 13 Apr 2013 22:56:31 +0000 (15:56 -0700)]
am
e188c984: Merge "Introducing manifest flag requiredAccountType" into jb-mr2-dev
* commit '
e188c984ddd4ae4b109c3f204b03a8f798f7e9e8':
Introducing manifest flag requiredAccountType
Amith Yamasani [Sat, 13 Apr 2013 22:54:00 +0000 (22:54 +0000)]
Merge "Introducing manifest flag requiredAccountType" into jb-mr2-dev
Xavier Ducrohet [Sat, 13 Apr 2013 16:57:01 +0000 (09:57 -0700)]
am
a068eedd: Revert "Make --non-constant-id generates non final IDs for styleable."
* commit '
a068eeddc9d47af1a12afbe6efe7d00e8e903b9f':
Revert "Make --non-constant-id generates non final IDs for styleable."
Xavier Ducrohet [Sat, 13 Apr 2013 16:48:01 +0000 (09:48 -0700)]
Revert "Make --non-constant-id generates non final IDs for styleable."
This reverts commit
8730f46ae5ba9021a0e01c068ffc6b552b6c4510.
Kenny Root [Sat, 13 Apr 2013 00:36:25 +0000 (17:36 -0700)]
Remove old KeyStore call sites
Remove the call sites that don't have the flags specified. This is to
ensure that callers know what flags they're setting.
Bug:
8122243
Change-Id: Ifbd178fddbf8dbd8f7b821ea739a20d056ef9fa7
Dianne Hackborn [Sat, 13 Apr 2013 01:07:12 +0000 (18:07 -0700)]
am
301e95f2: Merge "Add a little more resource load tracing." into jb-mr2-dev
* commit '
301e95f2e17164c6f432f1b68f55e5f12aa0ca78':
Add a little more resource load tracing.
Dianne Hackborn [Sat, 13 Apr 2013 01:03:46 +0000 (01:03 +0000)]
Merge "Add a little more resource load tracing." into jb-mr2-dev
Amith Yamasani [Sat, 13 Apr 2013 00:52:42 +0000 (17:52 -0700)]
Introducing manifest flag requiredAccountType
This can be used by apps that won't work without an account of that
type in the limited user environment. This way we can avoid letting
users select these apps when setting up a limited user.
Bug:
8600261
Change-Id: Iaa0dd5ff88e89fa7a1d8a4e70317290268411bdb
Dianne Hackborn [Sat, 13 Apr 2013 00:49:17 +0000 (17:49 -0700)]
Add a little more resource load tracing.
Change-Id: Id797adb67ab411d5b1a1c223863d3bb4655d10b1
Romain Guy [Sat, 13 Apr 2013 00:41:35 +0000 (17:41 -0700)]
am
80fccb4d: Merge "There should be a mandatory coder\'s license. Bug #
8586560" into jb-mr2-dev
* commit '
80fccb4dda9b2c46955e05b8be9e6071e0cc347b':
There should be a mandatory coder's license. Bug #
8586560
Xavier Ducrohet [Sat, 13 Apr 2013 00:38:04 +0000 (17:38 -0700)]
am
629b1c4f: Merge "Make --non-constant-id generates non final IDs for styleable." into jb-mr2-dev
* commit '
629b1c4f2042ef0f1da4fe543cca34deedd3ba5d':
Make --non-constant-id generates non final IDs for styleable.
Romain Guy [Sat, 13 Apr 2013 00:37:37 +0000 (00:37 +0000)]
Merge "There should be a mandatory coder's license. Bug #
8586560" into jb-mr2-dev
Xavier Ducrohet [Sat, 13 Apr 2013 00:35:54 +0000 (00:35 +0000)]
Merge "Make --non-constant-id generates non final IDs for styleable." into jb-mr2-dev
Mathias Agopian [Sat, 13 Apr 2013 00:32:32 +0000 (17:32 -0700)]
am
1763d6f9: Merge "always trigger a re-draw when updating the transparent region hint" into jb-mr2-dev
* commit '
1763d6f957163faf6d3b629c36f4e8e90e0e31bd':
always trigger a re-draw when updating the transparent region hint
Mathias Agopian [Sat, 13 Apr 2013 00:28:16 +0000 (00:28 +0000)]
Merge "always trigger a re-draw when updating the transparent region hint" into jb-mr2-dev
Jaikumar Ganesh [Sat, 13 Apr 2013 00:25:41 +0000 (17:25 -0700)]
am
02087754: Merge "Fix race condition and disable call." into jb-mr2-dev
* commit '
02087754fb49de7421b982267a283482b70bc297':
Fix race condition and disable call.
Jaikumar Ganesh [Sat, 13 Apr 2013 00:22:06 +0000 (00:22 +0000)]
Merge "Fix race condition and disable call." into jb-mr2-dev
Svetoslav Ganov [Sat, 13 Apr 2013 00:17:59 +0000 (17:17 -0700)]
am
26257a09: Merge "Allow for setting test type as a monkey." into jb-mr2-dev
* commit '
26257a09a54cda5e8a0bc5b1edb0a5b401983a3b':
Allow for setting test type as a monkey.
Svetoslav [Sat, 13 Apr 2013 00:17:57 +0000 (17:17 -0700)]
am
72ab9b80: Merge "Respect custom view drawing order when dispatching hover events." into jb-mr2-dev
* commit '
72ab9b801794d42de83d3e7afb70ccc96ade7dfb':
Respect custom view drawing order when dispatching hover events.
Svetoslav Ganov [Sat, 13 Apr 2013 00:15:39 +0000 (00:15 +0000)]
Merge "Allow for setting test type as a monkey." into jb-mr2-dev
Svetoslav [Sat, 13 Apr 2013 00:14:56 +0000 (00:14 +0000)]
Merge "Respect custom view drawing order when dispatching hover events." into jb-mr2-dev
Kenny Root [Sat, 13 Apr 2013 00:09:57 +0000 (17:09 -0700)]
am
8692685a: Merge changes Ia802afe9,If9af0d99 into jb-mr2-dev
* commit '
8692685a54f6bf87dadc82fbd5576cdb81ba662b':
AndroidKeyStore: Add encrypted flag
keystore: Add flag for blobs to be unencrypted
Kenny Root [Sat, 13 Apr 2013 00:04:16 +0000 (00:04 +0000)]
Merge changes Ia802afe9,If9af0d99 into jb-mr2-dev
* changes:
AndroidKeyStore: Add encrypted flag
keystore: Add flag for blobs to be unencrypted
Dianne Hackborn [Sat, 13 Apr 2013 00:03:03 +0000 (17:03 -0700)]
am
15fed390: Merge "Add new resources trace, also trace apk dex loading." into jb-mr2-dev
* commit '
15fed390c44972932f6dd7ce3bef1004e8b98b61':
Add new resources trace, also trace apk dex loading.
Mathias Agopian [Fri, 12 Apr 2013 22:13:12 +0000 (15:13 -0700)]
always trigger a re-draw when updating the transparent region hint
since SF now relies on receiving a frame for latching the
transparent region hint, we make sure we will indeed redraw
something.
Bug:
8581533
Change-Id: Ia12ddf5654a7deeac7628b799bfde4b8c16c992b
Svetoslav [Fri, 12 Apr 2013 21:13:20 +0000 (14:13 -0700)]
Respect custom view drawing order when dispatching hover events.
1. The event dispatch methods should respect the child drawing order.
Hover event dispatch in ViewGroup was not repsecting this order.
bug:
8606799
Change-Id: Ie2fd3aff1292c21df23a04ca0aa03a97813c44ef
Dianne Hackborn [Fri, 12 Apr 2013 23:58:50 +0000 (23:58 +0000)]
Merge "Add new resources trace, also trace apk dex loading." into jb-mr2-dev
Romain Guy [Fri, 12 Apr 2013 23:51:21 +0000 (16:51 -0700)]
There should be a mandatory coder's license.
Bug #
8586560
And I don't deserve to pass the test.
Change-Id: Ic7886205511f16145a925fc860e4a03dfaf473d5
Romain Guy [Fri, 12 Apr 2013 23:42:20 +0000 (16:42 -0700)]
am
efcb252f: Merge "Properly computer gradient textures width" into jb-mr2-dev
* commit '
efcb252f767ab8737cc41cab4ee155faf2271417':
Properly computer gradient textures width
Romain Guy [Fri, 12 Apr 2013 23:39:26 +0000 (23:39 +0000)]
Merge "Properly computer gradient textures width" into jb-mr2-dev
Romain Guy [Fri, 12 Apr 2013 23:32:05 +0000 (16:32 -0700)]
Properly computer gradient textures width
Only on devices that do not have the npot extension
Change-Id: I472a13dc707d2abaf5fcc06f99c9da343b333558
Xavier Ducrohet [Fri, 12 Apr 2013 23:00:49 +0000 (16:00 -0700)]
Make --non-constant-id generates non final IDs for styleable.
This was already done for all other types of resources, but not
for styleable (or the constants for the styleable array indices).
This fixes this. This only affects the SDK as this is used by the
SDK toolchain only.
Change-Id: Idfc2f7915be2b0e88590f38fd660610ffc7e160c
Amith Yamasani [Fri, 12 Apr 2013 22:36:22 +0000 (15:36 -0700)]
am
e107aa43: Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev
* commit '
e107aa43866ce06cd08a7a3f2500a22bf81bbe79':
Rename isUserRestricted to isUserLimited
Amith Yamasani [Fri, 12 Apr 2013 22:33:05 +0000 (22:33 +0000)]
Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev
Chet Haase [Fri, 12 Apr 2013 22:23:22 +0000 (15:23 -0700)]
am
0a41431d: Merge "API and doc cleanup, plus small animation/UI features" into jb-mr2-dev
* commit '
0a41431d697a34e7fe4ed2c481484d7a63949037':
API and doc cleanup, plus small animation/UI features
Kenny Root [Wed, 10 Apr 2013 18:30:58 +0000 (11:30 -0700)]
AndroidKeyStore: Add encrypted flag
Add the encrypted flag for the KeyPairGenerator and the KeyStore so that
applications can choose to allow entries when there is no lockscreen.
Bug:
8122243
Change-Id: Ia802afe965f2377ad3f282dab8c512388c705850
Chet Haase [Fri, 12 Apr 2013 22:18:23 +0000 (22:18 +0000)]
Merge "API and doc cleanup, plus small animation/UI features" into jb-mr2-dev
Amith Yamasani [Fri, 12 Apr 2013 20:26:50 +0000 (13:26 -0700)]
Rename isUserRestricted to isUserLimited
Avoid confusion with user restrictions which can be applied to
non-limited users as well.
Updated the java docs.
Change-Id: I4097c50b528b01a49cebcb0832d09f2b06998faa
Scott Main [Fri, 12 Apr 2013 22:01:30 +0000 (15:01 -0700)]
am
faaaa223: am
27248105: am
044d08b0: am
7d62462b: am
8ab0f12f: am
64d51032: moar doc tags for search suggestions (Design docs)
* commit '
faaaa223996308f1d666e3d9c8bfaa7e17eca4fe':
moar doc tags for search suggestions (Design docs)
Scott Main [Fri, 12 Apr 2013 21:57:34 +0000 (14:57 -0700)]
am
27248105: am
044d08b0: am
7d62462b: am
8ab0f12f: am
64d51032: moar doc tags for search suggestions (Design docs)
* commit '
27248105a17eb64564cb904d6c9019afbfc5ac0f':
moar doc tags for search suggestions (Design docs)
Scott Main [Fri, 12 Apr 2013 21:54:27 +0000 (14:54 -0700)]
am
044d08b0: am
7d62462b: am
8ab0f12f: am
64d51032: moar doc tags for search suggestions (Design docs)
* commit '
044d08b0f10ca3a9e45c35bd6638763915c1f253':
moar doc tags for search suggestions (Design docs)