140253 Commits

Author SHA1 Message Date
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
Cheuksan Wang
87487466af Add an API call to update the status of a pending outbound SMS message and
resend by PSTN if necessary.

Change-Id: Id847b182874bef057473acf293cee43d9d55f7ab
2014-06-19 18:51:13 -07:00
Winson Chung
89bb755aed Merge "Ensuring that we unload all resources after a transition." 2014-06-20 00:30:35 +00:00
Winson Chung
653b0d6a59 Ensuring that we unload all resources after a transition.
- Fixed case where we weren't deleting task data after it was removed via a package event
- Reducing time for dismiss button to appear
- Working around animation issue where we appear to see frames before the animation starts (perhaps it is posted now?)

Change-Id: I1dc0e203485f517e7384b0f7ee08979bfd286013
2014-06-20 19:03:16 -07:00
Ruben Brunk
5e6421bd8f Merge "camera2: Switch to using YV12 for ImageReader." 2014-06-20 20:43:34 +00:00
Ying Wang
7c0e6219c3 Fix build.
Change-Id: I2b161a4020862d83347d5a8989467c612fff08db
2014-06-20 17:30:45 -07:00
Dianne Hackborn
07f08d5043 Merge "Add some wifi tracking to battery stats." 2014-06-20 02:09:17 +00:00
Dan Albert
8b40ea5fc6 am 70c47d70: (-s ours) am a642a9ea: am d24f5577: Merge "Use openssl\'s SHA1 instead of bionic\'s."
* commit '70c47d70257bb9c448ef935c0c3ae7dfe2f9c07e':
  Use openssl's SHA1 instead of bionic's.
2014-06-20 23:21:52 +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
Chris Craik
3281442aa7 Merge "Wrap ViewGroup content in save/restore to protect composited children" 2014-06-20 02:09:17 +00:00
Chris Craik
80d4902196 Wrap ViewGroup content in save/restore to protect composited children
bug:15570351

Pos Z composited children are drawn before the primary restore for a
RenderNode. This means that without an additional save/restore (which
wraps the content) they aren't protected from transformations/clips
that happen within the ViewGroup's DisplayList.

Also changes RenderNode to use OpenGLRenderer tag for displaylist
dumping consistency, and simplifies the entry points into RenderNode
drawing, since the distinction between tree root vs tree internal is
no longer important.

Change-Id: I2621eba0592c74d71f85a91a4ab3d0da2d7468d3
2014-06-20 16:18:58 -07:00
Andres Morales
6ab7c1e7da Merge "Make unlock api take String instead of int codes" 2014-06-20 20:43:34 +00:00
smain@google.com
c9ec3277d5 am 02616aff: am 4d30b1e6: make buttons "primary" red
* commit '02616aff5acac6f12864716baaa8eab656367afa':
  make buttons "primary" red
2014-06-20 23:14:22 +00:00
smain@google.com
f91441849b am a787d796: am 78dfcb3a: Merge "revised homepage to use static version of top banner" into klp-modular-dev
* commit 'a787d796c254c615b6637b66e81d377dd8de203f':
  revised homepage to use static version of top banner
2014-06-20 23:14:17 +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
John Reck
07a9e2cb3c Merge "Fix alpha animations in ViewPropAnimRT" 2014-06-20 02:09:17 +00:00
Ji-Hwan Lee
1a9c812742 am f6f345cf: (-s ours) DO NOT MERGE: Use main looper for PackageMonitor
* commit 'f6f345cf42738d25348b0c96ec2483922ed9d6ec':
  DO NOT MERGE: Use main looper for PackageMonitor
2014-06-20 21:49:36 +00:00
Ji-Hwan Lee
80bec97846 am 8931c9c9: Register PackageMonitor when system services are ready
* commit '8931c9c9ec392a1f2a7e59a516714f86cf9569aa':
  Register PackageMonitor when system services are ready
2014-06-20 21:49:28 +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
Christopher Tate
ee4bd76a33 Merge "Fix BackgroundDexOptService scheduled job" 2014-06-20 20:43:34 +00:00
Christopher Tate
1b8b3aa265 Fix BackgroundDexOptService scheduled job
1) use the right package name in the ComponentName
2) use a unique-within-package job ID

Also put the full component name in dumpsys, not just the package name

Change-Id: Icf6edabf45573ba72a1adf86b6f83baba57fc593
2014-06-20 13:40:09 -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
Nicolas Prevot
1e2f374e71 Merge "Making more ContentProviders work across users." 2014-06-20 04:43:13 +00:00
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
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
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