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

7720 Commits

Author SHA1 Message Date
Yorke Lee
ec282845a9 Merge "Make some fields in ContactsContract.QuickContacts public" 2014-06-23 21:44:43 +00:00
Yorke Lee
f8aadf3fde Make some fields in ContactsContract.QuickContacts public 
Bug: 6948882
Change-Id: Ia7350c98c71ee30793dd24b8acb35f247619ae4d
 2014-06-23 18:07:30 -07:00
Adam Powell
969185bbbc Merge "Add Toolbar methods to set title text colors" 2014-06-23 21:44:43 +00:00
Adam Powell
1a264ce3d9 Add Toolbar methods to set title text colors 
Bug 15836670

Change-Id: If62da4104853c772790597be44f7a1efde2505ef
 2014-06-23 18:16:44 -07:00
Adam Powell
cd6331e493 Merge "Make some more action mode drawable theme attrs public" 2014-06-23 21:44:43 +00:00
Brian Attwell
a279918c5b Add EdgeEffect#setColor 
Bug: 15725269
Change-Id: Ifdb0a53d1f17e2433683e51d09588545b69e6238
 2014-06-24 00:04:05 +00:00
Adam Powell
5abdb64112 Make some more action mode drawable theme attrs public 
By popular demand, add actionModeShareDrawable, actionModeFindDrawable
and actionModeWebSearchDrawable to the public API. This can allow apps
to read the appropriate icons out of the theme to use elsewhere.

Bug 14262004

Change-Id: I2b7cde1e03852cc8a59780dbe1a6c8cecefb59ca
 2014-06-23 17:00:37 -07:00
RoboErik
51fa6bcb22 b/15757378 Expose APIs for listening to active sessions 
This allows apps that are registered notification listeners to
listen to the set of active sessions.

Change-Id: I1e108951a5049d138208e88b155c0ec9b95fbdb0
 2014-06-23 16:29:52 -07:00
Yorke Lee
e85eee8234 Merge "Update PinnedPositions API (2/2)" 2014-06-20 00:30:35 +00:00
Yorke Lee
cadbe4ccde Update PinnedPositions API (2/2) 
Remove the now unnecessary UPDATE_API and STAR_WHEN_PINNING fields
Make PinnedPositions public API once more

Bug: 15593967

Change-Id: I5eabee6977b93b5ddbf79ec8c01649f20b02abf1
 2014-06-23 16:22:26 -07:00
Alan Viverette
22594f0972 Add tileModeX/Y attrs to BitmapDrawable, tint to ShapeDrawable 
Change-Id: I1c9efe39bfd5286230cee8354822db81f05186e4
 2014-06-23 12:47:43 -07:00
ztenghui
f2d0020d93 Merge "Make AnimatedVectorDrawable public." 2014-06-20 20:04:02 +00:00
ztenghui
7e7ea9da67 Make AnimatedVectorDrawable public. 
Clean up some useless VectorDrawable functions.
Add comments, too.

Change-Id: I8cc2165d14d09fd71f5830c4f61f9e8ac1d7c8da
 2014-06-23 09:36:52 -07:00
George Mount
eeda22b46f Merge "Revert "Revert "API Review: Change View viewName attribute to transitionName.""" 2014-06-21 03:15:09 +00:00
George Mount
0a2ae002e6 Revert "Revert "API Review: Change View viewName attribute to transitionName."" 
This reverts commit 1bdfbc68e22a64215ab8fa3e3d17676513546997.

Change-Id: Ie3fdf53b33cb2f61c1878055940f52ed9dfc8b08
 2014-06-23 14:57:27 +00:00
John Reck
a3c1025b80 Revert "API Review: Change View viewName attribute to transitionName." 
This reverts commit f1b1adf51b2a84e0ac83685812c7e8d86590af12.

Change-Id: I0e49aeed84f2a548e272a59f4e13c3fb74c2bfd9
 2014-06-23 14:51:44 +00:00
Elliott Hughes
104ef50048 Merge "Track API." 2014-06-20 21:00:34 +00:00
John Reck
4fb48d24bb Merge "Revert "API Review: Change View viewName attribute to transitionName."" 2014-06-23 14:51:00 +00:00
Elliott Hughes
0a4d4275a7 Track API. 
Change-Id: Iba80dfebe6f02ad1487d922c4c88042c34999528
 2014-06-22 18:27:56 -07:00
George Mount
7a73fda47d Merge "API Review: Change View viewName attribute to transitionName." 2014-06-21 03:15:09 +00:00
George Mount
125578a863 API Review: Change View viewName attribute to transitionName. 
Bug 15548520

Change-Id: I4009458d83dbffb20ff0100aaa42eea44d943378
 2014-06-20 11:01:01 -07:00
Andres Morales
d8cf53f87d Make unlock api take String instead of int codes 
int code method not exposed to third parties

Change-Id: I18ad0703be9d06664db3fd00a6435f789979fe73
 2014-06-20 16:13:16 -07:00
Jeff Tinker
6a9687109c Merge "Add diagnostic error code to MediaDrm IllegalStateExceptions" 2014-06-20 20:43:34 +00:00
Jeff Tinker
d712e1a387 Add diagnostic error code to MediaDrm IllegalStateExceptions 
bug: 13976775
Change-Id: I682dd66a79252a9ee030b3cab5deb350e653e933
 2014-06-20 13:41:30 -07:00
RoboErik
ef3c9e9b05 Add volume handling APIs to sessions 
This renames and moves the VolumeProvider and adds apis to
MediaController to get the current state of volume on a session and
to request changes to the volume.

Change-Id: I290e9efefb6676c805819a29e1d054c3192c6773
 2014-06-20 13:39:41 -07:00
George Mount
53ad2a15d5 Merge "Make public basic transitions." 2014-06-20 02:09:17 +00:00
George Mount
7da1f58219 Make public basic transitions. 
Bug 15727908

Adds slide, explode and fade transitions.

Change-Id: I8badb3a1e9230d66d9ca3d1edeec0510bc89d556
 2014-06-20 07:07:18 -07:00
Andres Morales
626861c5a5 Merge "Framework changes to support NFC trustlet." 2014-06-20 02:15:46 +00:00
Andres Morales
3b33fd283c Framework changes to support NFC trustlet. 
Adds a system-only ability to register for receiving
tags from NfcService at the lockscreen.

Change-Id: I4b50941031e8d1f40ebb6314211226e70a2ad187
 2014-06-20 10:05:52 -07:00
Eric Laurent
2930764885 Merge "AudioManager: add startBluetoothScoVirtualCall()" 2014-06-20 02:09:17 +00:00
Eric Laurent
83900754f3 AudioManager: add startBluetoothScoVirtualCall() 
Add API to start bluetooth SCO audio connection explicitly
in virtual call mode.

Bug: 11824396.
Change-Id: I1dfab13c659f5855e0b78467ac48b3186af7874c
 2014-06-20 10:17:47 -07:00
Yorke Lee
cf9bc5e76d Revert "Add ability to set and get DefaultPhoneApplication" 
This reverts commit 8bdb1ff3279ab9fde0499231580c76dc2533f3c4.

Change-Id: Idc6d64820c23a650e5f0113ed8ff0860c61ea6af
 2014-06-20 10:05:17 -07:00
Dianne Hackborn
9226fc9bf5 Fix build. 
Change-Id: I8b05b1dc4fdd0460c2dc92359b85d88b9f0f4f80
 2014-06-19 18:32:08 -07:00
Yuncheol Heo
3722c32860 Merge "Add a permission resource for the protected media id." 2014-06-19 23:04:31 +00:00
Yuncheol Heo
93415a2713 Add a permission resource for the protected media id. 
Matched Chromium change: http://crrev.com/309553004
> aw: Add ProtectedIdPermissionRequest.
>
> The DRM ID can be exploited to identify users. so the information
> should be handled under user's explict permission.
> This CL hooks up Chromium's permission request with Android Webview's
> permission mechanism.
>
> BUG=346841
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=276149

Bug: 11762354

Change-Id: Ife3c123ecca2c577ed1bc02a110b87618c6569cf
 2014-06-20 19:00:28 +09:00
Craig Mautner
9d4e9bcebb Allow a root activity to relinquish task identity 
If a an acitivty with attribute android:relinquishTaskIdentity true
is the root activity of a task then the intent of that task will
be that of the first activity in the stack with
android:relinquishTaskIdentity set false.

The ability to set intent also includes the ability to set the
TaskDescription of the task.

Fixes bug 15675610.
Fixes bug 10428661.

Change-Id: Ib28a9eae3b9832eeeef9106adbebe344184ee5ae
 2014-06-19 16:40:01 -07:00
Paul Soulos
42cdda831d Adds usage stat columns to Entity 
Change-Id: I273675ee85aba49440a494e4ae27e9104ffb2fe0
 2014-06-19 16:13:38 -07:00
Andy McFadden
45b161d24d Merge "Make two Display methods public" 2014-06-18 22:47:18 +00:00
Andy McFadden
77db7d09ff Make two Display methods public 
Un-hide getAppVsyncOffsetNanos() and getPresentationDeadlineNanos().

Bug 14612039

Change-Id: I76bee166b7bda3b96db36ffcb8d946d2b713ac09
 2014-06-18 10:45:27 -07:00
Robin Lee
aab72f3b0a Merge "Revert "Revert "Publish DevicePolicyManager CA certificate APIs""" 2014-06-17 21:55:55 +00:00
Robin Lee
306fe08ce2 Revert "Revert "Publish DevicePolicyManager CA certificate APIs"" 
This reverts commit 792b270dbdc980cfe04e8d461bf00a1f45b5e936.

Change-Id: I18c7e0eca39868230cd8e4f4bbeb3c44ff9e8b78
 2014-06-19 14:04:24 +00:00
Robin Lee
2b5e917026 Revert "Publish DevicePolicyManager CA certificate APIs" 
This reverts commit 5260bf69946563dc47c17e7441b352adfce384c5.

Change-Id: I5e44fdac8a7375576b25171f58e31a1fa0e3c569
 2014-06-17 22:12:28 +00:00
Kenny Guy
f7ecf7c805 Add badging a label to support accessibility. 
To provide a way to differntiate the content description
of an icon that has been badged with a managed profile
badge.

Bug: 15106236
Change-Id: Icd5798bbd2410a105054877e3862e199eff24b88
 2014-06-19 13:17:02 +01:00
Alan Viverette
29fa90490b Merge "Fix switch & slider anim, make View drawable hotspot API public" 2014-06-18 18:28:24 +00:00
Alan Viverette
8de1494557 Fix switch & slider anim, make View drawable hotspot API public 
BUG: 15287810
Change-Id: Ic7a9549dc1ba8afd07e9a196371ed349a54aaf2f
 2014-06-18 18:05:15 -07:00
ztenghui
cf4832f69c Add path support into xml files for PathInterpolator and ObjectAnimator. 
The test case is showing that AnimatedVectorDrawable is able to use path to
define time interpolator and object movement now.

Change-Id: If3c0418265d0fd762c8f5f0bb8c39cce3ad34ef3
 2014-06-19 10:56:28 -07:00
Eric Laurent
ff0d9f098e AudioTrack: Add support for compressed audio 
Add AudioFormat encoding definitions for compressed audio
and modify AudioTrack to accept compressed audio data.

Bug: 9428304.

Change-Id: Ib85a4d0d78af45924328f4d2d2ffebe83f4a00c5
 2014-06-19 10:13:33 -07:00
Ruben Brunk
8bf102b1d2 Merge "camera2: Add shim frame duration and stall characteristics." 2014-06-17 21:43:29 +00:00
Ruben Brunk
3e4fed203f camera2: Add shim frame duration and stall characteristics. 
Bug: 15116722
Change-Id: Ief8b05d46fa12f63cf6a5d41e312c94d5a033553
 2014-06-19 14:50:45 -07:00
Christopher Tate
9c46e06478 Merge "Introduce <application> attribute android:fullBackupOnly={boolean}" 2014-06-17 21:43:29 +00:00