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

140131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Gampe
b325ce8203 Add a null check to UserAvatarView.setBitmap 
Adds a null check for the bitmap to set. Resets the paint's shader
in case of a null bitmap to release any previous image.

Change-Id: I1adf3c8ef44522a593fe3f25726b6c83120d7556
 2014-06-19 23:51:12 -07:00
Dianne Hackborn
5ff885cd3b Revert "Add support for tint attribute in VectorDrawable" 
This reverts commit ab41ea17e6b0407fa76bc9f9183190a9bbc7f560.

Was causing system UI to crash.
 2014-06-19 23:02:37 -07:00
Christopher Tate
85ef6ff60c Merge "Collapse a bunch of verbose boilerplate" 2014-06-20 02:09:17 +00:00
Christopher Tate
63d9ae1e75 Collapse a bunch of verbose boilerplate 
Objects.equals() is your friend!

Change-Id: I728bbff6c20309b42ec31f2d87748d9fa19aa00f
 2014-06-20 12:04:31 -07:00
Elliott Hughes
f44d499956 am 19597647: am ff6b0e24: am f1896106: Merge "Fixed VM memory leak in AudioSystem JNI interface" 
* commit '19597647f957c4f9755af2f405160f76460ca26d':
  Fixed VM memory leak in AudioSystem JNI interface
 2014-06-20 18:19:42 +00: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
Ruben Brunk
a783875420 Merge "camera2: Add AE antibanding + fps range metadata." 2014-06-20 02:04:45 +00:00
Igor Murashkin
e76e8bce93 Merge "camera2: Fix deadlocks in shim #close and make #testInvalidCapture pass" 2014-06-20 03:08:23 +00:00
Eric Laurent
1cff3844da update SCO audio test app 
Added test for startBluetoothScoVirtualCall()

Change-Id: I1b47b60a8c5fb0158d4e224252a9d511c612ca2f
 2014-06-20 17:49:06 +00:00
John Reck
0916423712 Merge "Add negative guard" 2014-06-20 02:04:45 +00:00
John Reck
7aab5a1f9f Add negative guard 
Bug: 15631600

Change-Id: Idd7740f58876e73694fafb8ef55ebaff511f6dca
 2014-06-20 09:59:56 -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
4d9950d13a Merge "Revert "Add ability to set and get DefaultPhoneApplication"" 2014-06-20 02:09:17 +00: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
RoboErik
60c958cd9f Merge "Remove dead code from keyguard" 2014-06-20 02:09:17 +00:00
Igor Murashkin
49b2b13510 camera2: Fix deadlocks in shim #close and make #testInvalidCapture pass 
* Also fixes configureOutputs to allow it to unconfigure
* Adds IAE checks in a few spots to validate surfaces aren't null

Bug: 15116722
Change-Id: I9ec88bccb3600eb12747d84436ead27952e87646
 2014-06-19 17:36:07 -07:00
Selim Cinek
89faff1dac Closing the QS when tapping on the notifications now. 
Bug: 15394230
Change-Id: Ib9f750db69529afc0d56685fb88a13d183b0d3d5
 2014-06-20 00:27:37 +00:00
Baligh Uddin
0b1db563d4 Import translations. DO NOT MERGE 
Change-Id: I2870034a45b585ddd84a1d35a0efdd99f1dcd1d8
Auto-generated-cl: translation import
 2014-06-19 17:24:40 -07:00
Craig Mautner
90c9fffc95 Merge "Do not delete stack if empty task is being reused." into klp-modular-dev 2014-06-20 00:24:32 +00:00
Craig Mautner
362449af58 Do not delete stack if empty task is being reused. 
If a task is being cleared due to Intent flags and that clearing
was causing the last activity in the last task on a stack to be
deleted, then we were deleting the stack. Immediately after
this we were refilling the task with the same activity but the
stack had already been deleted.

This fix preserves the task and stack when it is only being
cleared for the new activity.

Fixes bug 15611901.

Change-Id: I7bcfa826d0852d9c640daa73fe1324b89471fecd
 2014-06-20 14:04:39 -07:00
Joe Fernandez
2d7b3dedd0 Merge "ExoPlayer developer guide" into klp-docs 2014-06-20 00:24:32 +00:00
Joe Fernandez
afe3bb96f2 ExoPlayer developer guide 
Change-Id: Icacaa0e68e602fc77946e10729b3649baaf4331b
 2014-06-20 14:28:54 -07:00
Jason Monk
858aef2942 Merge "Add lock-to-app mode" 2014-06-20 00:24:32 +00:00
Jason Monk
62515beee6 Add lock-to-app mode 
Added a dialog that shows when app has not been authorized by
DevicePolicyManager.isLockTaskAuthorized.  This allows any app
to trigger lock-to-app mode.  This same dialog is used when
startLockTaskOnCurrent is triggered by the recents long-press.

Can exit the mode by long-pressing recents again.

Keyguard is disabled when lock-to-app is active.

This CL also prevents apps from finishing when they are the root
task in a lock task TaskRecord.

Change-Id: Ib54d858e570cccf6bfd986958868e15f49bcef75
 2014-06-20 16:17:38 -04:00
Alan Viverette
a8ac5fb6c3 Merge "Add support for tint attribute in VectorDrawable" 2014-06-20 02:09:17 +00:00
Alan Viverette
9cd14fc710 Add support for tint attribute in VectorDrawable 
Fixes NPE from previous change. Also fixes docs reference in TypedArray.

BUG: 15375203
Change-Id: Icf3b5759780276b0875a4fb70b29522ab7c8cb90
 2014-06-20 14:45:11 -07:00
Dianne Hackborn
a427fcf2cb Merge "Fix issue #15689396: pre-installed DemoAPI tests fail..." 2014-06-20 02:15:46 +00:00
Dianne Hackborn
b65ea7bfc6 Fix issue #15689396: pre-installed DemoAPI tests fail... 
...with a NPE on emulators running Google x86 API 19 image

Change-Id: Ib989127f48b0c02ec645b99827a9b775188684d8
 2014-06-20 12:18:55 -07:00
Mike Reed
402c8f5a07 Merge "stop using (deprecated) SkBitmap::Config" 2014-06-20 00:30:35 +00:00
Mike Reed
b933055cf3 stop using (deprecated) SkBitmap::Config 
Change-Id: Ic75b5fc6996578e9d95bd3a220439ec1541d7c3b
 2014-06-20 10:28:37 -04:00
Jeff Brown
af861ab879 Merge "Perform haptic feedback for wake gesture." 2014-06-20 02:04:45 +00:00
Craig Mautner
5c99167634 Merge "Fix index out of bounds exception" 2014-06-20 00:24:32 +00:00
Craig Mautner
4132620f92 Fix index out of bounds exception 
When removing the last activity in a stack.

Fixes bug 15776859.

Change-Id: Id507aa7864482ff1ff769833445d937b19de2bcd
 2014-06-20 14:38:21 -07:00
Igor Murashkin
60679f6b7d Merge "camera: Get detailed error reporting from api1 Camera if open fails" 2014-06-20 18:26:34 +00:00
Igor Murashkin
a1d662716b camera: Get detailed error reporting from api1 Camera if open fails 
* Also maps camera2 open errors the same for shim/nonshim paths

Change-Id: I08d9d1e30e72025c41bd54b702d7ae95b32257be
 2014-06-20 11:26:39 -07:00
John Reck
b127713b58 Merge "Re-enable ViewPropAnimRT" 2014-06-20 02:09:17 +00:00
Eino-Ville Talvala
15d0f97473 Merge "Camera2: Call onCaptureSequenceAborted when appropriate" 2014-06-20 02:04:45 +00:00
Jeff Tinker
6a9687109c Merge "Add diagnostic error code to MediaDrm IllegalStateExceptions" 2014-06-20 20:43:34 +00:00
RoboErik
726735586c Merge "Add volume handling APIs to sessions" 2014-06-20 20:43:34 +00:00
Igor Murashkin
1788b0466b camera2: Shim fix hwLevel and minimumFocusDistance 
Change-Id: Ie4ab330a738ac4c8e465eacade1bbc39bdb776fe
 2014-06-20 13:45:46 -07: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
Eino-Ville Talvala
ee37e30c22 Camera2: Call onCaptureSequenceAborted when appropriate 
Bug: 15524101
Change-Id: I4615d0b4ae3cae80609586f7dfa8373691a9e384
 2014-06-20 17:24:40 +00:00
Yorke Lee
eff9661b2a Merge "Revert "Add getSystemPhoneApplication to TelecommManager"" 2014-06-20 00:24:32 +00:00
John Spurlock
ffb9439172 Merge "If we're not showing switch text, don't include in measure." 2014-06-20 00:24:32 +00:00
John Spurlock
e599488968 If we're not showing switch text, don't include in measure. 
Naive fix for switch crashes when !showText.

Bug:15770311
Change-Id: I68839b61b907d62159e2c12349005683e9ac6436
 2014-06-20 10:53:54 -04:00