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

101029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
2973ccdba8 Import translations. DO NOT MERGE 
Change-Id: Icb6c650e3861376350a719adbe39ea67228a66c5
Auto-generated-cl: translation import
 2013-02-27 09:13:55 -08:00
Michael Wright
56fae73f30 Merge "Prevent repeated cursor movements from escaping a TextView" 2013-02-27 01:41:59 +00:00
Michael Wright
0d4cc209b9 Merge "Add default handlers for brightness keys" 2013-02-27 01:39:26 +00:00
Philip Milne
a26be59b05 Merge "When layoutMode is undefined, inherit the value defined by the parent (recursively)." 2013-02-27 01:02:35 +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
Dmitry Shmidt
93d6a29785 am 67b3fbf4: wifi: Get full scan results 
* commit '67b3fbf49c0c92641e19e3278a1feab7b68aa7b8':
  wifi: Get full scan results
 2013-02-27 00:36:45 +00:00
Dmitry Shmidt
67b3fbf49c wifi: Get full scan results 
BUG: 8236341

Change-Id: Ic0b769eed6bfcdc12644bf461060d3e42ab18e86
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2013-02-26 16:22:15 -08:00
Craig Mautner
5e7accf3cf Merge "Convert mHistory to mTaskHistory (4)" 2013-02-27 00:04:51 +00:00
Romain Guy
b5cb77b49f am aed20506: Merge "Update Hardware Acceleration API guide" into jb-mr2-dev 
* commit 'aed205068de293fb92177920a6243fdef98ef310':
  Update Hardware Acceleration API guide
 2013-02-26 23:29:43 +00: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
Romain Guy
aed205068d Merge "Update Hardware Acceleration API guide" into jb-mr2-dev 2013-02-26 23:21:45 +00:00
Alon Albert
174ea7d1a7 Merge "Document extra account_types" into jb-mr2-dev 2013-02-26 23:17:00 +00:00
Craig Mautner
000f002891 Convert mHistory to mTaskHistory (4) 
- Remove mHistory from getTaskForActivityLocked.
- Remove mHistory from findTaskLocked.
- Remove mHistory from findActivityLocked.
- Minimize mHistory usage in switchUserLocked.
- Remove mHistory from resumeTopActivityLocked.
- Remove mHistory from validateAppTokensLocked.

Change-Id: I0cc7cf2f1b5a66a1e3b3a9baff7712a3f2f0d5c4
 2013-02-26 15:04:29 -08: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
Scott Main
1bf67bd48e am 3383d393: am 611bc6d4: am 98411a1c: am 2c675f07: am 22a73ce3: am 2d0b481f: docs: followup to I32f25b692872ed7827e611890c563498993b2480 
* commit '3383d393a7dc14ef6b13927cbbe406d700b5745e':
  docs: followup to I32f25b692872ed7827e611890c563498993b2480
 2013-02-26 22:52:24 +00:00
Jean-Baptiste Queru
2f7217c456 am 624eac3d: (-s ours) am 8298c5b8: am 94c31c85: am d4ed4363: (-s ours) am 909960ad: (-s ours) am ed9cc555: Reconcile with jb-mr1-release - do not merge 
* commit '624eac3d7700b400d15472cd8a9811c6228eec83':
 2013-02-26 22:52:21 +00:00
Romain Guy
9ff7d16c7e Update Hardware Acceleration API guide 
Adds a table that clearly identifies what drawing operations are
supported across different API levels.

Change-Id: Ib925d550579d88e0632a51dcf9d3ce625fccbb71
 2013-02-26 14:49:35 -08:00
Scott Main
3383d393a7 am 611bc6d4: am 98411a1c: am 2c675f07: am 22a73ce3: am 2d0b481f: docs: followup to I32f25b692872ed7827e611890c563498993b2480 
* commit '611bc6d44622de444eba350777f1a1ce5dd7359b':
  docs: followup to I32f25b692872ed7827e611890c563498993b2480
 2013-02-26 22:43:25 +00:00
Jean-Baptiste Queru
624eac3d77 am 8298c5b8: am 94c31c85: am d4ed4363: (-s ours) am 909960ad: (-s ours) am ed9cc555: Reconcile with jb-mr1-release - do not merge 
* commit '8298c5b8ffbf0d8d172a9394e3a9a9cf8ec7e554':
 2013-02-26 22:43:22 +00:00
Scott Main
611bc6d446 am 98411a1c: am 2c675f07: am 22a73ce3: am 2d0b481f: docs: followup to I32f25b692872ed7827e611890c563498993b2480 
* commit '98411a1cb8c70c39f7cb8f0ee0caaf1f5a7b0ab9':
  docs: followup to I32f25b692872ed7827e611890c563498993b2480
 2013-02-26 14:41:07 -08:00
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
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