Commit Graph

37941 Commits

Author SHA1 Message Date
Ang Li
707fd39f8b Fix comment for sendData.
Merging kwd commit dfb40d5c51411b0d10ec22a9af283f349d8904d7
Change-Id: I5f3c16f3e99dce8bbb0011af3322ce3e6487d6d9
2014-06-25 13:45:42 -07:00
Ruben Brunk
ef14da3280 camera2: Fix handling for abandoned bufferqueues.
Bug: 15116722

- Adds exception handling utility for legacy device.
- Skip/ignore abandoned surfaces in legacy camera.

Change-Id: Id4de587779d3bc2415e22b10bcc841cc46ac5f1d
2014-06-25 13:00:50 -07:00
George Mount
bcd8365197 Merge "Activity Transitions: Don't do a shared element exit transition twice." 2014-06-25 17:34:05 +00:00
George Mount
1677b6b830 Merge "Activity Transitions: Fix memory leak." 2014-06-25 17:34:02 +00:00
George Mount
5770f18e82 Merge "Activity Transitions: don't require transitionName." 2014-06-25 17:34:07 +00:00
Lorenzo Colitti
64c43b1948 Minor changes to RouteInfo.
1. Realize that mDestination can never be null and update the
   code accordingly.
2. Simplify isDefaultRoute.
3. Provide two new hidden utility methods, isIPv4Default() and
   isIPv6Default(), that can be used by LinkProperties to
   to determine if the system has connectivity.
4. Update tests.

Bug: 9180552
Change-Id: I85028d50556c888261d250925962bdedfe08e0c6
2014-06-25 18:22:12 +00:00
George Mount
88f5993692 Merge "Allow custom transitions from XML." 2014-06-25 03:44:18 +00:00
George Mount
f451d8a6d1 Activity Transitions: Don't do a shared element exit transition twice.
Bug 15671433

Change-Id: I888702df5661c769cc1c093d859fd85e5e33d282
2014-06-24 06:57:08 -07:00
George Mount
a0a0260e48 Activity Transitions: Fix memory leak.
Bug 15731459

Change-Id: Id357d841a0db832e2525b7bbd75c8d8ccdb757d1
2014-06-24 06:39:29 -07:00
Christoph Studer
13a11d8ead Merge "Remove ZEN notification visibility setting" 2014-06-24 06:38:52 +00:00
Christoph Studer
d1b67bcd4e Remove ZEN notification visibility setting
Bug: 15286335
Change-Id: I150b13c6c7272db596bee908822760f1fd82b7ed
2014-06-24 18:37:19 +02:00
Alexandra Gherghina
d4ee3952a3 Merge "Skip forwarding launcher intents" 2014-06-24 06:38:52 +00:00
Alexandra Gherghina
fa4533f3a0 Skip forwarding launcher intents
If we forward intents when looking up launcher icons, we end up
having an icon for a disambig activity instead of the apps for that user.

Bug: 15769854
Change-Id: Ia57525466dba57b6669b2b5cedf98f202d08f586
2014-06-24 19:25:15 +01:00
George Mount
1fecfb2ddc Activity Transitions: don't require transitionName.
Bug 15585623
Bug 15607591

Exit transitions now run because exit transitions are executed
with startActivity.

Change-Id: Ie55793a9514c64d96e2cf1abdd2d39c4d2606a23
2014-06-23 17:06:13 -07:00
Bo Liu
bbc9cd32d7 Merge "Remove View.executeHardwareAction" 2014-06-23 21:56:00 +00:00
Bo Liu
26cab31d78 Remove View.executeHardwareAction
Webview does not need this anymore.

BUG: 13961296
Change-Id: Ia0681dea35155513b916844ecf83faf6d544a2e3
2014-06-23 14:57:19 -07:00
Adam Powell
755c919ba2 Merge "Set the default content description for Toolbars acting as action bars" 2014-06-23 21:50:10 +00:00
Adam Powell
7901b2a549 Set the default content description for Toolbars acting as action bars
Bug 15814044

Change-Id: I07c20de1349cb07f21eaf0db718da94c0ba7043d
2014-06-24 17:32:06 -07:00
Adam Powell
4212d1f2e9 Merge "Inflate fragments from layout into child FragmentManagers" 2014-06-23 21:50:10 +00:00
Adam Powell
371a809179 Inflate fragments from layout into child FragmentManagers
Previously, if an app inflated a layout in a Fragment's onCreateView
that itself had fragments included, those fragments would be added to
the Activity-level FragmentManager and would not share the same
lifecycle with the fragment it was inflated for. This led to some
nasty management headaches.

If an app targets L or above, add the fragment to the child
FragmentManager of the current fragment when inflated using the
LayoutInflater passed to the parent fragment.

Bug 12763389

Change-Id: Iad4ed7d5df602aea9579bf1503e206fa894630c1
2014-06-24 12:29:32 -07:00
Igor Murashkin
5096defdaa camera2: (legacy) Write the JPEG size as part of the blob transport
This fixes StillCaptureTest#testStillPreviewCombination

Change-Id: Ifbaae7828b2efcc1a768c77ce50718abd7f691d0
2014-06-24 18:29:18 +00:00
Igor Murashkin
a296fece2b camera2: Fix cts test StillCaptureTest#testTakePicture
* Introduce 'fake' metadata for 3A+flash (hardcoded to support nothing)
(will be removed in a later release)

* Open the camera1 device in its own thread, so that the looper it
captures is also our own (and not the main looper)

* Set the picture size based on the size of the JPEG surface outputs

Change-Id: Iaeb5031c6b352115b73d2261a39d65347d75fdc8
2014-06-24 10:56:26 -07:00
Yigit Boyar
e8c8617c28 Merge "Clone animators before running in StateListAnimator" 2014-06-23 21:50:10 +00:00
Jason Monk
7218e9c6be Merge "The profile owner shouldn't control lock task" 2014-06-24 07:59:24 +00:00
Jason Monk
c5185f2bf1 The profile owner shouldn't control lock task
Since managed profiles are started on bootup, the managed profile
would be allowed to set an app (possibly itself) as a lock task
app and then run itself on bootup and constantly control the
device.  This privelege should be restricted to device owners.

Change-Id: I4a93aabd6054cbe75076ef0517fce03ffa74dc93
2014-06-24 14:12:20 -04:00
Robert Greenwalt
33b825cd1a Merge "Add logging to track down weird ConnectivityManager issue." 2014-06-23 21:44:43 +00:00
Marco Nelissen
d3afc9c1d8 am 909a1b2e: am c4d37f58: am 0eee8ac2: Merge "Fix thumbnail bug"
* commit '909a1b2e73efdb592b5a8f2c2e786f4c6c4bad14':
  Fix thumbnail bug
2014-06-23 22:40:28 +00:00
Robert Greenwalt
257ee5fa6f Add logging to track down weird ConnectivityManager issue.
bug:15771399
Change-Id: I0a7150286f94262414005298e6f038f278347a7c
2014-06-23 15:33:40 -07:00
Marco Nelissen
909a1b2e73 am c4d37f58: am 0eee8ac2: Merge "Fix thumbnail bug"
* commit 'c4d37f58a1b5405812eaf96b4bd3a051d86884eb':
  Fix thumbnail bug
2014-06-23 21:51:38 +00:00
George Mount
16ffa8d3ef Merge "Use Property for ofFloat with Path." 2014-06-23 21:44:43 +00:00
Narayan Kamath
b3af535ade resolved conflicts for merge of 816cff12 to master
Change-Id: I33990232771138dcf91f55c7cde6bbfe40612b8f
2014-06-24 13:02:49 +01:00
Chris Wren
9856739cb0 am 7d165c5d: Update javadocs for heads up behavior.
* commit '7d165c5d59b6afb6aa66999ff76b79c8017ad09a':
  Update javadocs for heads up behavior.
2014-06-24 10:33:07 +00:00
Narayan Kamath
816cff12e1 am c141ae54: am 989ab6d3: Merge "Update javadoc for android.os.Bundle."
* commit 'c141ae547e9b295ce9013591a6fbb902b0e40073':
  Update javadoc for android.os.Bundle.
2014-06-24 10:18:23 +00:00
Narayan Kamath
c141ae547e am 989ab6d3: Merge "Update javadoc for android.os.Bundle."
* commit '989ab6d38d77c0a1f7dc5e648e1950410d5d01d4':
  Update javadoc for android.os.Bundle.
2014-06-24 10:08:52 +00:00
Narayan Kamath
989ab6d38d Merge "Update javadoc for android.os.Bundle." 2014-06-24 06:22:45 +00:00
Amith Yamasani
0c416391d3 New setting to suggest skipping first-use hints to users
Useful for temporary users like guests

Change-Id: I3799dbe46c0f153139540254c9fb023c4e7e05af
2014-06-24 06:00:00 +00:00
George Mount
f505b1f08d Use Property for ofFloat with Path.
Bug 15827972

Change-Id: I8917f7ab0df9709c11ae38e89af6b603ec76d430
2014-06-24 00:00:16 +00:00
Robert Greenwalt
0b57289678 Merge "DO NOT MERGE refactor wifi p2p's startDhcpServer function" 2014-06-23 21:56:07 +00:00
John Reck
cd028f336e Fix contants; RT-enable WebView pt2
Bug: 15838537

 * Fix kSync_UIRedrawRequired constant value (woops)
 * Tell CanvasContext that WebView is now rt-safe

Change-Id: Idf15cf21115c2ca24b8ccd00025e8502864cd87c
2014-06-24 08:44:29 -07:00
John Reck
6b39324d77 Merge "No-fail invokeFunctor" 2014-06-23 21:44:43 +00:00
John Reck
3b20251a35 No-fail invokeFunctor
Bug: 15513308
 Bug: 15449247

Change-Id: I13a29f9c8d4975cdda6dcb33b6332c2555ff0f7c
2014-06-23 15:26:49 -07:00
Adam Powell
287c036187 Compatibility shim for apps calling View methods with TypedArray params
Apps calling the View methods that accept TypedArray params have
always been wrong. There is no way to call these methods safely since
apps can't get at the correct filter array assumed in these methods'
implementations. Do the best we can with these calls anyway; ignore
whatever they did pass and just get the styled attributes from the
Context used to construct the view and its associated theme.

Bug 15792674

Change-Id: I6dfa1abf273b581e79a17a72f68c97ff9a9148c5
2014-06-23 15:18:28 -07:00
Fabrice Di Meglio
5f9f6c3936 Fix PreferenceGroupAdapter highlight code path
- do not change the Preference View background. Instead wrap
the Preference View into a FrameLayout with the highlighting
Drawable as the background
- test the View type to force the Preference View creation and
not rely on the convert View when highlighting
- define a new View type for the highlighting
- increment getViewTypeCount() returned value (for the new type)

Change-Id: Ie5f19311e11545aba848fd637ec61e43071d8dcf
2014-06-23 18:47:26 -07:00
Craig Mautner
43015f241e Merge "Return to recents when coming from recents" 2014-06-23 21:44:43 +00:00
Craig Mautner
84984faf53 Return to recents when coming from recents
If a task is launched from recents then backing all the way
out of the task will return you to recents. Entering the task
in any other way (home, another activity, nav bar) will reset
this behavior.

Fixes bug 15703876.

Change-Id: I98dc36e4dbcb238d59e2175832076de7225bfdd9
2014-06-23 15:04:23 -07:00
Craig Mautner
13f6ea78b0 Avoid unnecessary timeouts.
And fix a couple of other inefficiencies.

Fixes bug 15444410.

Change-Id: Idad95d4e4d70bc7d2965e1bd6ff3d3135b73dd9c
2014-06-23 15:01:27 -07:00
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