drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,738 Commits 1 Branch 0 Tags
Commit Graph

103738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Murdoch
7e157f321c Merge "Deprectate WebViewDatabase password methods." into jb-mr2-dev 2013-04-15 15:48:25 +00:00
Brian Colonna
a5239891dc 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
 2013-04-15 11:45:40 -04:00
Andreas Huber
e813a85c97 am 2de0771d: Merge "MediaExtractor.setDataSource(...) has always thrown IOExceptions from" into jb-mr2-dev 
* commit '2de0771da2b6c07f717d62ae4e4be93702af9a43':
  MediaExtractor.setDataSource(...) has always thrown IOExceptions from
 2013-04-15 08:34:37 -07:00
Andreas Huber
baf4a057f8 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)
 2013-04-15 08:34:34 -07:00
Andreas Huber
2de0771da2 Merge "MediaExtractor.setDataSource(...) has always thrown IOExceptions from" into jb-mr2-dev 2013-04-15 15:16:27 +00:00
Andreas Huber
5c5c3f3abd Merge "Document that MediaPlayer.getDuration() returns an invalid value (-1)" into jb-mr2-dev 2013-04-15 15:15:41 +00:00
The Android Automerger
d39de0b042 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-15 05:55:51 -07:00
Jason Sams
c4294ed2f1 am 330a9fe3: Merge "Unhide new RS APIs." into jb-mr2-dev 
* commit '330a9fe323cfb2f492665b73822f056c2c6689c2':
  Unhide new RS APIs.
 2013-04-14 19:25:10 -07:00
Jason Sams
330a9fe323 Merge "Unhide new RS APIs." into jb-mr2-dev 2013-04-15 02:22:14 +00:00
Jean-Michel Trivi
9157477300 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
 2013-04-14 12:17:56 -07:00
Jason Sams
9bf189228f 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
 2013-04-14 02:56:03 +00:00
Jason Sams
02d56d90e0 Unhide new RS APIs. 
This exposes the fast path handling of YUV data.

bug 8566866

Change-Id: Iaa3700100db61dd51d16d80ea8ae22f2dcc41bb0
 2013-04-14 02:51:57 +00:00
Amith Yamasani
6064c5cf22 am e1375908: Rename isUserLimited to isLinkedUser 
* commit 'e1375908a5f05e5c926e95049970c4505e4dfad9':
  Rename isUserLimited to isLinkedUser
 2013-04-13 17:22:09 -07:00
Amith Yamasani
e1375908a5 Rename isUserLimited to isLinkedUser 
A linked user is derived from another user and shares their accounts.

Change-Id: Ia2e63d573ccb635495ec54f31ac7b174725ad7a8
 2013-04-13 16:48:35 -07:00
Amith Yamasani
19c95bcc76 am e188c984: Merge "Introducing manifest flag requiredAccountType" into jb-mr2-dev 
* commit 'e188c984ddd4ae4b109c3f204b03a8f798f7e9e8':
  Introducing manifest flag requiredAccountType
 2013-04-13 15:56:31 -07:00
Amith Yamasani
e188c984dd Merge "Introducing manifest flag requiredAccountType" into jb-mr2-dev 2013-04-13 22:54:01 +00:00
Xavier Ducrohet
ade20f49a1 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."
 2013-04-13 09:57:01 -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
Kenny Root
e7cf8c2302 keystore: remove old APIs 
Remove the APIs that don't specify the flags so callers know what
they're getting.

Bug: 8122243
Change-Id: Ifaef6fb1d16010237c01f9d11f2053bb6b3980c0
 2013-04-12 18:09:04 -07:00
Kenny Root
b2c0ff64d8 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
 2013-04-12 18:09:04 -07:00
Dianne Hackborn
00c4c67069 am 301e95f2: Merge "Add a little more resource load tracing." into jb-mr2-dev 
* commit '301e95f2e17164c6f432f1b68f55e5f12aa0ca78':
  Add a little more resource load tracing.
 2013-04-12 18:07:12 -07:00
Dianne Hackborn
301e95f2e1 Merge "Add a little more resource load tracing." into jb-mr2-dev 2013-04-13 01:03:47 +00:00
Amith Yamasani
ccbe389b4d 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
 2013-04-12 17:52:42 -07:00
Dianne Hackborn
0acc1931d3 Add a little more resource load tracing. 
Change-Id: Id797adb67ab411d5b1a1c223863d3bb4655d10b1
 2013-04-12 17:49:17 -07:00
Romain Guy
5141bf801e 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
 2013-04-12 17:41:35 -07:00
Xavier Ducrohet
9563701805 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.
 2013-04-12 17:38:04 -07:00
Romain Guy
80fccb4dda Merge "There should be a mandatory coder's license. Bug #8586560" into jb-mr2-dev 2013-04-13 00:37:37 +00:00
Xavier Ducrohet
629b1c4f20 Merge "Make --non-constant-id generates non final IDs for styleable." into jb-mr2-dev 2013-04-13 00:35:54 +00:00
Mathias Agopian
4c87edfe4d 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
 2013-04-12 17:32:32 -07:00
Mathias Agopian
1763d6f957 Merge "always trigger a re-draw when updating the transparent region hint" into jb-mr2-dev 2013-04-13 00:28:16 +00:00
Jaikumar Ganesh
d347d51976 am 02087754: Merge "Fix race condition and disable call." into jb-mr2-dev 
* commit '02087754fb49de7421b982267a283482b70bc297':
  Fix race condition and disable call.
 2013-04-12 17:25:41 -07:00
Jaikumar Ganesh
02087754fb Merge "Fix race condition and disable call." into jb-mr2-dev 2013-04-13 00:22:07 +00:00
Svetoslav Ganov
dd03b6dcb7 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.
 2013-04-12 17:17:59 -07:00
Svetoslav
640769589b 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.
 2013-04-12 17:17:57 -07:00
Svetoslav Ganov
26257a09a5 Merge "Allow for setting test type as a monkey." into jb-mr2-dev 2013-04-13 00:15:40 +00:00
Svetoslav
72ab9b8017 Merge "Respect custom view drawing order when dispatching hover events." into jb-mr2-dev 2013-04-13 00:14:56 +00:00
Kenny Root
019895e2e4 am 8692685a: Merge changes Ia802afe9,If9af0d99 into jb-mr2-dev 
* commit '8692685a54f6bf87dadc82fbd5576cdb81ba662b':
  AndroidKeyStore: Add encrypted flag
  keystore: Add flag for blobs to be unencrypted
 2013-04-12 17:09:57 -07:00
Kenny Root
8692685a54 Merge changes Ia802afe9,If9af0d99 into jb-mr2-dev 
* changes:
  AndroidKeyStore: Add encrypted flag
  keystore: Add flag for blobs to be unencrypted
 2013-04-13 00:04:17 +00:00
Dianne Hackborn
18e99d1d5f 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.
 2013-04-12 17:03:03 -07:00
Mathias Agopian
54e3d38490 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
 2013-04-12 17:01:44 -07:00
Svetoslav
0e5e9aa8e5 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
 2013-04-12 16:59:03 -07:00
Dianne Hackborn
15fed390c4 Merge "Add new resources trace, also trace apk dex loading." into jb-mr2-dev 2013-04-12 23:58:50 +00:00
Romain Guy
4abab937bf There should be a mandatory coder's license. 
Bug #8586560

And I don't deserve to pass the test.

Change-Id: Ic7886205511f16145a925fc860e4a03dfaf473d5
 2013-04-12 16:51:21 -07:00
Romain Guy
543c5dcfcb am efcb252f: Merge "Properly computer gradient textures width" into jb-mr2-dev 
* commit 'efcb252f767ab8737cc41cab4ee155faf2271417':
  Properly computer gradient textures width
 2013-04-12 16:42:20 -07:00
Romain Guy
efcb252f76 Merge "Properly computer gradient textures width" into jb-mr2-dev 2013-04-12 23:39:27 +00:00
Romain Guy
95aeff8f11 Properly computer gradient textures width 
Only on devices that do not have the npot extension

Change-Id: I472a13dc707d2abaf5fcc06f99c9da343b333558
 2013-04-12 16:32:05 -07:00
Xavier Ducrohet
8730f46ae5 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
 2013-04-12 16:02:54 -07:00
Amith Yamasani
b0511d47eb am e107aa43: Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev 
* commit 'e107aa43866ce06cd08a7a3f2500a22bf81bbe79':
  Rename isUserRestricted to isUserLimited
 2013-04-12 15:36:22 -07:00
Amith Yamasani
e107aa4386 Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev 2013-04-12 22:33:05 +00:00
Chet Haase
d04215c440 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
 2013-04-12 15:23:22 -07:00