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

101163 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
8298c5b8ff am 94c31c85: am d4ed4363: (-s ours) am 909960ad: (-s ours) am ed9cc555: Reconcile with jb-mr1-release - do not merge 
* commit '94c31c85f67ff10a1ea496ce9ea12809174f72c0':
 2013-02-26 14:37:44 -08:00
Scott Main
98411a1cb8 am 2c675f07: am 22a73ce3: am 2d0b481f: docs: followup to I32f25b692872ed7827e611890c563498993b2480 
* commit '2c675f0740695721f04fddffa1abcb6b2b04ffe5':
  docs: followup to I32f25b692872ed7827e611890c563498993b2480
 2013-02-26 14:36:49 -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
Scott Main
2c675f0740 am 22a73ce3: am 2d0b481f: docs: followup to I32f25b692872ed7827e611890c563498993b2480 
* commit '22a73ce31b7d58919ef61b281f0290d34fc3f645':
  docs: followup to I32f25b692872ed7827e611890c563498993b2480
 2013-02-26 14:34:45 -08:00
Jean-Baptiste Queru
94c31c85f6 am d4ed4363: (-s ours) am 909960ad: (-s ours) am ed9cc555: Reconcile with jb-mr1-release - do not merge 
* commit 'd4ed4363101201ed24795f50064fe76cb754f979':
 2013-02-26 14:33:30 -08:00
Jean-Baptiste Queru
d4ed436310 am 909960ad: (-s ours) am ed9cc555: Reconcile with jb-mr1-release - do not merge 
* commit '909960ad924687dfa3946cd6a077701968649af0':
 2013-02-26 14:31:23 -08:00
Scott Main
22a73ce31b am 2d0b481f: docs: followup to I32f25b692872ed7827e611890c563498993b2480 
* commit '2d0b481f1078548a6342a852948e504b3e79767a':
  docs: followup to I32f25b692872ed7827e611890c563498993b2480
 2013-02-26 14:30:55 -08:00
Jean Chalard
17100f3976 Merge "Fix dead key -> space combination." into jb-mr2-dev 2013-02-26 22:29:00 +00:00
Scott Main
2d0b481f10 docs: followup to I32f25b692872ed7827e611890c563498993b2480 
Change-Id: I7942e243e77cbe9ea9a7cd542b4255f9ca273a4d
 2013-02-26 14:27:20 -08:00
Jean-Baptiste Queru
909960ad92 am ed9cc555: Reconcile with jb-mr1-release - do not merge 
* commit 'ed9cc555ee69feb0a1b13caf29ffefa56cf51149':
 2013-02-26 14:27:06 -08:00
Craig Mautner
fd56e1d743 Merge "Convert mHistory to mTaskHistory (3)" 2013-02-26 22:23:10 +00:00
Michael Wright
9990e67b8c am 173bb615: Merge "Move stack dump off of InputDispatcher thread" into jb-mr2-dev 
* commit '173bb61544fb41a10398606766f2bdf079ee02fc':
  Move stack dump off of InputDispatcher thread
 2013-02-26 22:21:38 +00:00
Craig Mautner
7e57c9441c Merge "Remove AppTokenIterator from DisplayContent." 2013-02-26 22:19:52 +00:00
Victoria Lease
16028e9de8 Merge "round subpixels up to next integer in measureText" 2013-02-26 22:16:30 +00:00
Michael Wright
173bb61544 Merge "Move stack dump off of InputDispatcher thread" into jb-mr2-dev 2013-02-26 22:14:41 +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
Jean-Baptiste Queru
ed9cc555ee Reconcile with jb-mr1-release - do not merge 2013-02-26 14:03:20 -08: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
Victoria Lease
ec8c16abfb round subpixels up to next integer in measureText 
A common source of layout bugs we're seeing these days involves the
output of measureText() being fed into StaticLayout's constructor.
measureText() returns subpixel-accurate values, but StaticLayout only
takes integral bounds, resulting in the subpixel portion of the
bounds being truncated. This leaves StaticLayout with insufficient
space to layout the text that was just measured, causing all manner
of unexpected line breaks.

This could be causing issues elsewhere, as well. Until our text
pipeline is fully subpixel-perfect, it's best that measureText
guarantee that the value it returns will be sufficient to contain
the text, even if cast to int.

Bug: 8164205
Change-Id: Ib84947f0d0a1229287f5b19b99e7efd40f5317f7
 2013-02-26 13:53:28 -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
Craig Mautner
d74f7d728f Convert mHistory to mTaskHistory (3) 
- Remove mHistory from topRunningActivityLocked(IBinder).
- Remove mHistory from topRunningNonDelayedActivityLocked.
- Remove mHistory from topRunningActivityLocked(ActivityRecord).
- Remove indexOfTokenLocked and its uses in
requestFinishActivityLocked and finishActivityAffinityLocked.

Change-Id: I96b44f66486406b4006b7937360fd92e8dd73060
 2013-02-26 13:46:27 -08:00
Dianne Hackborn
d0d209ed4d Merge "App ops: turn off content provider ops when running under test." into jb-mr2-dev 2013-02-26 21:39:43 +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
Craig Mautner
f81b908752 Remove AppTokenIterator from DisplayContent. 
Simplify accessing successive AppWindowTokens from different
TaskLists.

Change-Id: Icf6265dd6c7953c9c770c97e1342f0f81256c017
 2013-02-26 13:04:35 -08:00
John Spurlock
398489735c am 47a5f404: (-s ours) Merge "DO NOT MERGE - Small documentation fix for AudioManager.java" into jb-mr2-dev 
* commit '47a5f404656e2514acf27c1252f3994647710e24':
  DO NOT MERGE - Small documentation fix for AudioManager.java
 2013-02-26 19:42:23 +00:00
John Spurlock
47a5f40465 Merge "DO NOT MERGE - Small documentation fix for AudioManager.java" into jb-mr2-dev 2013-02-26 19:37:06 +00:00
John Spurlock
aac753dcf8 DO NOT MERGE - Small documentation fix for AudioManager.java 
Correct typo + copy-paste description issue.

Cherry-pick of CL Idce7cfeb7255d96aef91efc40d19f077dde3e9a5 from
master.

Change-Id: I1b6f378d58eafdd4a265672a12189273b41f72d6
 2013-02-26 14:18:08 -05:00
Dirk Dougherty
d570821343 am a6c81bb3: am 0db6a9e9: am a18ff6f1: am f809e96f: am 1a15b24b: am 012ef92e: Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 
* commit 'a6c81bb3b373f8df150c45b36a13fe10f5a0e1a7':
  Doc change: Remove refs to Copy Protection and note EOL in GP.
 2013-02-26 18:55:23 +00:00
Dirk Dougherty
a6c81bb3b3 am 0db6a9e9: am a18ff6f1: am f809e96f: am 1a15b24b: am 012ef92e: Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 
* commit '0db6a9e9a67e7e370cb55d3b4a1d855be9b80f98':
  Doc change: Remove refs to Copy Protection and note EOL in GP.
 2013-02-26 18:50:21 +00:00
Dirk Dougherty
0db6a9e9a6 am a18ff6f1: am f809e96f: am 1a15b24b: am 012ef92e: Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 
* commit 'a18ff6f1ae45c4553e7d2e0c65a5b347bbb370e4':
  Doc change: Remove refs to Copy Protection and note EOL in GP.
 2013-02-26 10:47:54 -08:00
Dirk Dougherty
a18ff6f1ae am f809e96f: am 1a15b24b: am 012ef92e: Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 
* commit 'f809e96fef4df25899c267e1cac648e08ba31a72':
  Doc change: Remove refs to Copy Protection and note EOL in GP.
 2013-02-26 10:44:56 -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
Dirk Dougherty
f809e96fef am 1a15b24b: am 012ef92e: Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 
* commit '1a15b24bdd6a42b1c0c36e06c58d408af6eb276b':
  Doc change: Remove refs to Copy Protection and note EOL in GP.
 2013-02-26 10:42:45 -08:00
Dirk Dougherty
1a15b24bdd am 012ef92e: Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 
* commit '012ef92e0358360a6d5109fddc9e58e16b13c80d':
  Doc change: Remove refs to Copy Protection and note EOL in GP.
 2013-02-26 10:40:24 -08:00
Dirk Dougherty
012ef92e03 Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 2013-02-26 18:36:11 +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
Kenny Root
093be54d92 am c2235472: am f7497c9e: am 755205ad: Merge "Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help"" 
* commit 'c2235472dacd31aa30ffc13de2c29488c3b6c338':
  Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help"
 2013-02-26 18:09:00 +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
Kenny Root
c2235472da am f7497c9e: am 755205ad: Merge "Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help"" 
* commit 'f7497c9e551dd3bcbb7438211f5022cc6341c527':
  Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help"
 2013-02-26 18:04:33 +00:00
Elliott Hughes
c22657f8b1 am 3f5778c8: Merge "Fix incorrect FloatMath documentation." 
* commit '3f5778c858b90b554d7614603346b642d1a7bc6d':
  Fix incorrect FloatMath documentation.
 2013-02-26 10:02:45 -08:00
Kenny Root
f7497c9e55 am 755205ad: Merge "Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help"" 
* commit '755205ade42d6458c68bf1ee6852db0b23ecc4f5':
  Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help"
 2013-02-26 10:02:43 -08:00
Scott Main
1649f818e2 docs: add MTK usb driver info 
Change-Id: I847877e65207d065883e7ab74be65b6333ca205d
 2013-02-26 09:45:13 -08:00
Elliott Hughes
3f5778c858 Merge "Fix incorrect FloatMath documentation." 2013-02-26 17:37:58 +00:00
Kenny Root
755205ade4 Merge "Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help"" 2013-02-26 17:35:13 +00:00