Dianne Hackborn
442ebdf535
am 1bf1af60: Add documentation for overscan flag.
...
* commit '1bf1af60a3ec3da69aafbe1fe93c17312cb3e00e':
Add documentation for overscan flag.
2013-02-26 18:43:39 +00:00
Dianne Hackborn
1bf1af60a3
Add documentation for overscan flag.
...
Change-Id: Ibed06f23b2011a66021344384150e9d4ba6e61ed
2013-02-26 10:36:10 -08:00
Dianne Hackborn
91adc04591
am 305dbea8: Merge "App ops: adding operations for reading/writing clipboard." into jb-mr2-dev
...
* commit '305dbea8e39608b61810637944b6ffbbe6c07d2f':
App ops: adding operations for reading/writing clipboard.
2013-02-26 18:20:55 +00:00
Dianne Hackborn
ef014c138b
am 4b141acd: Merge "Add Bundle APIs for putting/getting Binder objects." into jb-mr2-dev
...
* commit '4b141acde00840db4cd850e5cddbe2cf849830aa':
Add Bundle APIs for putting/getting Binder objects.
2013-02-26 18:17:25 +00:00
Dianne Hackborn
305dbea8e3
Merge "App ops: adding operations for reading/writing clipboard." into jb-mr2-dev
2013-02-26 18:16:22 +00:00
Dianne Hackborn
4b141acde0
Merge "Add Bundle APIs for putting/getting Binder objects." into jb-mr2-dev
2013-02-26 18:10:32 +00:00
Elliott Hughes
8aeda208b5
am 6c8cd01a: am c22657f8: am 3f5778c8: Merge "Fix incorrect FloatMath documentation."
...
* commit '6c8cd01ad509df75be5c50f2ff2cd2c902dd9194':
Fix incorrect FloatMath documentation.
2013-02-26 18:09:03 +00:00
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
Daniel Sandler
94e512f13d
am 30a51b3f: Merge "Spurious file removed." into jb-mr2-dev
...
* commit '30a51b3f01ceee9f17ba4070e518b1829e32063d':
Spurious file removed.
2013-02-26 16:47:29 +00:00
Daniel Sandler
30a51b3f01
Merge "Spurious file removed." into jb-mr2-dev
2013-02-26 16:41:16 +00:00
Daniel Sandler
4d85af68a4
Spurious file removed.
...
Change-Id: I2ac3f417553aea806ad570e247afc985e9ececb3
2013-02-26 10:51:45 -05:00
Ben Murdoch
97786e14c0
Merge "Update WebView#loadDataWithBaseURL documentation."
2013-02-26 12:08:49 +00:00
Dianne Hackborn
3cbdddbd5c
Add Bundle APIs for putting/getting Binder objects.
...
This is really useful for certain cases, you just need
to be thoughtful and careful about what you are doing.
Change-Id: I314592480e447a6d8346f5089fade35da50b3510
2013-02-25 18:37:18 -08:00
Dianne Hackborn
efcc1a23a1
App ops: adding operations for reading/writing clipboard.
...
Change-Id: Ic4cade153618fe86954754a3b3edde64a52a0a9c
2013-02-25 18:02:35 -08:00
Eino-Ville Talvala
6609a2db75
am c0e55bd3: Merge "Camera and MediaRecorder: Support AppOps" into jb-mr2-dev
...
* commit 'c0e55bd3cfe1d7be2276e4f528fee2231763a5c1':
Camera and MediaRecorder: Support AppOps
2013-02-26 01:44:04 +00: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
Mathias Agopian
ee5cedeca4
Merge "Fix SurfaceControl.setDisplaySurface() such that it accepts a null Surface"
2013-02-26 00:46:00 +00:00
Mathias Agopian
a35b3a0696
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: I4d6ec342469c1c55f1a2c753a046981f601dc4ca
2013-02-25 16:42:51 -08:00
Romain Guy
55a88b0e2b
am 8889eb8d: Merge "Rename debug property and expose it in HardwareRenderer" into jb-mr2-dev
...
* commit '8889eb8d5161ce760237ae897f1791aaff273757':
Rename debug property and expose it in HardwareRenderer
2013-02-26 00:28:40 +00: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
d2433e19b8
am 51e78360: Merge "Revert "Fix ListView is not scrolled properly with arrows"" into jb-mr2-dev
...
* commit '51e7836035c1e5855f9185ba0ade275a52528ace':
Revert "Fix ListView is not scrolled properly with arrows"
2013-02-26 00:18:17 +00: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 db68fac12d .
2013-02-25 16:08:27 -08:00
Dianne Hackborn
2f2715bb65
am 035045f8: Merge "Add version code constant for JB MR2." into jb-mr2-dev
...
* commit '035045f8bbd54933b50026c7578d814bf3c5fefc':
Add version code constant for JB MR2.
2013-02-26 00:02:36 +00: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
6b9eaf7f50
am a2fcddd1: Merge "Better exceptions when LoadedApk fails." into jb-mr2-dev
...
* commit 'a2fcddd1e6537001d76c31730058ea307a5b6070':
Better exceptions when LoadedApk fails.
2013-02-25 23:46:37 +00:00
Dianne Hackborn
a2fcddd1e6
Merge "Better exceptions when LoadedApk fails." into jb-mr2-dev
2013-02-25 23:41:33 +00:00
Maggie Benthall
3316f30add
am 40bbc3bb: Merge "Add location sharing toggle user restriction." into jb-mr2-dev
...
* commit '40bbc3bb9997c6e9ea9aae42edd6bb4430d70978':
Add location sharing toggle user restriction.
2013-02-25 21:49:03 +00:00
Geremy Condra
61f542ab95
Merge "Added the KeySetManager."
2013-02-25 21:42:12 +00:00
Dianne Hackborn
208d937b61
Better exceptions when LoadedApk fails.
...
Change-Id: Iba578c3872c6aeba3bf468735f06bd486d661454
2013-02-25 13:17:54 -08:00
Ben Murdoch
ba67d28eef
Update WebView#loadDataWithBaseURL documentation.
...
historyURL must be a valid URL.
Bug: 7907196
Change-Id: Id1182537e073a9dd7746e23eec20accacedd9fc8
2013-02-25 19:18:19 +00: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
Wink Saville
ff4fcdb98c
Tweak logging and some code reformatting.
...
Add logAndAddLogRec method that logs a string and adds it to LogRecords.
Add loge(s, e)
Add missing javadoc to the logging methods
Reformatted the code.
Change-Id: I42f39e45aae77e5b6968f16b6b83f4804ccb7e73
2013-02-24 07:21:45 -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