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

53041 Commits

Author SHA1 Message Date
Michael Kolb
8dab261d81 am c6ffc840: am 270c099f: Merge "Move emulator check & save system properties access" into klp-modular-dev 
* commit 'c6ffc840c4e34a61b537e1fc3e90b111d4150244':
  Move emulator check & save system properties access
 2014-06-22 01:16:19 +00:00
Michael Kolb
c0fcf109f0 am 71f65485: am db9fed74: Merge "Make WindowInsets.isRound work with emulator" into klp-modular-dev 
* commit '71f65485bf47c8bfbae2b3a0a9573b311668b4a2':
  Make WindowInsets.isRound work with emulator
 2014-06-21 20:24:28 +00:00
Michael Kolb
c6ffc840c4 am 270c099f: Merge "Move emulator check & save system properties access" into klp-modular-dev 
* commit '270c099faf63868dcc21836a84de778337ff3be9':
  Move emulator check & save system properties access
 2014-06-21 20:15:47 +00:00
Michael Kolb
71f65485bf am db9fed74: Merge "Make WindowInsets.isRound work with emulator" into klp-modular-dev 
* commit 'db9fed74c2bbf97157683b47f3cbdcd04c729839':
  Make WindowInsets.isRound work with emulator
 2014-06-21 20:15:24 +00:00
Michael Kolb
437d31390b Make WindowInsets.isRound work with emulator 
Bug: 15775489

Change-Id: I53a14ccd3be776d46c9cea43c0d5d3f41674dd75
 2014-06-20 15:13:09 -07:00
Michael Kolb
22dfdcb7ee Move emulator check & save system properties access 
Bug: 15775489

Change-Id: I375aee36b212ae044101a65b65c51e6f889fd263
 2014-06-20 15:39:04 -07:00
Elliott Hughes
19597647f9 am ff6b0e24: am f1896106: Merge "Fixed VM memory leak in AudioSystem JNI interface" 
* commit 'ff6b0e24725c642f0681e214f143a8151e4e6bea':
  Fixed VM memory leak in AudioSystem JNI interface
 2014-06-20 16:34:36 +00:00
Elliott Hughes
f18961066b Merge "Fixed VM memory leak in AudioSystem JNI interface" 2014-06-20 02:09:57 +00:00
Ruben Brunk
5e6421bd8f Merge "camera2: Switch to using YV12 for ImageReader." 2014-06-20 20:43:34 +00:00
Ruben Brunk
91b9aabc9f camera2: Switch to using YV12 for ImageReader. 
Bug: 15116722

- Also fixes incorrect frame number for single captures.

Change-Id: I8552124d18ad176e6724f089a1e3a3f49a5eeec4
 2014-06-20 15:59:00 -07:00
Ruben Brunk
5776aafc7e camera2: Add AE antibanding + fps range metadata. 
Bug: 15116722
Change-Id: I627748e162f26c42f6bbcfc21ee4b1081e1f25ad
 2014-06-19 19:20:36 -07:00
Dianne Hackborn
07f08d5043 Merge "Add some wifi tracking to battery stats." 2014-06-20 02:09:17 +00:00
Dianne Hackborn
3251b90752 Add some wifi tracking to battery stats. 
Now track supplicant state and wifi signal strength.
Output looks like this:

         +12m45s235ms (1) 095 +wifi_full_lock +wifi_running wifi_signal_strength=3 wifi_suppl=scanning
         +12m46s095ms (1) 095 -wifi_full_lock wifi_suppl=associated
         +12m46s469ms (2) 095 wifi_suppl=completed +proc=u0a74:"com.google.android.videos"
         +12m52s103ms (1) 095 +wifi_full_lock wifi_suppl=disconn

Also modify history dump so that when we hit a RESET or START
command, we clear our previous history data, so the next event
will include new data.  This means if you are scanning through
the output, you must at this point clear any binary stats you
have like "running" or "wake_lock" or else you will continue to
think they are on until whatever point later they get turned on
and then back off.

And a small bug fix in proc stats that would cause the system
process to crash.

Change-Id: Ibec416a1ef786d428bd0d1d86e6e3296c41f7648
 2014-06-20 16:01:21 -07:00
Andres Morales
6ab7c1e7da Merge "Make unlock api take String instead of int codes" 2014-06-20 20:43:34 +00: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
ztenghui
02aefd779e Merge "AVD now support path morphing." 2014-06-20 02:09:17 +00:00
ztenghui
eb034fbca4 AVD now support path morphing. 
Basically extended the ValueAnimator to support a new type: pathType.
Add the PathDataEvaluator internally to interpolate path data.
Update test to show the path morphing.

Change-Id: I89db0199cbc12e3041790a6115f3f50b80213cdb
 2014-06-20 15:16:47 -07:00
John Reck
07a9e2cb3c Merge "Fix alpha animations in ViewPropAnimRT" 2014-06-20 02:09:17 +00:00
John Reck
44244ff7fe Fix alpha animations in ViewPropAnimRT 
Change-Id: Iffa0631b84070f12cf7b1a5e6db061c2afe7ca80
 2014-06-20 14:44:58 -07:00
John Reck
2218472d23 Re-enable ViewPropAnimRT 
Change-Id: I2f30547c4e2212747c479760dff4f3f901d1eaf3
 2014-06-20 14:05:51 -07:00
George Mount
9285d1bf9c Exclude views that aren't on screen from Activity Transitions. 
Bug 15704207

Change-Id: I114a5191536b5c59c6c2d1074fab8505a8ad2fdb
 2014-06-20 14:09:57 +00: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
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
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
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
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
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
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
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
Igor Murashkin
1788b0466b camera2: Shim fix hwLevel and minimumFocusDistance 
Change-Id: Ie4ab330a738ac4c8e465eacade1bbc39bdb776fe
 2014-06-20 13:45:46 -07:00
Eino-Ville Talvala
ee37e30c22 Camera2: Call onCaptureSequenceAborted when appropriate 
Bug: 15524101
Change-Id: I4615d0b4ae3cae80609586f7dfa8373691a9e384
 2014-06-20 17:24:40 +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
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