39452 Commits

Author SHA1 Message Date
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
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
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
Jean Chalard
548655045a Fix dead key -> space combination.
This also fixes "dead key -> same dead key" combination.
Both these key sequences should only give the non-combining
version of the combining character.

Bug: 8158374
Change-Id: I51f01685dd2997c2c5316ce6aa4f10ac9354c877
2013-02-25 23:48:59 -08: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
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
89ceb6e2d9 Merge "regenerate GLES java bindings" into jb-mr2-dev 2013-02-26 00:52:37 +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
15284dee8e regenerate GLES java bindings
- added most missing validation checks
    - glGet* validation reimplement from khronos documentation

    Bug: 7402895

Change-Id: I92a805bb1aba1600d3372dc2db22eab08c975d7f
2013-02-25 16:48:44 -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
Maggie Benthall
40bbc3bb99 Merge "Add location sharing toggle user restriction." into jb-mr2-dev 2013-02-25 21:42:13 +00:00
Dianne Hackborn
208d937b61 Better exceptions when LoadedApk fails.
Change-Id: Iba578c3872c6aeba3bf468735f06bd486d661454
2013-02-25 13:17:54 -08:00
Ian Rogers
fec1178bbf am 92f3e9a1: am e88c0d9e: Merge "Recognize odex files in memory accounting."
* commit '92f3e9a1fba2873c00d1d89179c051a82e924d76':
  Recognize odex files in memory accounting.
2013-02-25 18:09:55 +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
Ian Rogers
9f8589c31f Recognize odex files in memory accounting.
Give odex files the same heap category as dex files.

Change-Id: I82539e20ac20a2b80c63c0cfceb266d9c59e22b7
2013-02-22 20:35:56 -08:00
Mathias Agopian
0d1ab1db22 Merge "regenerate egl/gles stubs from glgen" 2013-02-23 04:13:34 +00:00
Mathias Agopian
89be00bcda regenerate egl/gles stubs from glgen
those are minor cosmetic changes.

Change-Id: I84ee5383577f0ca33ed7cc32d03e53c1475f068d
2013-02-22 20:08:06 -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
Baligh Uddin
69a8dbbd67 Merge "Import translations. DO NOT MERGE" 2013-02-22 23:27:47 +00: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
Ian Rogers
7508039d66 am 631bc614: am 08a92a33: Merge "Account malloc mmaped pages as native heap."
* commit '631bc614f52015a2f068c2e66030e9aa47508fb5':
  Account malloc mmaped pages as native heap.
2013-02-22 11:04:16 -08: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
Irfan Sheriff
d99375528c Merge "Clean up scan handling" 2013-02-22 18:40:24 +00: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
Ian Rogers
afc10e174d Account malloc mmaped pages as native heap.
Currently when malloc uses a page rather than brk the heap gets accounted as
ashmem memory. Previously the memory would be accounted as unknown but since
[1] it gets accounted as ashmem. This change makes the accounting see this
memory as being native, ie the same kind of memory we associate with brk.

[1] https://android-review.googlesource.com/#/c/49583/3

Change-Id: I6f496cfeb590268d41d8e047b12cd5c90359e2b0
2013-02-22 09:40:58 -08:00
Baligh Uddin
5d5ac5bb0a Import translations. DO NOT MERGE
Change-Id: I26214599db1cab9d2c5847860d43e008d0e463ab
Auto-generated-cl: translation import
2013-02-22 09:25:20 -08:00
Irfan Sheriff
bcc97ca43a Clean up scan handling
Remove obsolete active/passive scan handling - drivers always
do active scan.

Also, remove AP_SCAN hack for preventing connections and use
the TYPE=ONLY scan.

Bug: 8158647
Change-Id: I8f70e19219ad789b7501a40529bcd6b6524739e8
2013-02-22 09:23:55 -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
Jesse Hall
cbd3789801 am ab10f3c5: Merge "Restore a mistakenly-removed null check"
* commit 'ab10f3c5b939f3d7afe6d5561d761fc5299572bc':
  Restore a mistakenly-removed null check
2013-02-21 22:10:15 -08:00
Jesse Hall
ab10f3c5b9 Merge "Restore a mistakenly-removed null check" 2013-02-22 06:05:40 +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