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

127962 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Guy
cfd3cd6df3 Merge "Pipe notifications from related users to listeners." 2014-04-08 17:59:27 +00:00
Amith Yamasani
4f58263d02 Launcher APIs and broadcasts for managed profiles 
UserManager
- Corp badging
- Querying list of managed profiles

Launcher API
- LauncherApps and Service to proxy changes in managed profile
  to the launcher in the primary profile
- Querying and launching launchable apps across profiles

Change-Id: Id8f7b4201afdfb5f414d04156d7b81300119289e
 2014-04-08 10:51:05 -07:00
Adam Hampson
4f9498c285 am 1bcdaa88: am 668b1bf8: resolved conflicts for merge of bd6c5577 to klp-modular-dev-plus-aosp 
* commit '1bcdaa88b249cdf49ba245a01108990c599e5664':
  DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime.
 2014-04-08 17:44:03 +00:00
Ying Wang
777a8e0aec Expose APIs used to be hidden due to Doclava bug. 
If a class inherits public fields from a hidden interface, they should
be exposed as APIs. A good example is the dozens of constants
java.util.zip.ZipFile inherits form java.util.zip.ZipConstants.

Bug: 13721174
Change-Id: I83cf13c174edf4422bc8ab2be275a47b214e1fa9
 2014-04-08 10:39:55 -07:00
Kenny Guy
a263e4e438 Pipe notifications from related users to listeners. 
For Listeners built against L or greater
Send notifications from related users to listeners.
Return notifications from related users getAllActiveNotifications
Cancel notifications from related users in cancelAllNotifications
Deprecate StatusBarNotification.getUserId() and expose getUser()
as APIs should use UserHandles.
Deprecate cancelNotification that takes package, id and tag
in favour of one that takes key.

Fix bug that notifications from related users didn't
trigger sounds.

Change-Id: I1b1c20c9f305b8f3c4047bc5720d8e99cdedfe70
 2014-04-08 18:38:38 +01:00
Adam Hampson
1bcdaa88b2 am 668b1bf8: resolved conflicts for merge of bd6c5577 to klp-modular-dev-plus-aosp 
* commit '668b1bf80b0e34e7079f826cd9e7358835a1e9cd':
  DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime.
 2014-04-08 17:38:35 +00:00
Adam Hampson
668b1bf80b resolved conflicts for merge of bd6c5577 to klp-modular-dev-plus-aosp 
Change-Id: I993d4baf89b3f414ac3ad313c74afe340c11f28f
 2014-04-08 10:24:47 -07:00
Jorim Jaggi
b903aca6e7 Merge "Force status bar showing when Keyguard is showing." into master-lockscreen-dev 2014-04-08 17:06:17 +00:00
Jorim Jaggi
afd4a5531a Force status bar showing when Keyguard is showing. 
Bug: 13635952
Change-Id: I5015f17010c853f70f5622b774b2c5b4e1d8332f
 2014-04-08 19:04:42 +02:00
Adrian Roos
9a0a4c9d7e Enable quick settings from lockscreen and merge into one shade. 
Change-Id: Ic5b5f54bcfe3816549287f707715e29340522d9b
 2014-04-08 18:25:34 +02:00
Adam Hampson
bd6c5577ab Merge "DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime." into klp-modular-dev 2014-04-08 15:51:23 +00:00
Narayan Kamath
f626ca2c96 Don't allow MemoryFiles of negative length. 
Prevents us from converting a (signed) jint into an
(unsigned) size_t and having horrible things happen.

Change-Id: I0f04e2eb9852ae7fc49b435fd0974f56e86751a4
 2014-04-08 16:14:10 +01:00
Leon Scroggins III
5b93128143 am 560d1d9c: Merge "Remove SkFloatToScalar." 
* commit '560d1d9cb24498643cea26c35a1a2481b70a9e68':
  Remove SkFloatToScalar.
 2014-04-08 14:43:48 +00:00
Leon Scroggins III
560d1d9cb2 Merge "Remove SkFloatToScalar." 2014-04-08 14:39:49 +00:00
Adrian Roos
6e0f14e748 Merge "Add a temporary user switcher to quick settings" into master-lockscreen-dev 2014-04-08 14:12:24 +00:00
Adrian Roos
5a46cd37c2 Add a temporary user switcher to quick settings 
Change-Id: I7ebe29049812fe5ac98b702f3378a1121d5d6bb7
 2014-04-08 16:07:46 +02:00
Yohei Yukawa
cf1b3b4791 am 59fee2d5: Merge "Allow IMEs to start/stop receiving onUpdateCursor callback" 
* commit '59fee2d5534965f0986e68e0c3562da5e65e6c45':
  Allow IMEs to start/stop receiving onUpdateCursor callback
 2014-04-08 05:52:14 +00:00
Yohei Yukawa
59fee2d553 Merge "Allow IMEs to start/stop receiving onUpdateCursor callback" 2014-04-08 05:48:45 +00:00
John Reck
95b8cfda9b am 1f3f55b4: Merge "Enable RT, round 2" 
* commit '1f3f55b434ce324c5fdbe74db1982fea4812a2e9':
  Enable RT, round 2
 2014-04-08 02:56:33 +00:00
John Reck
1f3f55b434 Merge "Enable RT, round 2" 2014-04-08 02:50:22 +00:00
John Reck
ed8c903a6c Enable RT, round 2 
Change-Id: I8035f477f67ede9a5cd1b4de4498bc7850c7fbf3
 2014-04-07 19:38:59 -07:00
Baligh Uddin
93732bb43e am 086ed8f0: (-s ours) am 56868fbc: (-s ours) am 0cf836a7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '086ed8f05577394e279b9cac6fe632654dbe5b83':
  Import translations. DO NOT MERGE
 2014-04-08 02:31:00 +00:00
Baligh Uddin
086ed8f055 am 56868fbc: (-s ours) am 0cf836a7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '56868fbcd9b086219c4350ac34b5dfdde127c5b9':
  Import translations. DO NOT MERGE
 2014-04-08 02:24:11 +00:00
Baligh Uddin
56868fbcd9 am 0cf836a7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '0cf836a77821afe8ff6cdfdaa3b55987cb6317da':
  Import translations. DO NOT MERGE
 2014-04-08 02:20:37 +00:00
Baligh Uddin
356c2f26f1 am ff17bc9c: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit 'ff17bc9cac2f9b178fcbfe3a0af307b4d16c2389':
  Import translations. DO NOT MERGE
 2014-04-08 02:20:24 +00:00
Baligh Uddin
02addbc8d9 am d0ce581e: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit 'd0ce581e61af91158bf7e6f9ceecc4ab91d1369e':
  Import translations. DO NOT MERGE
 2014-04-08 02:20:21 +00:00
Baligh Uddin
ff17bc9cac Merge "Import translations. DO NOT MERGE" 2014-04-08 02:16:43 +00:00
Baligh Uddin
f878c0a35e Merge "Import translations. DO NOT MERGE" into master-lockscreen-dev 2014-04-08 02:16:41 +00:00
Baligh Uddin
0cf836a778 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-08 02:16:36 +00:00
Baligh Uddin
d0ce581e61 Merge "Import translations. DO NOT MERGE" 2014-04-08 02:16:33 +00:00
Baligh Uddin
42af445921 Merge "Import translations. DO NOT MERGE" into master-lockscreen-dev 2014-04-08 02:16:31 +00:00
Alan Viverette
943c74345b am a75ee14e: Update APIs to fix build 
* commit 'a75ee14e6739ddc243d0ba905f48e9c22323c9fd':
  Update APIs to fix build
 2014-04-08 02:06:14 +00:00
Alan Viverette
a75ee14e67 Update APIs to fix build 
Change-Id: Id3c0401a60ff35cd9a07ecb46fb377a00829cf90
 2014-04-07 18:59:51 -07:00
Eric Laurent
0d8c9222ac am f5325314: Merge "Revert "Initial implementation of USB Audio output."" 
* commit 'f5325314ccb6809de95c9c4fa2304fe87537640a':
  Revert "Initial implementation of USB Audio output."
 2014-04-08 01:27:35 +00:00
Eric Laurent
f5325314cc Merge "Revert "Initial implementation of USB Audio output."" 2014-04-08 01:23:21 +00:00
John Reck
33ff58cdce am e2c45526: Veto pool TODO 
* commit 'e2c455264351964bf1ae78da2256c17258f0d3ea':
  Veto pool TODO
 2014-04-08 01:09:06 +00:00
Eric Laurent
f2f80c09b6 Revert "Initial implementation of USB Audio output." 
This reverts commit 3af0fe0c9df2fc1e0a4d6bcd827a4d7aa28dbdeb
while investigating issues 13751080 and 13883978.

Bug: 13751080.
 2014-04-07 18:01:29 -07:00
Winson Chung
6736905dc0 Prevent Recents from lingering after screen-off. 
- Fixing issue with landscape view not spanning the screen
- Simplifying the way we erase bitmaps

Change-Id: Ifc17c4c8f46caa8d3e42607a68bd94fed0c63543
 2014-04-07 17:48:20 -07:00
John Reck
e2c4552643 Veto pool TODO 
Change-Id: I50067dba630b75aa539e4406cfc15f66949684b3
 2014-04-07 17:38:47 -07:00
John Reck
bbd924fa8c am 85189c5d: Merge "Fence on draws that are reported" 
* commit '85189c5dafb08f051c7024f42ceedcbcf5dbbc7c':
  Fence on draws that are reported
 2014-04-08 00:37:16 +00:00
John Reck
85189c5daf Merge "Fence on draws that are reported" 2014-04-08 00:32:15 +00:00
Alan Viverette
839ddd7495 am af22ce47: Merge "Color theming for VectorDrawable, general clean up" 
* commit 'af22ce470112b8ee2ea7edf17b5d7c78e92d8ff7':
  Color theming for VectorDrawable, general clean up
 2014-04-08 00:01:38 +00:00
John Reck
28ad7b52e0 Fence on draws that are reported 
Change-Id: Ib2ec16cbda40f40df1710bdc868869ea8301f17e
 2014-04-07 16:59:25 -07:00
Alan Viverette
af22ce4701 Merge "Color theming for VectorDrawable, general clean up" 2014-04-07 23:55:29 +00:00
Alan Viverette
9453b7cfd4 Color theming for VectorDrawable, general clean up 
BUG: 13878079
Change-Id: I831d26fe3a2658161fc24e947bce382d0be6b548
 2014-04-07 16:50:46 -07:00
Narayan Kamath
c74221594d DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime. 
This value is overridden by the framework anyway
(see ActivityThread.handleBindApplication). Besides,
it doesn't seem like a great idea to let tools clutter
/sdcard/ with temp files.

(cherry picked from commit b3802a8e2360aaa0a88faa625e15c31b56eaf125)

Bug: 13763685
Bug: 13763900

Change-Id: I26c710cbea7397f89e6103e54a73044a87da95b1
 2014-04-07 16:45:05 -07:00
George Mount
fa3653eafc am f7fbe099: Merge "Allow opaque windows to become translucent." 
* commit 'f7fbe099a80a6955f7c910dbae3c6fecfc0b151a':
  Allow opaque windows to become translucent.
 2014-04-07 23:34:35 +00:00
George Mount
f7fbe099a8 Merge "Allow opaque windows to become translucent." 2014-04-07 23:28:44 +00:00
John Reck
2736413255 am 96c637e9: Merge "Refcount RenderNode" 
* commit '96c637e9414600a67c71014274e7757161dcc709':
  Refcount RenderNode
 2014-04-07 22:45:04 +00:00
John Reck
96c637e941 Merge "Refcount RenderNode" 2014-04-07 22:42:21 +00:00