84012 Commits

Author SHA1 Message Date
Svetoslav Ganov
662538957f Scaling in viewport moving state locks into a magnified state.
1. If the user changes the magnification level while moving the
   viewport the magnification is locked. The gesture handle has
   to put device back into a viewport moving state if this was
   the last state.

bug:7139363

Change-Id: I24992b973bb15624580114353b004efdb35c2faa
2012-09-10 16:41:07 -07:00
John Reck
bdf8fa0c1b Merge "Fix some destroy bugs" into jb-mr1-dev 2012-09-10 16:30:19 -07:00
Scott Main
4899d6f7cc am cd3ec7a2: am e9e40b43: Merge "add link to device dock lesson" into jb-dev
* commit 'cd3ec7a251443db258008f913b856c05b2232478':
  add link to device dock lesson
2012-09-10 16:29:04 -07:00
Scott Main
cd3ec7a251 am e9e40b43: Merge "add link to device dock lesson" into jb-dev
* commit 'e9e40b438e0a9c30df5834cf7f8f069b20789c76':
  add link to device dock lesson
2012-09-10 16:27:58 -07:00
Katie McCormick
a25526ae40 am 51740d6d: am 0e9f34bf: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
* commit '51740d6d786bf583cd46d12beb8515aa00d84bee':
  Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
2012-09-10 16:27:20 -07:00
Scott Main
e9e40b438e Merge "add link to device dock lesson" into jb-dev 2012-09-10 16:26:47 -07:00
Katie McCormick
51740d6d78 am 0e9f34bf: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
* commit '0e9f34bffdfc476122337d077453f722fc22038f':
  Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
2012-09-10 16:25:17 -07:00
Katie McCormick
0e9f34bffd Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
Change-Id: I62def95b138282eba4f2e70fd4ab4de35aa03e89
2012-09-10 16:20:20 -07:00
Scott Main
c73d67f3f1 add link to device dock lesson
Change-Id: I7af36f89204d49f2a0a23c33376f2f343f3b1593
2012-09-10 16:20:08 -07:00
John Reck
095e8aa02b Fix some destroy bugs
Bug: 6961494
 Don't call clearHelpers in destroy(). It is already called
 in onDetach, which is where it needs to be. It can't be
 called by the finalizer

 Switch onCancel listener to onDismiss listener. Fixes an issue
 where destroying can live the webcore thread hung because onCancel
 won't be called, but onDismiss is

Change-Id: I669c389c8c9a81d92c27f88d83bcb711c6c0a5ee
2012-09-10 16:07:04 -07:00
Svetoslav Ganov
e35c54eb14 Merge "Allow simultaneous scale and pan in magnified state." into jb-mr1-dev 2012-09-10 16:03:11 -07:00
Siva Velusamy
bc91c5f8b1 Merge "Report the user id of every app to ddms." into jb-mr1-dev 2012-09-10 15:59:36 -07:00
Svetoslav Ganov
6d04712d15 Allow simultaneous scale and pan in magnified state.
1. Before in magnified state the user was able to only scale or
   pan. Based on user input this change allows performing pan
   or scale or both. If the user scales more than a threshold
   we are performing a scale and independently of that if the
   use pans more than a threshold we are performing a pan.

bug:7138928

Change-Id: Ic1511500ba3369091dcfd070669d3e4f0286fbe5
2012-09-10 15:57:13 -07:00
Dianne Hackborn
009ea5a04c Merge "USER_CURRENT_OR_SELF had the same int as USER_CURRENT!" into jb-mr1-dev 2012-09-10 15:49:59 -07:00
Dianne Hackborn
4573e29faf Merge "Flesh out multi-user in am commands." into jb-mr1-dev 2012-09-10 15:39:02 -07:00
Dianne Hackborn
8a9f5d42a5 USER_CURRENT_OR_SELF had the same int as USER_CURRENT!
Change-Id: I0f2b0fa4fb82d1f871450b509a7a4d13e9817320
2012-09-10 15:37:53 -07:00
Dianne Hackborn
1676c856d6 Flesh out multi-user in am commands.
Now we default to the current user instead of user 0 for most commands
(except where we can do the command for all users).

Many more commands take a user argument: force-stop, kill, profile,
dumpheap.

Improved help text.

Change-Id: I719a13b4d31b668f57ca21e51d7043ac3e0d4e1b
2012-09-10 14:52:30 -07:00
Siva Velusamy
d693dfa75b Report the user id of every app to ddms.
This CL extends the HELO and APNM packets to include the user id
of the application. This allows ddms users to differentiate between
the same app running for multiple users.

Bug 7110696.

Change-Id: I490d0e3781b8fb9db65cf81188677a0955650511
2012-09-10 14:44:38 -07:00
Victoria Lease
d7f5a51baf Merge "IME support for trackball and generic motion events" into jb-mr1-dev 2012-09-10 14:12:48 -07:00
Victoria Lease
b38070caa5 IME support for trackball and generic motion events
Trackball and generic motion events now pass through the IME in case
it would like to handle them before passing them on to the view
hierarchy.

While I was at it, I also...
...fixed the documentation on InputMethodService.onKeyUp()
...added documentation to InputMethodService.onTrackballEvent()
...added trackball and generic motion events to the "input" command
...fixed input consistency verification involving ACTION_OUTSIDE

Bug: 7050005
Change-Id: I40ab68df4a9542af6df25de6ec2ec500e4c02902
2012-09-10 14:01:42 -07:00
Chet Haase
e11dc0ddab Merge "Fix clone() for Animators with just a 'to' value" into jb-mr1-dev 2012-09-10 13:56:47 -07:00
Chet Haase
00177e483d Fix clone() for Animators with just a 'to' value
Previously, clone() on an Animator with only one value would mistakenly
think that the clone had a real starting value (which would end up being 0 in the
int and float cases). Fix is to set the 'mHasFirstValue' flag appropriately for the
clone, based on the state of the cloned animator.

Issue #7106442 ObjectAnimator.clone() does not work properly for single parameter

Change-Id: I08bf03b7687a65eb613c1671a58e4cbfae66a30e
2012-09-10 13:42:07 -07:00
Jamie Gennis
cae2e3887d Merge "SurfaceTexture: add updateTexImage synchronization" into jb-mr1-dev 2012-09-10 13:31:39 -07:00
Andreas Huber
dcc036c544 Merge "Fix port logic in WifiDisplayController." into jb-mr1-dev 2012-09-10 11:41:23 -07:00
Andreas Huber
5e0cc0d7ab Fix port logic in WifiDisplayController.
It's not the port advertised in the sink's wfd IE, it's the one our
source broadcasts in its wfd IE. In addition some dongles ignore the
broadcast port and have to be special cased.

Change-Id: Id5d279652e336391ba34dfc30bba700043d49b1d
2012-09-10 11:35:15 -07:00
Svetoslav Ganov
1434e29ac6 Merge "Check for null ViewRootImpl when saving accessibility focus in ListView." into jb-mr1-dev 2012-09-10 11:31:01 -07:00
Chet Haase
562af68f45 Merge "Reset GL buffer state after functor invocation" into jb-mr1-dev 2012-09-10 11:17:54 -07:00
Baligh Uddin
996be34081 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-10 11:13:44 -07:00
alanv
27093def8d Check for null ViewRootImpl when saving accessibility focus in ListView.
Bug: 7135071
Change-Id: Ide8b6af38b7f1b9bb809e4f8b1c933cb5ddb5e86
2012-09-10 11:10:25 -07:00
John Spurlock
2323ec7ee1 Merge "Notifications: Hide ticker updates from background users." into jb-mr1-dev 2012-09-10 11:07:21 -07:00
Svetoslav Ganov
7e8f6c4cef Merge "Improve scaling vs pan in screen magnifier." into jb-mr1-dev 2012-09-10 10:54:26 -07:00
Svetoslav Ganov
0c381504a8 Improve scaling vs pan in screen magnifier.
1. Due to frequent changes of the behavior of ScaleGestureDetector
   this patch rolls in a gesture detector used for changing the
   screen magnification level. It has an improved algorithm which
   uses the diameter of min circle around the points as the span, the
   center of this circle as the focal point, and the average slop
   of the lines from each pointer to the center to determine the
   angle of the diameter used when computing the span x and y.

Change-Id: I5cee8dba84032a0702016b8f9632f78139024bbe
2012-09-10 10:49:04 -07:00
Baligh Uddin
7c07cdd668 Import translations. DO NOT MERGE
Change-Id: I2996f36103f8089ab115bc87c175d4c1ca6e4625
Auto-generated-cl: translation import
2012-09-10 10:44:19 -07:00
Amith Yamasani
3c1a201187 Merge "Fix DevicePolicyManager crash when settings password quality (and possibly others)." into jb-mr1-dev 2012-09-10 10:27:13 -07:00
Amith Yamasani
b7a685978f Fix DevicePolicyManager crash when settings password quality (and possibly others).
Bug: 7130570

Clear the calling identity before broadcasting to all users.

Change-Id: Ibe84af1ee00aecfe4b2d5bb7731a952f617b4885
2012-09-10 10:24:36 -07:00
Chet Haase
beb8bd0db2 Reset GL buffer state after functor invocation
Functors in WebView were binding to different buffers than we
assumed in the toolkit, eventually causing a crash due to improper
dereferencing in the currently bound buffer. Fix is to reset state
after invoking functors.

Issue #6666279 Native crash in Currents, mostly on Nakasi

Change-Id: I3697812d83613fffc9193daa99beea4dbf26474a
2012-09-10 08:56:55 -07:00
John Spurlock
61e36836b7 Notifications: Hide ticker updates from background users.
We should only update the notification ticker area when
the notification is for the current user.

Bug:6924835
Change-Id: Ieaccbd8c972b3d0f62c74d29d42e0fa77ec3148c
2012-09-10 09:43:27 -04:00
Wu-cheng Li
753e1280cb Merge "Unhide INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE." into jb-mr1-dev 2012-09-10 00:48:26 -07:00
Irfan Sheriff
799553e02a Merge "Fix device list update" into jb-mr1-dev 2012-09-10 00:36:17 -07:00
Irfan Sheriff
e298d88458 Fix device list update
Change-Id: I6a57d90f3750590db4ac5d538956b989d9589501
2012-09-10 00:34:26 -07:00
Wu-cheng Li
41bd89f6b6 Merge "Pass EXCLUDE_FROM_RECENTS when starting secure camera." into jb-mr1-dev 2012-09-09 23:39:36 -07:00
Dianne Hackborn
01a7c79dda Merge "Various fixes." into jb-mr1-dev 2012-09-09 18:19:50 -07:00
Dianne Hackborn
2d1b378191 Various fixes.
Bug #7132226: Can't start instrumentation due to ActivityManagerService crash
Bug #6912004: tap on gmail notification sends me to home screen

Change-Id: I824128b01f368de95dee288f8e49039b84479a7e
2012-09-09 18:14:32 -07:00
Jamie Gennis
f09263e957 SurfaceTexture: add updateTexImage synchronization
This change makes the SurfaceTexture JNI updateTexImage call the native
SurfaceTexture's doGLFenceWait method to perform the needed synchronization.

Change-Id: Ie70a1fe6b44d439d1ffe7b97689a421ff8c02fda
2012-09-09 17:53:27 -07:00
Jeff Brown
3e6d426d8d Merge "Handle case where user info might not be available." into jb-mr1-dev 2012-09-09 17:31:01 -07:00
Jeff Brown
7a8cce3d8a Handle case where user info might not be available.
The CursorLoader can return a null cursor if the query
failed for some reason.  This may happen in certain states
where the provider is not available.

Bug: 7133411
Change-Id: Id7b383bca45a61bc8726ba9f6115cbbc07e5d0b4
2012-09-09 17:26:50 -07:00
Irfan Sheriff
ab603ace22 Merge "Update WifiP2pWfdDevInfo from device found event" into jb-mr1-dev 2012-09-09 17:16:35 -07:00
Irfan Sheriff
1f6d870691 Update WifiP2pWfdDevInfo from device found event
Change-Id: I197e84e16147d3db7362e3d6d169ff917c112de2
2012-09-09 17:10:47 -07:00
Elliott Hughes
e3e5349874 am 61d09810: am 3150feef: am bfe1ab82: Merge "Fix aapt to get expat header files from the approved location."
* commit '61d09810a7b478810adc15af2495136255377e25':
  Fix aapt to get expat header files from the approved location.
2012-09-09 16:13:11 -07:00
Elliott Hughes
61d09810a7 am 3150feef: am bfe1ab82: Merge "Fix aapt to get expat header files from the approved location."
* commit '3150feef0b27ad34370904eb12875805f6c84e8a':
  Fix aapt to get expat header files from the approved location.
2012-09-09 16:11:04 -07:00