28335 Commits

Author SHA1 Message Date
Elliott Hughes
6c8cd01ad5 am c22657f8: am 3f5778c8: Merge "Fix incorrect FloatMath documentation."
* commit 'c22657f8b1e3b9198f1e7795a06a6f59b5cd9c80':
  Fix incorrect FloatMath documentation.
2013-02-26 18:04:35 +00:00
Elliott Hughes
3f5778c858 Merge "Fix incorrect FloatMath documentation." 2013-02-26 17:37:58 +00:00
Elliott Hughes
f732a2f83f Fix incorrect FloatMath documentation.
Change-Id: I30bbe500e634b73f3456ccc797106ad261fd0ce7
2013-02-26 09:28:17 -08:00
Eino-Ville Talvala
c0e55bd3cf Merge "Camera and MediaRecorder: Support AppOps" into jb-mr2-dev 2013-02-26 01:36:05 +00:00
Craig Mautner
2e5528c5e0 Merge "Revert ActivityManager changes for tasks. DO NOT MERGE" into jb-mr2-dev 2013-02-26 01:08:28 +00:00
Craig Mautner
2ad920759b Revert ActivityManager changes for tasks. DO NOT MERGE
Keeping all activity=>task changes in master and removing them
from jb-mr2.

Revert "Update histories simultaneously."
Revert "Add null check to setAppGroupId."
Revert "Fix crashing bug in validator."
Revert "Switch topRunning* and moveTaskTo*"
Revert "Begin switch over to task based history."
Revert "Reset and reuse Iterators and don't new() one."
Revert "Remove AppWindowToken lists."
Revert "Fix build."
Revert "Remove unused App methods."
Revert "Stop using AppToken movement and start using Task."
Revert "Replace access to mAppTokens with AppTokenIterator"
Revert "Refactor setAppOpVisibility implementation."
Revert "Add AppWindowTokens to TaskList."
Revert "Make ActivityStack.mHistory private."
Revert "Migrate AppWindowToken lists into DisplayContent."

Change-Id: I5722c9a4956dccb52864207e2967690bc58e4ebb
2013-02-25 17:07:39 -08:00
Mathias Agopian
19a38f6f40 Merge "Fix SurfaceControl.setDisplaySurface() such that it accepts a null Surface" into jb-mr2-dev 2013-02-26 00:55:25 +00:00
Mathias Agopian
ffddc9b804 Fix SurfaceControl.setDisplaySurface() such that it accepts a null Surface
also fix a typo that made us call the wrong Surface ctor

Bug: 8225509
Change-Id: I23f92179b6003d4c3e0febb35166c1caeafa27f5
2013-02-25 16:49:57 -08:00
Romain Guy
8889eb8d51 Merge "Rename debug property and expose it in HardwareRenderer" into jb-mr2-dev 2013-02-26 00:22:52 +00:00
Romain Guy
08bca88b27 Rename debug property and expose it in HardwareRenderer
Change-Id: If46a9bc14a50f6c9a202d901881b36bbac32cba3
2013-02-25 16:21:30 -08:00
Justin Ho
51e7836035 Merge "Revert "Fix ListView is not scrolled properly with arrows"" into jb-mr2-dev 2013-02-26 00:12:25 +00:00
Justin Ho
3cf7b3c592 Revert "Fix ListView is not scrolled properly with arrows"
This reverts commit db68fac12daa2cf4a7568308995e218aed92728a.
2013-02-25 16:08:27 -08:00
Dianne Hackborn
035045f8bb Merge "Add version code constant for JB MR2." into jb-mr2-dev 2013-02-25 23:56:38 +00:00
Dianne Hackborn
45e9ede55f Add version code constant for JB MR2.
Change-Id: I60fc76bbeb3c5e85d716179e9e3ea5758bafaf69
2013-02-25 15:55:37 -08:00
Dianne Hackborn
a2fcddd1e6 Merge "Better exceptions when LoadedApk fails." into jb-mr2-dev 2013-02-25 23:41:33 +00:00
Dianne Hackborn
208d937b61 Better exceptions when LoadedApk fails.
Change-Id: Iba578c3872c6aeba3bf468735f06bd486d661454
2013-02-25 13:17:54 -08:00
Maggie Benthall
6794458f86 Add location sharing toggle user restriction.
And add support for respecting it.

Change-Id: Ia5cf9134c5f5741c3f55afadbe54f862da7bfe5b
2013-02-25 12:45:14 -05:00
Eino-Ville Talvala
788717ca59 Camera and MediaRecorder: Support AppOps
- Allow media processes to update AppOps state
- Pass package name to media services

Bug: 8181262
Change-Id: I115d39f0b306cb9eb7cd3d3e663c680b7322fd3f
2013-02-25 09:27:42 -08:00
Dianne Hackborn
c4aad01cbb Formalize overscan metrics.
The window manager now maintains and reports a new formal
"overscan insets" for each window, much like the existing
content and visible insets.  This is used to correctly
position the various UI elements in the various combination
of layout options.  In particular, this allows us to have
an activity that is using fitSystemWindows to have the content
of its UI extend out to the visible content part of the screen
while still positioning its fixed UI elements inside the
standard content rect (and the entire window extending all
the way into the overscan area to fill the screen as desired).

Okay, maybe that is not written so clearly.  Well, it made
my head hurt too, so suffer!

The key thing is that windows now need to know about three
rectangles: the overall rectangle of the window, the rectangle
inside of the overscan area, and the rectangle inside of the
content area.  The FLAG_LAYOUT_IN_OVERSCAN option controls
whether the second rectangle is pushed out to fill the entire
overscan area.

Also did some improvements to debug dumping in the window
manager.

Change-Id: Ib2368c4aff5709d00662c799507c37b6826929fd
2013-02-22 19:14:37 -08:00
Adam Powell
0d74e8f8c6 am 06689433: am d61ff77e: Merge "Fix ListView is not scrolled properly with arrows"
* commit '06689433bc9e9d54e01bf4af9526dff2fc3dc862':
  Fix ListView is not scrolled properly with arrows
2013-02-22 14:09:30 -08:00
Adam Powell
d61ff77ee1 Merge "Fix ListView is not scrolled properly with arrows" 2013-02-22 21:29:44 +00:00
Robert Greenwalt
a3f0665c62 Merge "Improve ConnectivityManager docs" 2013-02-22 20:02:02 +00:00
Craig Mautner
12e563fff9 Merge "Create rotation animation modes." 2013-02-22 18:51:21 +00:00
Craig Mautner
3c1743705c Create rotation animation modes.
Allow fullscreen windows to specify crossfade or jumpcut animations
that override the default rotation animation. Only if the incoming
and outgoing topmost windows are fullscreen and both specify the
same animation to use.

Fixes bug 8182773.

Change-Id: I6b3c0020d7bd2cdfba5c66189e114ec62cd54fcf
2013-02-22 10:44:52 -08:00
Robert Greenwalt
5a6bdc46e2 Improve ConnectivityManager docs
Also fix some permission problems.
bug:5738328

Change-Id: Ib32c223f425b1fc03b8cce528456bcb50b540fdf
2013-02-22 10:39:20 -08:00
Ben Murdoch
5875cc6b27 am b8495145: Merge "Update WebView.PictureListener.onNewPicture to pass null picture."
* commit 'b84951451c35813ccf8aefdb12f5092926785fd4':
  Update WebView.PictureListener.onNewPicture to pass null picture.
2013-02-22 04:53:24 -08:00
Ben Murdoch
b84951451c Merge "Update WebView.PictureListener.onNewPicture to pass null picture." 2013-02-22 12:43:42 +00:00
Michael Wright
fe98be7533 am 65b0052a: Merge "Remove SurfaceControl.setPosition(int, int)"
* commit '65b0052a7473b73a18aef73460c9ebec77a2c2a0':
  Remove SurfaceControl.setPosition(int, int)
2013-02-21 16:09:05 -08:00
Michael Wright
65b0052a74 Merge "Remove SurfaceControl.setPosition(int, int)" 2013-02-22 00:05:10 +00:00
Michael Wright
b7b696ee71 Remove SurfaceControl.setPosition(int, int)
This was just casting and calling the float version anyways, which Java does
automatically.

Bug: 8153162
Change-Id: If2f99995ff38b92e40777896baf6694786031898
2013-02-21 15:52:50 -08:00
Christopher Tate
835aac396c am ab6b77fd: Merge "Be cool in backup/restore of apps that can\'t touch external storage"
* commit 'ab6b77fd85979212299d8aef0b2c83c005b13abc':
  Be cool in backup/restore of apps that can't touch external storage
2013-02-21 15:50:16 -08:00
Christopher Tate
ab6b77fd85 Merge "Be cool in backup/restore of apps that can't touch external storage" 2013-02-21 23:45:02 +00:00
Christopher Tate
5cb5c337d5 Be cool in backup/restore of apps that can't touch external storage
Bug: 8241337
Change-Id: I23f6eeba8448b234a7b18ce50d2ced2ba54b4ebd
2013-02-21 15:43:52 -08:00
Wink Saville
c7dcdfe872 am fb053cde: am f7bf667d: am b5a1ce2f: Merge "Allow three digit phone numbers"
* commit 'fb053cde74483f901462b5a034dd2be90a5af0da':
  Allow three digit phone numbers
2013-02-21 15:24:16 -08:00
Wink Saville
fb053cde74 am f7bf667d: am b5a1ce2f: Merge "Allow three digit phone numbers"
* commit 'f7bf667d4a5e8e3fca75640f6352724826705128':
  Allow three digit phone numbers
2013-02-21 15:19:53 -08:00
Daniel Sandler
da37acb2f7 am e9655887: Merge "Make Notification action data structures public."
* commit 'e96558879ec7008ddf5647ad29d69ec1fad68c67':
  Make Notification action data structures public.
2013-02-21 14:15:56 -08:00
Jeff Sharkey
0ff9af2ecb am c0997b0e: Merge "Improve notification UI for lockdown VPN."
* commit 'c0997b0e6291d7c97963623eed2a41994a7855cf':
  Improve notification UI for lockdown VPN.
2013-02-21 14:15:51 -08:00
Ben Murdoch
1c8d7f0952 Update WebView.PictureListener.onNewPicture to pass null picture.
When targetting >= CUR_DEVELOPMENT, the WebView.PictureListener.onNewPicture API
should pass a null picture in the callback.

Bug: 8209022, 8244082
Change-Id: I280c7cc89f2a12b1273cd67bbe2c7a6f2ca5892f
2013-02-21 20:35:21 +00:00
Daniel Sandler
e96558879e Merge "Make Notification action data structures public." 2013-02-21 19:38:55 +00:00
Jeff Sharkey
4fa63b2d5e Improve notification UI for lockdown VPN.
Bug: 7064111
Change-Id: I9554f6a426697b4abeb2ddd0827d314920e88ed6
2013-02-21 09:47:11 -08:00
Daniel Sandler
ea2a317368 Make Notification action data structures public.
Currently hidden.

Change-Id: I2a62a730f76d177577155d7ebb396b0fe51357f8
2013-02-20 22:25:01 -05:00
Jim Miller
91757f98a5 am ab8e936e: Merge "Add explicit userId to AppWidget binder calls"
* commit 'ab8e936e852b984624087c97dffc4c74b250fc68':
  Add explicit userId to AppWidget binder calls
2013-02-20 16:04:56 -08:00
Jim Miller
ab8e936e85 Merge "Add explicit userId to AppWidget binder calls" 2013-02-21 00:00:49 +00:00
Jim Miller
a75a883fe9 Add explicit userId to AppWidget binder calls
Keyguard currently relies on being in the system process to grab the
given user's widgets.  When we split keyguard into a new process,
it will need to have access to user-specific info to instantiate a
specific user's widgets.  In order to accomplish this, we add an
explicit userid to each binder call as well as new permission
check to allow keyguard access.

This also fixes a potential race condition of having an incorrect user id
due to an async call to change the user.  Every binder call now has a specific
user id. The user id is either the calling process user's id or an explicit
one passed by applications like keyguard. It is created once when an
AppWidgetManager is instantiated and remains for the lifetime of the object.

Fixed bug where widgets sometimes didn't show up for secondary users.

Moved permission check in AppWidgetService into getImplForUser()

Refactored to use userid from context associated AppWidgetManager instance.

Clean up AppWidgetHost to use userId from Context.

Remove redundant userId check in checkPermission since it's handled by
ActivityManager.handleIncomingUser()

Removed redundant userid check.

Upload after rebase...

Change-Id: Iae3e20f2b342c323bb58768b3d22051510f8268b
2013-02-20 15:41:14 -08:00
Dianne Hackborn
b944130494 am c49f4722: Merge "Fix issue #8228463: contradicting public documentation on what..."
* commit 'c49f47220ae21efe8888537d5403b8bfa011715a':
  Fix issue #8228463: contradicting public documentation on what...
2013-02-20 15:17:47 -08:00
Dianne Hackborn
c49f47220a Merge "Fix issue #8228463: contradicting public documentation on what..." 2013-02-20 23:13:25 +00:00
Michael Wright
01fc6fc4c1 am 1fd2ed58: Merge "Add brightness dialog to SystemUI"
* commit '1fd2ed58da3e578df0cd0c326c719cf1c282b793':
  Add brightness dialog to SystemUI
2013-02-20 15:06:43 -08:00
Dianne Hackborn
a53ee35754 Fix issue #8228463: contradicting public documentation on what...
...Intents match an IntentFilter that has no action specified

And various other doc improvements.

Change-Id: I6d881c8aed56c552e36d5db5df4f74c6aa718da7
2013-02-20 15:05:39 -08:00
Wink Saville
b5a1ce2f5d Merge "Allow three digit phone numbers" 2013-02-20 23:04:32 +00:00
Michael Wright
1fd2ed58da Merge "Add brightness dialog to SystemUI" 2013-02-20 23:03:18 +00:00