drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,059 Commits 1 Branch 0 Tags
Commit Graph

39445 Commits

Author SHA1 Message Date
Ian Rogers
0664d95090 am 0493d799: am 75dcb333: am 545464df: Merge "Deprecate and document memory allocation counting." 
* commit '0493d7997e22376524d707e407662d0f98f40c47':
  Deprecate and document memory allocation counting.
 2013-02-27 23:22:44 +00:00
Ben Murdoch
9b4f09348e am 0e2f22a4: Merge "Update WebView#PictureListener for JBMR2." into jb-mr2-dev 
* commit '0e2f22a42bc91db814591164b8a2cfc3d5a5cdbc':
  Update WebView#PictureListener for JBMR2.
 2013-02-27 23:22:31 +00:00
Dianne Hackborn
bf2798b387 am 9ad66541: Merge "New ContentProvider initialization for testing." into jb-mr2-dev 
* commit '9ad665417713398524d425f63b0d6fa751244237':
  New ContentProvider initialization for testing.
 2013-02-27 23:22:12 +00:00
Baligh Uddin
2973ccdba8 Import translations. DO NOT MERGE 
Change-Id: Icb6c650e3861376350a719adbe39ea67228a66c5
Auto-generated-cl: translation import
 2013-02-27 09:13:55 -08:00
Ian Rogers
0493d7997e am 75dcb333: am 545464df: Merge "Deprecate and document memory allocation counting." 
* commit '75dcb3338d85d12991249598e1ed407c8a6be1eb':
  Deprecate and document memory allocation counting.
 2013-02-27 16:53:20 +00:00
Ian Rogers
545464df28 Merge "Deprecate and document memory allocation counting." 2013-02-27 16:45:39 +00:00
Ben Murdoch
0e2f22a42b Merge "Update WebView#PictureListener for JBMR2." into jb-mr2-dev 2013-02-27 11:40:05 +00:00
Ben Murdoch
52643e0ceb Update WebView#PictureListener for JBMR2. 
Now JBMR2 constant is defined, update code and docs to use it.

Bug: 8241082
Change-Id: If221c6524b79cc259ffc71fc218b141ffe6ed790
 2013-02-27 11:38:25 +00:00
Michael Wright
56fae73f30 Merge "Prevent repeated cursor movements from escaping a TextView" 2013-02-27 01:41:59 +00:00
Dianne Hackborn
9ad6654177 Merge "New ContentProvider initialization for testing." into jb-mr2-dev 2013-02-27 01:18:12 +00:00
Philip Milne
cfb631b0e5 When layoutMode is undefined, inherit the value defined by the parent (recursively). 
Change-Id: Ib5f1150d2ac132d9ec79204a974cea8945d742b4
 2013-02-26 16:58:11 -08:00
Dianne Hackborn
334d9aebc2 New ContentProvider initialization for testing. 
Using this turns off app ops checks.

Change-Id: If29d4ca2fe9ddf1a1663d3a824b2f0afe7375862
 2013-02-26 16:16:14 -08:00
Alon Albert
f2624bf7cd am 174ea7d1: Merge "Document extra account_types" into jb-mr2-dev 
* commit '174ea7d1a72d9e666c95c5ee3ecccdb62967db82':
  Document extra account_types
 2013-02-26 23:22:21 +00:00
Alon Albert
50359c26e7 Document extra account_types 
The action android.settings.ADD_ACCOUNT_SETTINGS supports an extra
"account_types" (See AddAccountSettings & ChooseAccountActivity) but
that's not documented anywhere.
Oddly, the other 2 places that support the "authorities" extra do not
also support "account_types".

Change-Id: I99b7be0b0d6fff1cbccdf8b8b8e4fd2be9548e6c
 2013-02-26 14:54:07 -08:00
Jean Chalard
0ba20e9d0c am 17100f39: Merge "Fix dead key -> space combination." into jb-mr2-dev 
* commit '17100f3976a537a4d037b1f27fd643fafd2abc79':
  Fix dead key -> space combination.
 2013-02-26 22:35:19 +00:00
Jean Chalard
17100f3976 Merge "Fix dead key -> space combination." into jb-mr2-dev 2013-02-26 22:29:00 +00:00
Philip Milne
4d5d516373 Merge "Fix for bug: 8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE"" 2013-02-26 22:07:58 +00:00
Philip Milne
a841644367 Fix for bug: 8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE" 
The original fix:

https://googleplex-android-review.googlesource.com/#/c/273122/1

was incorrect as it left GridLayout to simply ignore views with GONE status.
Instead, views with GONE status must cause their corresponding rows and
columns to collapse to zero width/height in the case where the rows/columns
are not flexible.

The actual bug is the result of the fact that getBaseLine() is not parameterized
by the height/size of the view for which the baseline is being requested. In the case of
a view that is GONE, GridLayout will request the baseline of a component that has zero height,
and get results other than 0 (which is doesn't make sense). Prevent this with a specific check.

This CL should fix 8184401 without causing:

https://b.corp.google.com/issue?id=8192858

Change-Id: Ic74888b499466bbfac5fb97d49eede5b6c343127
 2013-02-26 14:01:58 -08:00
Dianne Hackborn
2223e52a21 am d0d209ed: Merge "App ops: turn off content provider ops when running under test." into jb-mr2-dev 
* commit 'd0d209ed4d6280b6e1203eebe823f04f9db766c0':
  App ops: turn off content provider ops when running under test.
 2013-02-26 21:48:53 +00:00
Dianne Hackborn
7e6f976c87 App ops: turn off content provider ops when running under test. 
Change-Id: I3a5084d195de29122b2f5f2a13b5d4f92f22fa92
 2013-02-26 13:35:11 -08:00
Ian Rogers
fe067a4cc5 Deprecate and document memory allocation counting. 
Bug: 8241521
Change-Id: I174c4024600c5b78e74030ecc99e784a98295f09
 2013-02-26 13:30:08 -08:00
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
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
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
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
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