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

100160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
2dedf19e0f am 4f0dd02d: am 36ee5485: am 5d5c05de: am b7a4aed9: am f70b8c1c: Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev 
# Via Android Git Automerger (4) and others
* commit '4f0dd02d00107fedda0fe42978ed98855dc53b85':
  Fix DateFormat for layoutlib.
 2013-02-12 15:56:01 -08: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
Fabrice Di Meglio
1790fdbf68 am d04892d2: Merge "Add BidiFormatter utility" 
# Via Android (Google) Code Review (1) and Fabrice Di Meglio (1)
* commit 'd04892d207d50378356feef181ac4e4eff9652d7':
  Add BidiFormatter utility
 2013-02-12 15:42:39 -08:00
Jean-Baptiste Queru
06ecc8dfe2 am e6a213ff: am 2d130cee: am c5748148: Merge "Revert "makefile changes for gcm javadocs"" 
# By Robert Ly
# Via Android Git Automerger (2) and others
* commit 'e6a213ff0854a038e40f0e02ed89c3377f876e22':
  Revert "makefile changes for gcm javadocs"
 2013-02-12 15:39:09 -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
c8f94e9f3d am 244a1f7e: Merge "App ops: media ops, set up to be callable from native code." 
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit '244a1f7e5998bae08b480dd7b8a8e85b56c3d450':
  App ops: media ops, set up to be callable from native code.
 2013-02-12 15:30:50 -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
ca500de3e6 am 90f73928: Merge "Adding public event callback instead of the internal one to UiAutomation." 
# Via Android (Google) Code Review (1) and Svetoslav (1)
* commit '90f73928d563a3ccc550f182f0dfdffd30a0a64f':
  Adding public event callback instead of the internal one to UiAutomation.
 2013-02-12 15:07:34 -08:00
Dianne Hackborn
79b4c0709a am a77ac324: Merge "Fix issue #6595555: deal better with fragmentless headers." 
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit 'a77ac32457b51022ca3698a84ef0c8566d1dcfc0':
  Fix issue #6595555: deal better with fragmentless headers.
 2013-02-12 15:07:31 -08:00
Svetoslav
90f73928d5 Merge "Adding public event callback instead of the internal one to UiAutomation." 2013-02-12 23:04:57 +00:00
Christopher Tate
909d5569ba am 7a4e7a5c: Merge "For now enable backup/restore DEBUG logs" 
# Via Android (Google) Code Review (1) and Christopher Tate (1)
* commit '7a4e7a5cbf3f67efdc5c4d62baa0d1bd72819b11':
  For now enable backup/restore DEBUG logs
 2013-02-12 15:04:04 -08:00
Svetoslav
4cd1f1c20e am 0707dbdf: Merge "Adding new APIs to UiAutomation." 
# Via Android (Google) Code Review (1) and Svetoslav (1)
* commit '0707dbdfc6b1c44b366c8da2e22473767c851654':
  Adding new APIs to UiAutomation.
 2013-02-12 15:04:00 -08:00
Irfan Sheriff
94e1aff108 am f9d2c2e6: Merge "Track keys per config and allow cert push from apps" 
# Via Android (Google) Code Review (1) and Irfan Sheriff (1)
* commit 'f9d2c2e63a3c8af5c230a24a3f243c94011bf2b7':
  Track keys per config and allow cert push from apps
 2013-02-12 15:03:57 -08: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
Stephen Hines
6cb3ca9565 am 5063bf6b: Merge "Update RSTest_Compat for stride changes." 
# Via Android (Google) Code Review (1) and Stephen Hines (1)
* commit '5063bf6bb5966bfe581d8201495d5a478eec647a':
  Update RSTest_Compat for stride changes.
 2013-02-12 14:56:15 -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
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
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
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