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

100448 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
c698a855d2 am d1c9d6e8: am 3b8381e1: am 7bb37c87: am 0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit 'd1c9d6e84969ee36f8a3b74515bae715727866a1':
  docs: Android SDK 21.1.0 Release Notes
 2013-02-13 07:21:08 -08:00
Joe Fernandez
d1c9d6e849 am 3b8381e1: am 7bb37c87: am 0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev 
# Via Android Git Automerger (2) and others
* commit '3b8381e1ed71258957718b8cc8dca46ee587c0fe':
  docs: Android SDK 21.1.0 Release Notes
 2013-02-13 07:18:49 -08:00
Joe Fernandez
3b8381e1ed am 7bb37c87: am 0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit '7bb37c8748b6c7e36a18b7e55cc0b8af65b45099':
  docs: Android SDK 21.1.0 Release Notes
 2013-02-13 07:16:16 -08:00
Joe Fernandez
7bb37c8748 am 0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Joe Fernandez (1)
* commit '0480d5d88c95abebb073dc1ea5a2f20d5ffdef38':
  docs: Android SDK 21.1.0 Release Notes
 2013-02-13 07:14:10 -08:00
Joe Fernandez
0480d5d88c Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev 2013-02-13 15:10:16 +00:00
The Android Automerger
6ce9c6554a merge in jb-mr2-release history after reset to master 2013-02-13 05:55:51 -08:00
Stephen Hines
37352bb971 Add tests for the new clipped kernel Java reflection. 
Change-Id: Idb0444823711da356ae0ac025aa79c6ff8068373
 2013-02-13 00:11:57 -08:00
Stephen Hines
dac6ed0b69 Add rsnScriptForEachClipped() implementation with no param array. 
JNI doesn't let us pass down a NULL parameter array (from the usrData part
of our reflection). In this case, we simply clone our existing function, but
remove the offending array parameter.

Change-Id: Ib1d6e202f2a55ba8922eec3da5a93d8daa882250
 2013-02-13 00:09:02 -08:00
Scott Main
7d9cf2b742 am 8d21b881: am 6d32f4e8: am 64aa66d1: am b861a945: am 4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev 
# By Robert Ly
# Via Android Git Automerger (4) and others
* commit '8d21b8811cddd716411390f48f918c80b286e412':
  lists.js files for gms and gcm
 2013-02-12 18:34:50 -08:00
Scott Main
8d21b8811c am 6d32f4e8: am 64aa66d1: am b861a945: am 4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev 
# By Robert Ly
# Via Android Git Automerger (3) and others
* commit '6d32f4e86e0fa67561c26582b9a25581744212f1':
  lists.js files for gms and gcm
 2013-02-12 18:32:33 -08:00
Scott Main
6d32f4e86e am 64aa66d1: am b861a945: am 4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev 
# By Robert Ly
# Via Android Git Automerger (2) and others
* commit '64aa66d126b2c382ccbcc50e8690e75175074168':
  lists.js files for gms and gcm
 2013-02-12 18:31:08 -08:00
Scott Main
64aa66d126 am b861a945: am 4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev 
# By Robert Ly
# Via Android (Google) Code Review (1) and others
* commit 'b861a9455ce8018b859d8b670e58324d79d9fd3a':
  lists.js files for gms and gcm
 2013-02-12 18:30:05 -08:00
Scott Main
b861a9455c am 4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev 
# By Robert Ly
# Via Android (Google) Code Review (1) and Robert Ly (1)
* commit '4cb43d977bb610fc8e2789dc53334569f2aa55e8':
  lists.js files for gms and gcm
 2013-02-12 18:27:57 -08:00
Scott Main
4cb43d977b Merge "lists.js files for gms and gcm" into jb-mr1-dev 2013-02-13 02:24:57 +00:00
Robert Ly
373264b776 lists.js files for gms and gcm 
Change-Id: I786adfc966986a8e71dc2164740f2a00d60c0159
 2013-02-12 18:15:04 -08:00
Chris Craik
3f76e65d25 Use RenderScript for large text blurs 
Still fall back to simple path for small tasks

Change-Id: I492f1b3f7d6fec1738f3e45cbfb15864bd23a392
 2013-02-12 17:45:28 -08:00
Philip Milne
d905005694 Merge "Fix for bug: 8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE"" 2013-02-13 01:39:06 +00:00
Fabrice Di Meglio
615ba0f736 Merge "Fix bug #8185410 BidiFormatter code should not use the Dir enum anymore" 2013-02-13 01:28:55 +00:00
Fabrice Di Meglio
4d1937b731 Fix bug #8185410 BidiFormatter code should not use the Dir enum anymore 
- replace Dir enum with static final int constants

Change-Id: Ibfd857e9767f14db92e50edb1681fef0d6598d99
 2013-02-12 17:22:01 -08:00
Ying Wang
4c818473d4 Remove the unnecessary framework-res-package-target 
Now the dependency should be correctly established by
framework_docs_LOCAL_JAVA_LIBRARIES.

Change-Id: I4c0ed2d3fb2855539027c7a0eb663f5747ae3ebd
 2013-02-12 17:18:44 -08:00
Robert Greenwalt
9055ae3697 Fix a permissions probem in ConnectivityManager 
stopUsingNetworkFeature fails because of new permissions checks in netd.

Change-Id: I04cb10d955c9dd9977c460c6c1db0d1910a863ce
 2013-02-12 17:18:25 -08:00
Wink Saville
35185a9ccf Fix broken test. 
Change-Id: I8c5649c9b3d917cf13b94d49da44eaf510643df6
 2013-02-12 17:07:21 -08:00
Tim Murray
43aed48fac Merge "Pass through null LaunchOption structs to standard forEach." 2013-02-13 00:42:37 +00:00
Tim Murray
ba9dd06176 Pass through null LaunchOption structs to standard forEach. 
Change-Id: I4dcde6996400207c7e361ff4b7723ec7db832e80
 2013-02-12 16:23:19 -08:00
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
Jean-Michel Trivi
97ad2cd1a8 No AudioFocus for notifications when media played remotely 
Don't use AudioFocus when playing a notification when media is
 playing remotely. This behavior may be accompanied by
 rules in the device's audio policy to not route the notifications
 to the remote display.

Bug 7485803

Change-Id: I8b96aa59cace75f6e9a0e73799ef8c75e9ee97aa
 2013-02-12 15:30:39 -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
Romain Guy
dfb7ba0034 Prevent crash when setting up a stencil-based clip 
Bug #8177690

Clear the layers before we setup the stencil to avoid dereferencing
the recently deleted rects.

Change-Id: I5dce5f965672f276f9490636d85b6018d3ab9422
 2013-02-12 15:10:22 -08:00
Craig Mautner
fb32c6e9e9 Refactor setAppOpVisibility implementation. 
- Convert double iteration over DisplayContents and WindowLists to
single iteration over AllWindowsIterator.

- Use existing change check in show() and hide() to trigger animation
scheduling rather than propagate change state up through calling tree.

Change-Id: Ic703a9fddebacbd0785bd5a186e95f9d0b128c42
 2013-02-12 15:08:44 -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