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

100230 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Wink Saville
e2c5081218 Turn off debug in CellInfoLte. 
Change-Id: Icf3ea5dad9eef71f644de2292db0b0d3960ced9d
 2013-02-12 10:47:32 -08:00
Romain Guy
d1a84242a7 Merge "Prevent crash when setting up a stencil-based clip Bug #8177690" 2013-02-12 18:46:46 +00:00
Marco Nelissen
9f03d4f921 Merge "Revert "use utf8_length() instead of local function, isValidUtf8()"" 2013-02-12 18:46:22 +00:00
Robert Ly
f38aed8c2c am f303a7fd: am a95a64dd: am dc8ee206: Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev 
# Via Android (Google) Code Review (2) and Android Git Automerger (2)
* commit 'f303a7fd774f97eca79bfa44eb7d25a394d0abf4':
  Revert "makefile changes for s.a.c"
 2013-02-12 10:44:55 -08:00
Robert Ly
f303a7fd77 am a95a64dd: am dc8ee206: Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev 
# Via Android (Google) Code Review (2) and Android Git Automerger (1)
* commit 'a95a64ddd6155e90308aa1368e2c8098d86e677f':
  Revert "makefile changes for s.a.c"
 2013-02-12 10:43:16 -08:00
Robert Ly
a95a64ddd6 am dc8ee206: Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev 
# Via Android (Google) Code Review
* commit 'dc8ee2066a45adc6a57157c550e65317c8650ca0':
  Revert "makefile changes for s.a.c"
 2013-02-12 10:41:20 -08:00
Dianne Hackborn
b6b23ecdfc App ops: the draw on top op now actually controls what is drawn. 
Change-Id: Iccfc0723a0f92108a4f7d631d74efe21dbc6f157
 2013-02-12 10:40:16 -08:00
Robert Ly
dc8ee2066a Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev 2013-02-12 18:37:51 +00:00
Irfan Sheriff
721e7594c7 am 702b42dd: Merge "Fix NPE" 
# Via Android (Google) Code Review (1) and Irfan Sheriff (1)
* commit '702b42dd7415a88e876d4bacb1b543579548c607':
  Fix NPE
 2013-02-12 10:35:13 -08:00
Marco Nelissen
a0a73ed1e6 Revert "use utf8_length() instead of local function, isValidUtf8()" 
This reverts commit 1a8b6c29aaa5a1591097daca0876808cc029cbda

Reason for revert: utf8_length handles a slightly different range than the checkjni code, so it's possible for a given string to pass the utf8_length check, but then fail the jni  check.

Change-Id: I81e15c95edd8f89782d8ad9025e68502b9340f22
 2013-02-12 18:33:41 +00:00
Irfan Sheriff
702b42dd74 Merge "Fix NPE" 2013-02-12 18:31:37 +00:00
Robert Ly
343a89c2cd Revert "makefile changes for s.a.c" 
This reverts commit 4c01047ec7b06aabeeae273c7871caa6c3029b84

Change-Id: I4465cfa678717ff7c202347ae6ad36d12d5393bc
 2013-02-12 18:29:10 +00:00