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

100029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
30e2d72810 Replace access to mAppTokens with AppTokenIterator 
More switching from Activity-based to Task-based control.

Change-Id: Ida47d71a52b875a6a6bd77cb62911053f942da15
 2013-02-12 16:03:29 -08:00
Amith Yamasani
7f03185fbe Merge "Hacks to fix lockdown" 2013-02-13 00:01:47 +00:00
Geoffrey Borggaard
e45e45e37e Hacks to fix lockdown 
Change-Id: Icf715e84ac7f8bd12eabd01f35860c36a60a8caf
 2013-02-12 23:57:20 +00:00
Craig Mautner
bea3b60ed1 Merge "Add AppWindowTokens to TaskList." 2013-02-12 23:57:09 +00:00
Dianne Hackborn
b47e6c77b3 Merge "Implement issue #6646859: 4K!!!! 4K!!!! 4K!!!!" 2013-02-12 23:54:56 +00:00
Xavier Ducrohet
4f0dd02d00 am 36ee5485: am 5d5c05de: am b7a4aed9: am f70b8c1c: Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev 
# Via Android Git Automerger (3) and others
* commit '36ee5485b85e34008dc31e0f7bace1b2516c5db5':
  Fix DateFormat for layoutlib.
 2013-02-12 15:54:02 -08:00
Xavier Ducrohet
36ee5485b8 am 5d5c05de: am b7a4aed9: am f70b8c1c: Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev 
# Via Android Git Automerger (2) and others
* commit '5d5c05dee9911eaf8add2d4298641e60f2a113d5':
  Fix DateFormat for layoutlib.
 2013-02-12 15:52:46 -08:00
Xavier Ducrohet
5d5c05dee9 am b7a4aed9: am f70b8c1c: Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev 
# Via Android (Google) Code Review (1) and others
* commit 'b7a4aed94eb02731057fdf78eb7bafc8ececadc9':
  Fix DateFormat for layoutlib.
 2013-02-12 15:50:16 -08:00
Xavier Ducrohet
b7a4aed94e am f70b8c1c: Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev 
# Via Android (Google) Code Review (1) and Xavier Ducrohet (1)
* commit 'f70b8c1cebbf873031bc92bb6ae3be813830d300':
  Fix DateFormat for layoutlib.
 2013-02-12 15:48:07 -08:00
Xavier Ducrohet
f70b8c1ceb Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev 2013-02-12 23:44:57 +00:00
Dianne Hackborn
56a2301c7a Implement issue #6646859: 4K!!!! 4K!!!! 4K!!!! 
Change-Id: Ib05a2eb6a03db50074805a437a3639a7d10684a0
 2013-02-12 15:41:49 -08:00
Fabrice Di Meglio
d04892d207 Merge "Add BidiFormatter utility" 2013-02-12 23:36:47 +00:00
Jean-Baptiste Queru
e6a213ff08 am 2d130cee: am c5748148: Merge "Revert "makefile changes for gcm javadocs"" 
# By Robert Ly
# Via Android Git Automerger (1) and others
* commit '2d130ceede3dd3af8bcc1d154fb086188c075803':
  Revert "makefile changes for gcm javadocs"
 2013-02-12 15:36:24 -08:00
Dianne Hackborn
244a1f7e59 Merge "App ops: media ops, set up to be callable from native code." 2013-02-12 23:27:48 +00:00
Jean-Baptiste Queru
2d130ceede am c5748148: Merge "Revert "makefile changes for gcm javadocs"" 
# By Robert Ly
# Via Gerrit Code Review (1) and Jean-Baptiste Queru (1)
* commit 'c5748148c56e129e7b5cec7fac0921ce7967d054':
  Revert "makefile changes for gcm javadocs"
 2013-02-12 15:22:06 -08:00
Svetoslav
90f73928d5 Merge "Adding public event callback instead of the internal one to UiAutomation." 2013-02-12 23:04:57 +00:00
Dianne Hackborn
d7d28e675e App ops: media ops, set up to be callable from native code. 
This is to help implementation of bug #8181262 and maybe
bug #8181261

Adds some definition for media ops (though nothing is yet using
them), and re-arranges things a bit so we can implement native
calling in to the app ops service.

Also add some java docs.

Change-Id: I637959745db820e676f23a35a5d2224f51bc6689
 2013-02-12 15:03:55 -08:00
Dianne Hackborn
a77ac32457 Merge "Fix issue #6595555: deal better with fragmentless headers." 2013-02-12 23:02:41 +00:00
Svetoslav
550b48fa18 Adding public event callback instead of the internal one to UiAutomation. 
It appears that com.android.internal.util.Predicate is in the public
APIs but it is in the internal package. Leaking the predicate APIs is
a mistake and while we cannot fix that, this change is adding legit
public filter interface.

bug:8183223

Change-Id: I3e2c0ef685d7a832630aaa3ec2e8eae3fb058289
 2013-02-12 15:01:09 -08:00
Christopher Tate
7a4e7a5cbf Merge "For now enable backup/restore DEBUG logs" 2013-02-12 22:58:49 +00:00
Christopher Tate
559c654801 For now enable backup/restore DEBUG logs 
Change-Id: I5733251f1e11c8eedb0601ae6751a35134d6419d
 2013-02-12 14:57:04 -08:00
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
5063bf6bb5 Merge "Update RSTest_Compat for stride changes." 2013-02-12 22:50:25 +00:00
Stephen Hines
aa5d5b1931 Merge "Check Element in all API levels for copy2DRangeFrom()." 2013-02-12 22:47:47 +00: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
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
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
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