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

100242 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav
0707dbdfc6 Merge "Adding new APIs to UiAutomation." 2013-02-12 22:56:02 +00:00
Irfan Sheriff
f9d2c2e63a Merge "Track keys per config and allow cert push from apps" 2013-02-12 22:55:16 +00:00
Stephen Hines
150e109821 am aa5d5b19: Merge "Check Element in all API levels for copy2DRangeFrom()." 
# Via Android (Google) Code Review (1) and Stephen Hines (1)
* commit 'aa5d5b1931b0e83f5a3134aaf469ff9cd5b24ee2':
  Check Element in all API levels for copy2DRangeFrom().
 2013-02-12 14:52:41 -08:00
Stephen Hines
5063bf6bb5 Merge "Update RSTest_Compat for stride changes." 2013-02-12 22:50:25 +00:00
Stephen Hines
fbe7a650ca am 00415803: Merge "Fix copyFrom() to use proper dimensions for copying." 
# Via Android (Google) Code Review (1) and Stephen Hines (1)
* commit '004158032af4d930c10d224f63cd915f24f4abd8':
  Fix copyFrom() to use proper dimensions for copying.
 2013-02-12 14:49:05 -08:00
Stephen Hines
aa5d5b1931 Merge "Check Element in all API levels for copy2DRangeFrom()." 2013-02-12 22:47:47 +00:00
Victoria Lease
ded5ed963c Count baseGlyphCount once for scripts without typefaces 
Characters from complex scripts without dedicated typefaces were
getting baseGlyphCount counted twice: once in shapeFontRun() and
then a second time during SkScalerContext::getNextContext()
chaining.

This was a problem for text runs beginning with full-width Latn
characters - shapeFontRun() would get the base glyph count for
the typeface containing those characters, then realise it had no
typeface specified for the Latn script, resetting the typeface
to default without resetting the base glyph count along with it.
Mojibake full-width Latn characters, ho!

The same issue also affected Cherokee text, which this fix also
addresses.

Bug: 8127795
Bug: 8034351
Change-Id: I058d81cffbbf86426cc3c5aafcc91a76f4fe6b62
 2013-02-12 14:47:43 -08:00
Scott Main
03c54e77d4 docs: add info about secure adb 
Change-Id: I6edf5bf20bce328c1e4cb2ec33f01a1439e2dbfa
 2013-02-12 14:47:17 -08:00
Stephen Hines
279d5c24ad am 28586038: Merge "Fix stride/addressing issues for RS tests." 
# Via Android (Google) Code Review (1) and Stephen Hines (1)
* commit '28586038a617f4b097fdea205b232e690eeaabfb':
  Fix stride/addressing issues for RS tests.
 2013-02-12 14:45:32 -08:00
Stephen Hines
004158032a Merge "Fix copyFrom() to use proper dimensions for copying." 2013-02-12 22:45:00 +00:00
Stephen Hines
28586038a6 Merge "Fix stride/addressing issues for RS tests." 2013-02-12 22:42:47 +00:00
Jean-Baptiste Queru
c5748148c5 Merge "Revert "makefile changes for gcm javadocs"" 2013-02-12 22:32:30 +00:00
Philip Milne
e5e0b7f191 Fix for bug: 8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE" 
Added a check for GONE status in measurement calculations.

Change-Id: I3ec82b03f3089730f10dbd6916f6245188cd8452
 2013-02-12 14:29:17 -08:00
Jason Sams
348968b3cb am d25d0378: Merge "Add FieldPacker contructor that accepts external storage." 
# Via Android (Google) Code Review (1) and Jason Sams (1)
* commit 'd25d037890a8af7e04f1e6c75e5508566fbc8105':
  Add FieldPacker contructor that accepts external storage.
 2013-02-12 14:25:30 -08:00
Jason Sams
d25d037890 Merge "Add FieldPacker contructor that accepts external storage." 2013-02-12 22:22:10 +00:00
Xavier Ducrohet
47a021f764 Fix DateFormat for layoutlib. 
Change-Id: I389c9d106b93b9f81dd3614398a5b66ba2b39a70
 2013-02-12 14:05:32 -08:00
Robert Ly
b959198b6d am 6b2c7600: am e47033f9: am 4d9aa17a: am 87db373a: am 2328a779: am 9eb66b2d: Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev 
# Via Android Git Automerger (5) and Android (Google) Code Review (2)
* commit '6b2c7600e946b4130585f8665f9720d09feb6411':
  Revert "makefile changes for gcm javadocs"
 2013-02-12 14:00:44 -08:00
Robert Ly
16e8c1ed1b Revert "makefile changes for gcm javadocs" 
This reverts commit 5f9922d7c3bce158e4c7a58929d4075e7c91e32e

Change-Id: I310f27b231c6d64d6d407ae451b189a6ecf6b34f
 2013-02-12 14:00:39 -08:00
Robert Ly
6b2c7600e9 am e47033f9: am 4d9aa17a: am 87db373a: am 2328a779: am 9eb66b2d: Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev 
# Via Android Git Automerger (4) and Android (Google) Code Review (2)
* commit 'e47033f9294056ab54c63608ab0a46de995fae63':
  Revert "makefile changes for gcm javadocs"
 2013-02-12 13:58:44 -08:00
Robert Ly
e47033f929 am 4d9aa17a: am 87db373a: am 2328a779: am 9eb66b2d: Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev 
# Via Android Git Automerger (3) and Android (Google) Code Review (2)
* commit '4d9aa17a1efcc76fbbd30c1b20338c0d888ae1e8':
  Revert "makefile changes for gcm javadocs"
 2013-02-12 13:56:30 -08:00
Robert Ly
4d9aa17a1e am 87db373a: am 2328a779: am 9eb66b2d: Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev 
# Via Android (Google) Code Review (2) and Android Git Automerger (2)
* commit '87db373a091b1126f2233e053f9549042564870a':
  Revert "makefile changes for gcm javadocs"
 2013-02-12 13:54:01 -08:00
Robert Ly
87db373a09 am 2328a779: am 9eb66b2d: Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev 
# Via Android (Google) Code Review (2) and Android Git Automerger (1)
* commit '2328a77980a8e4aa2dafac1b9a8e228877a7425c':
  Revert "makefile changes for gcm javadocs"
 2013-02-12 13:51:52 -08:00
Robert Ly
2328a77980 am 9eb66b2d: Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev 
# Via Android (Google) Code Review
* commit '9eb66b2db4724da7a2d6575fee29840004f1a5df':
  Revert "makefile changes for gcm javadocs"
 2013-02-12 13:49:44 -08:00
Robert Ly
9eb66b2db4 Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev 2013-02-12 21:46:07 +00:00
Robert Ly
d3b50de375 Revert "makefile changes for gcm javadocs" 
This reverts commit 5f9922d7c3bce158e4c7a58929d4075e7c91e32e

Change-Id: I310f27b231c6d64d6d407ae451b189a6ecf6b34f
 2013-02-12 21:39:28 +00:00
Baligh Uddin
eac4c28c88 Merge "Import translations. DO NOT MERGE" into master-chromium 2013-02-12 21:20:52 +00:00
Baligh Uddin
0531335687 am 0b0952f2: (-s ours) Merge "Import translations. DO NOT MERGE" 
# Via Android (Google) Code Review (1) and Baligh Uddin (1)
* commit '0b0952f24b804e0a6c6a20a0d36dde14c60913d2':
  Import translations. DO NOT MERGE
 2013-02-12 13:15:58 -08:00
Baligh Uddin
0b0952f24b Merge "Import translations. DO NOT MERGE" 2013-02-12 21:13:01 +00:00
Fabrice Di Meglio
6d9fe5bd22 Clean Paint.mBidiFlags as it is no longer used 
See bug #7623824

Change-Id: Ie2f9422821f6dcc73c99e8695f448e966b587b1d
 2013-02-12 13:12:13 -08:00
Daniel Sandler
271ee28ab1 am 1dba35d6: Merge "Historical notification access API." 
# Via Android (Google) Code Review (1) and Daniel Sandler (1)
* commit '1dba35d62d0b41652a103913296373cc5ead8bff':
  Historical notification access API.
 2013-02-12 12:05:30 -08:00
Michael Jurka
5102122278 am 1af81b6b: Merge "Fix Recents transition for RTL languages" 
# Via Android (Google) Code Review (1) and Michael Jurka (1)
* commit '1af81b6bdc589c9fc77c51d29c204eaf64e4ff13':
  Fix Recents transition for RTL languages
 2013-02-12 12:02:02 -08:00
Daniel Sandler
1dba35d62d Merge "Historical notification access API." 2013-02-12 20:01:02 +00:00
Michael Jurka
1af81b6bdc Merge "Fix Recents transition for RTL languages" 2013-02-12 19:58:48 +00:00
Wink Saville
403ebe3af2 am 29956b8c: Merge "Turn off debug in CellInfoLte." 
# Via Android (Google) Code Review (1) and Wink Saville (1)
* commit '29956b8c5a17f0e74b3f467a5382ce42c9fc09c9':
  Turn off debug in CellInfoLte.
 2013-02-12 11:58:35 -08:00
Wink Saville
29956b8c5a Merge "Turn off debug in CellInfoLte." 2013-02-12 19:55:12 +00:00
Dianne Hackborn
19470ecc0f Fix issue #6595555: deal better with fragmentless headers. 
If you constructed a preference activity whose first header
didn't have a fragment, this would crash in two-pane mode
because it would try to use that header as the initially
selected header but not have a fragment to show.

We need to have a fragment for whatever header we switch to,
so the code now looks for the first header with a fragment
as the initial header.

Also added some error checks to throw more descriptive
exceptions on bad headers -- when there is no header at all
with a fragment, if the app tries to manually switch to a
header without a fragment.

Change-Id: Ia84221fcb2fe5755bb674e0606ac2a1fcde4cdc9
 2013-02-12 11:42:51 -08:00
Daniel Sandler
78d0d25dca Historical notification access API. 
Similar to getActiveNotifications(),
getHistoricalNotifications() returns a list of all
notifications that have been posted, in
reverse-chronological order. It currently includes duplicate
entries for notifications that have been updated (so it
really is tracking every notification that has been posted
to the system).

Change-Id: Icce8d6f96bbe76710c989fd0068ff971c6498605
 2013-02-12 14:33:24 -05:00
Baligh Uddin
1d67770474 Import translations. DO NOT MERGE 
Change-Id: I7f7c9c8f728732e1c9b32ba2763d492cff8c5be3
Auto-generated-cl: translation import
 2013-02-12 11:26:02 -08:00
Baligh Uddin
f706cbdf22 Import translations. DO NOT MERGE 
Change-Id: I06e0cc4a9f16f2356a25011fb5784eb5475a6591
Auto-generated-cl: translation import
 2013-02-12 11:24:15 -08:00
Marco Nelissen
b01976eea8 am 145716e7: am 789e3fa0: am 9f03d4f9: Merge "Revert "use utf8_length() instead of local function, isValidUtf8()"" 
# Via Android Git Automerger (2) and Gerrit Code Review (2)
* commit '145716e7c15867b13f518e49d3611a5f8030e7ee':
  Revert "use utf8_length() instead of local function, isValidUtf8()"
 2013-02-12 11:19:04 -08:00
Marco Nelissen
145716e7c1 am 789e3fa0: am 9f03d4f9: Merge "Revert "use utf8_length() instead of local function, isValidUtf8()"" 
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit '789e3fa052747feb72e8ffdc778d5bc19a718c06':
  Revert "use utf8_length() instead of local function, isValidUtf8()"
 2013-02-12 11:16:17 -08:00
Marco Nelissen
789e3fa052 am 9f03d4f9: Merge "Revert "use utf8_length() instead of local function, isValidUtf8()"" 
# Via Gerrit Code Review
* commit '9f03d4f921fab5757a791653891ce73c2d006e20':
  Revert "use utf8_length() instead of local function, isValidUtf8()"
 2013-02-12 11:14:48 -08:00
Robert Ly
cd89229586 am 28b05169: Merge "resolved conflicts for merge of 6db87978 to master" 
# Via Android Git Automerger (4) and others
* commit '28b05169c0a3ddbe2fb59001c25410dfe724ce55':
  Revert "makefile changes for s.a.c"
 2013-02-12 11:05:32 -08:00
Robert Ly
28b05169c0 Merge "resolved conflicts for merge of 6db87978 to master" 2013-02-12 19:02:47 +00:00
Dianne Hackborn
d7c7c341b2 am b41af58f: Merge "App ops: the draw on top op now actually controls what is drawn." 
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit 'b41af58f49d371cedf041443d20a1893f7f6c840':
  App ops: the draw on top op now actually controls what is drawn.
 2013-02-12 10:57:51 -08:00
Robert Ly
590aaea06d resolved conflicts for merge of 6db87978 to master 
Change-Id: If439f5730e32fb2044a1e464fab0f6afb6bf1d08
 2013-02-12 10:55:43 -08:00
Dianne Hackborn
b41af58f49 Merge "App ops: the draw on top op now actually controls what is drawn." 2013-02-12 18:54:23 +00:00
Craig Mautner
05d6272bad Add AppWindowTokens to TaskList. 
- Add/remove/move TaskLists from ActivityStack.
- Further isolate mHistory.
- Cleanup warnings by parameterizing ArrayList.
- Fix previous bugs.

Change-Id: Ife8c7b7347479c70f10467cc384283456149ac50
 2013-02-12 10:52:55 -08:00
Romain Guy
55d72c105f am d1a84242: Merge "Prevent crash when setting up a stencil-based clip Bug #8177690" 
# Via Android (Google) Code Review (1) and Romain Guy (1)
* commit 'd1a84242a7ba807310d8f8d389796c7163cb97a0':
  Prevent crash when setting up a stencil-based clip Bug #8177690
 2013-02-12 10:49:02 -08:00
Robert Ly
6db8797827 am f38aed8c: am f303a7fd: am a95a64dd: am dc8ee206: Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev 
# Via Android Git Automerger (3) and Android (Google) Code Review (2)
* commit 'f38aed8c2c0eaceac0176ff2ddec6db50f4a4080':
  Revert "makefile changes for s.a.c"
 2013-02-12 10:48:07 -08:00