109147 Commits

Author SHA1 Message Date
Craig Mautner
ac6f843c91 Fix home activity and user switch interactions.
- Make sure Home activity goes in the correct task and on the correct
stack.
- Do not allow different users to be in the same task.
- Do not set stacks aside for each user.

Fixes bug 9775492.

Change-Id: I0e7954e917aac8482a1015a36923e02914e2b692
2013-07-19 16:05:59 -07:00
Jeff Brown
350503fba3 Merge "Split framework jar." 2013-07-18 22:13:27 +00:00
Alan Viverette
f1f8f318bb Merge "Set transient state for focus container in ListView" 2013-07-18 22:06:22 +00:00
Eino-Ville Talvala
f889c84f42 Merge "Camera: Remove camera gid from apps with camera permission." 2013-07-18 18:51:33 +00:00
Justin Koh
152b69ada4 Merge "Add FX_KEYPRESS_INVALID constant to AudioManager." 2013-07-18 18:27:51 +00:00
Dianne Hackborn
20bf1225ae Merge "Switch Bundle's implementation over to ArrayMap." 2013-07-18 18:23:09 +00:00
Dianne Hackborn
fbf4ce04f1 Merge "Mmmmmmm... lovely, lovely ArrayMap." 2013-07-18 18:22:41 +00:00
Dianne Hackborn
add005cf94 Mmmmmmm... lovely, lovely ArrayMap.
And ArraySet, too.

Change-Id: I72ea28cbb2286b01b6e1be082f8e7ec17e99074e
2013-07-18 11:18:25 -07:00
Dianne Hackborn
06f2122050 Merge "Make it safe to use start/stop app ops outside of system proc" 2013-07-18 18:12:50 +00:00
Dianne Hackborn
b87655b3e5 Switch Bundle's implementation over to ArrayMap.
That was...  um...  easier than I thought it was going to be.

Change-Id: Id8f2211c1d5f8145e0bb009dca0f62a590f2b860
2013-07-18 11:10:29 -07:00
Amith Yamasani
485d16f62f Merge "Ignore list item clicks if PreferenceActivity is paused." 2013-07-18 18:00:53 +00:00
Justin Koh
cacfe69b68 Add FX_KEYPRESS_INVALID constant to AudioManager.
Add FX_KEYPRESS_INVALID constant to AudioManager. This is a sound which should
play if the user tries to click or press on an element which is disabled.

Change-Id: Idd8953abeddd1afb51f7f190f9fb612ef672defa
2013-07-18 10:46:19 -07:00
Elliott Hughes
4c8dfabff4 am e9643874: am 0bad5370: Merge "Handle missing and invalid numeric values in XmlUtils."
* commit 'e964387466e380f17e28ab3dd75139509d043ffd':
  Handle missing and invalid numeric values in XmlUtils.
2013-07-18 10:45:38 -07:00
Elliott Hughes
e964387466 am 0bad5370: Merge "Handle missing and invalid numeric values in XmlUtils."
* commit '0bad537093ed5b493e4c2af778cf802a2cf2c15f':
  Handle missing and invalid numeric values in XmlUtils.
2013-07-18 10:41:41 -07:00
Elliott Hughes
0bad537093 Merge "Handle missing and invalid numeric values in XmlUtils." 2013-07-18 17:38:57 +00:00
Alan Viverette
d44696c4cf Set transient state for focus container in ListView
BUG: 9860185
Change-Id: I0c7035e5992c56110a0cc5c94aa778bbb999deea
2013-07-18 10:37:15 -07:00
Amith Yamasani
49bdc1681e Ignore list item clicks if PreferenceActivity is paused.
Since list item clicks are delivered asynchronously, it's possible to
get click callbacks after the activity has already paused.

This should actually be blocked further up the event chain, ideally,
so that the list selection state is not out of sync with the application.

Bug: 9752185
Change-Id: I1058d64cba98e9093b462e2e581bdbccdace1420
2013-07-18 09:57:43 -07:00
Elliott Hughes
5bc32b347f am 03a152d7: am 15cb526e: Merge "Fix import after okhttp update."
* commit '03a152d7e72f05456a463f2709ce787119e86f03':
  Fix import after okhttp update.
2013-07-18 09:43:04 -07:00
Elliott Hughes
03a152d7e7 am 15cb526e: Merge "Fix import after okhttp update."
* commit '15cb526ece1420b1ae2061e20fd0982d82b41aae':
  Fix import after okhttp update.
2013-07-18 09:36:48 -07:00
Elliott Hughes
15cb526ece Merge "Fix import after okhttp update." 2013-07-18 16:33:41 +00:00
Eric Laurent
230e0120a4 Merge "Fix media server restart detection mechanism" 2013-07-18 16:12:59 +00:00
Eric Laurent
ca35e48234 Fix media server restart detection mechanism
There is a flaw in the mechanism used by AudioService
to detect the fact that mediaserver process did crash and restart.
It relies on polling AudioFlinger service until a successful
connection triggers a callback into AudioSystem JNI and then into AudioService.
But if another thread in system_server process, not attached to the
JNI environment, reconnects before AudioService, the callback is called in
a detached context and dropped.

The fix consists in attaching the thread executing the callback
and detaching it if needed.

Bug: 9693068.
Change-Id: I184308b12a3f87653bf818abf0159e0e45a66ef0
2013-07-18 09:10:56 -07:00
Narayan Kamath
c0bb16673e Fix import after okhttp update.
OkResponseCache moved packages in change
62321.

Change-Id: I2c08c4586405e767d1931ebc5f185c7916850fa1
2013-07-18 13:42:50 +01:00
Jeff Brown
5aa9064ef3 Split framework jar.
Change-Id: Ia4bcae15c029fd0efe01dd4527fa3d5b5367b6c8
2013-07-17 21:11:33 -07:00
Geremy Condra
3d2469d19d Merge "Move markSocketAsUser to the top of IConnectivityManager.aidl" 2013-07-18 02:16:35 +00:00
Dianne Hackborn
e98f5dbe6b Make it safe to use start/stop app ops outside of system proc
We now keep track of all of the active start operations per
non-system process, so they can be cleaned up if the process
goes away.

Change-Id: I9d05f1e0281c47dbe1213de014f0491f1359685c
2013-07-17 17:25:13 -07:00
Svetoslav
dc990e7c61 Merge "Tweak the print APIs." 2013-07-17 22:05:21 +00:00
Eino-Ville Talvala
b8dd91a6b2 Camera: Remove camera gid from apps with camera permission.
This gid is not needed by camera-using apps, since all camera access
is mediated by the camera service, which does not depend on gid for
permission checks.

Bug: 9904186
Change-Id: I859e6cabc905af9d98e2b09f5bbad086b5eb2b26
2013-07-17 22:00:02 +00:00
Svetoslav
6283608e0b Tweak the print APIs.
1. Adding bundle with metadata to PrintDocumentAdapter#onLayout
   with one key for now to specify whether this is for a preview.

2. Cleaned up docs.

Change-Id: I89380781bf3ae41aa89f8a0347d74516a210394c
2013-07-17 14:55:15 -07:00
Chet Haase
cdce4835fb Merge "Changed name of recent hasLayout() method to isLaidOut()" 2013-07-17 21:50:27 +00:00
Chet Haase
7a46dde1ae Changed name of recent hasLayout() method to isLaidOut()
This new method on view reflects whether the view has been laid out
at least once since it was attached. hasLayout() seems too vague for that
meaning; every View that has a parent has a layout (since we use container,
parent, and layout interchangeably). The new version of the method
is closer to the actual meaning.

Change-Id: I519745739b6a6317faeb077aa61f994025cf81f3
2013-07-17 10:22:53 -07:00
John Spurlock
209bede6b9 Remove trailing whitespace from system ui.
Baseline existing .java files, no excuses going forward.

Change-Id: I4bd0f25bbda6f2ec832e34ef5c70d4830bf07f99
2013-07-17 12:23:27 -04:00
Dianne Hackborn
4a8baef3f5 Merge "Make ArrayMap public! :)" 2013-07-17 00:53:33 +00:00
John Spurlock
332d84a567 Merge "Fix View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION." 2013-07-17 00:20:36 +00:00
Adam Powell
f52ae147fb am 42658ed5: am 30ad7203: Merge "Consider mScrollX when drawing the checkMarkDrawable"
* commit '42658ed5182a75b82dd2b970a1f97fc30407d1e3':
  Consider mScrollX when drawing the checkMarkDrawable
2013-07-16 17:12:49 -07:00
Dianne Hackborn
3e82ba1a67 Make ArrayMap public! :)
Also do some tweaking of the various container classes
to synchronize them with the support lib and make it
easier to copy code between the two.

And update activity/fragment to use ArrayMap.

Change-Id: I3cfe82392a17119dfc72c3d9961f64e1914f42be
2013-07-16 17:08:04 -07:00
Adam Powell
42658ed518 am 30ad7203: Merge "Consider mScrollX when drawing the checkMarkDrawable"
* commit '30ad720304790b07112b87f973a7e6ed5e1e6ee5':
  Consider mScrollX when drawing the checkMarkDrawable
2013-07-16 17:06:36 -07:00
Adam Powell
30ad720304 Merge "Consider mScrollX when drawing the checkMarkDrawable" 2013-07-17 00:04:28 +00:00
John Spurlock
7045aaa21e Fix View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION.
If a window's task stack has no sibling, restore old behavior
of allowing frame to go below the nav bar.

Bug:9884905
Change-Id: Ifc38901a6633cf431dba8740a65258d0618c0fd0
2013-07-16 19:42:23 -04:00
Romain Guy
af093fd414 Merge "Skip unnecessary measurements when possible" 2013-07-16 23:37:29 +00:00
Romain Guy
93c567cddc Skip unnecessary measurements when possible
This change introduces a new measure cache to View, to remember
the measured dimensions for previous pairs of measure specs. The
measure cache is cleared whenever a View requests layout.

Unfortunately some Views rely on measure being always called when
layout is invoked. To work around this problem, we need to remember
when we hit the measure cache to force a call to measure just prior
to calling onLayout(). This does not completely removes all measure
calls but enough to optimize a number of layouts.

Change-Id: Ie085fbcf186e9d7505e1127e0786a12968ebc344
2013-07-16 16:25:09 -07:00
Chris Craik
b3d8388822 Merge "Support stencil-based clipping for functors" 2013-07-16 22:43:02 +00:00
Jeff Brown
07c09ce248 Merge "Fix missing lock in power manager." 2013-07-16 22:28:31 +00:00
Romain Guy
775ffa78f3 Merge "Fix crashes in setMatrix() and concat()" 2013-07-16 22:27:04 +00:00
Jeff Brown
d91e417b06 Fix missing lock in power manager.
The display wake lock and other internal state could become
out of sync if we happened to execute the power manager's update
function concurrently due to the missing lock.

This bug can be trigged due to display state changes or proximity
sensor updated.  Although it would be extremely rare, we have
some evidence of this happening on at least a few devices resulting
in rapid power drain with the screen off or a crash.

Bug: 9880044
Change-Id: I3c674ce429621a50cbb36c3a01883d5f388205b2
2013-07-16 15:22:14 -07:00
Chet Haase
4a83804ddf Merge "Fix issues with delayed transitions" 2013-07-16 22:20:24 +00:00
Chet Haase
c43524f386 Fix issues with delayed transitions
Previously, there were two distinct problems with how delayed
transitions were being run:
- there would be a delay between the transition being put into
a preDrawListener (to be kicked off when that listener fired) and
being removed from the pending list. This allowed another delayed
transition to be run in parallel, which would cause conflicting/
clobbering issues with transition values on the same objects.
- there would be an extra frame delay in some cases due to how/when the
delayed transition would be started. Specfically, we would postOnAnimation()
to call a method that would then add the onPreDraw listener. This two-step
forwarding caused issues noted above.

The fix is to simply add the transition to the preDrawListener immediately, removing
the two-step problem, and also ensuring that the transition is only removed
from the pending list when it is actually started, which prevents other transitions
from starting in the meantime.

Also, added more debug logging to help chase future issues with transitions.

Change-Id: Ie2ff8e73d29f342512842e9641bd8d605e74544c
2013-07-16 14:55:26 -07:00
Romain Guy
4e7b772b73 Fix crashes in setMatrix() and concat()
setMatrix() was crashing in native code, only with hw acceleration on.
concat() would throw a NullPointerException. It now ignores null matrices.

Change-Id: Iebd8b410a957d2ba501570c6fbb3f680ff4a1a23
2013-07-16 14:52:55 -07:00
Craig Mautner
b48fe0ec5e Merge "Remove iterators." 2013-07-16 21:45:32 +00:00
Svetoslav
17b7f6e6d4 Clean up of the print APIs.
1. Fixed a case in which the onPrintCompleted callback may not be invoked.

2. Added string resulrces for the different error messages for failed
   printing in OnPrintCompletedCallback

3. Fixed the string comments for the MediaSize constants.

4. Added APIs to create certain print attributes by passing in a
   string label instead of resource and package name since in some cases
   a print service may be getting already internationalized lables
   or it may not know all possible values.

5. Fixed a crash in PrintJobConfigActivity if there is no input or
   output tray.

Change-Id: Ie877b7dc669051606394aa290e6d2b979a42db4c
2013-07-16 14:39:32 -07:00