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

100159 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Martijn Coenen
dd6b959546 Add exception types for NfcEe operations. 
To allow apps to present a better UI in the
different failure cases.

Bug: 4304698
Change-Id: Ia378cc5530c1a7488f38a4be84f9fed8c2aa8c86
 2013-02-12 13:43:30 -08: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
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
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
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
f706cbdf22 Import translations. DO NOT MERGE 
Change-Id: I06e0cc4a9f16f2356a25011fb5784eb5475a6591
Auto-generated-cl: translation import
 2013-02-12 11:24:15 -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
28b05169c0 Merge "resolved conflicts for merge of 6db87978 to master" 2013-02-12 19:02:47 +00: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
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
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
Irfan Sheriff
9dab7d6705 Fix NPE 
Supplicant sometimes reports 00:00:00:00:00:00 as group owner address causing
an NPE.

Avoid updating from peer list and let connection continue since group owner
address is not essential for data transfer to continue.

Bug: 8158711
Change-Id: I06ce88d7fb426fec4965087968f738dd2a7a7799
 2013-02-12 10:05:54 -08:00
Wink Saville
0ef4397125 Merge "Fix record logging." 2013-02-12 18:03:47 +00:00
Chet Haase
71c2405977 Fix getHitRect() to return correct rect for transformed child 
Previous code incorrectly included pivot point in calculation, which
resulted in offset rectangle

Issue #8178031 getHitRect() incorrect when view is transformed

Change-Id: Ie6c4c51614577d208016584cf1bf4eed570f730d
 2013-02-12 07:39:58 -08:00
Michael Jurka
bde3104ddc Merge "Prevent SecurityException from crashing Recents" 2013-02-12 10:15:31 +00:00
Robert Ly
f065d0f024 remove sac make target to fix build 
Change-Id: I44c51e12225cd0b1d82bfb70129fefa8ba66e8b4
 2013-02-11 20:58:43 -08:00
Svetoslav
bbfa585d70 Adding new APIs to UiAutomation. 
1. Accessibility service may set a flag to request a compressed
   view of the node tree representing the screen. The compressed
   state does not contain nodes that do to react to user actions
   and do not draw content, i.e. they are dumb view managers. This
   compressed hierarchy was very beneficial to the test team and
   this change is exposing the APIs. The compression has to be
   configurable since old tests are written against uncompressed
   view tree. Basically we do not hide the fact that UIAutomation
   is simply an accessibility service with some other useful APIs.

bug:8051095

2. Accessibility service can perform global actions such as opening
   notifications, opening recent apps, etc. These are also needed
   for UI testing since there is no other way to do it via the
   existing UIAutomation APIs. Basically we do not hide the fact
   that UIAutomation is simply an accessibility service with some
   other useful APIs.

bug:8117582

Change-Id: I7b6e24b5f7a973fdada0cc199cff9f882b10720b
 2013-02-11 19:59:45 -08:00
Scott Main
ae16a9b2ca am 4cd50a12: am b8656b3c: am 42ac0372: am 72091355: am bfec2a01: docs: nudge dashboard chart to the right to avoid overlap 
# Via Android Git Automerger (4) and Scott Main (1)
* commit '4cd50a1212ca0e94569eb04ac1a7f25967c7585c':
  docs: nudge dashboard chart to the right to avoid overlap
 2013-02-11 18:15:10 -08:00
Jeff Brown
7600f85f07 am f98e18e6: am d9f98c81: Fix build break due to merge. 
# Via Android Git Automerger (1) and Jean-Baptiste Queru (1)
* commit 'f98e18e68d82dbb508bf2deafa63bcdca643e125':
  Fix build break due to merge.
 2013-02-11 18:14:53 -08:00
Robert Ly
e68cb0acd4 am a578ade2: am 1c4311cc: am 4af36f4e: am 96b1b403: am 4c01047e: makefile changes for s.a.c 
# Via Android Git Automerger (4) and Robert Ly (1)
* commit 'a578ade219c07a04f7e8374939734de6ca7cc478':
  makefile changes for s.a.c
 2013-02-11 18:14:45 -08:00