Alan Viverette
9e0ca634e2
Merge "Fix some vector drawable documentation, clean up fields"
2014-04-08 20:49:39 +00:00
Jae Seo
9210e8cb23
am 3957091b: Initial round of Television Input Framework
...
* commit '3957091ba8f08c02b5e781098cb955a5f697a1ff':
Initial round of Television Input Framework
2014-04-08 20:43:49 +00:00
Alan Viverette
5c981a100e
Fix some vector drawable documentation, clean up fields
...
Change-Id: Iade0323b0ec2d3f8b609f24d89252608dfe40735
2014-04-08 13:35:49 -07:00
Jae Seo
3957091ba8
Initial round of Television Input Framework
...
This provides APIs to control and create individual television inputs on
the system which will later be hosted by television applications.
Change-Id: I6866d28e78175a1bff2c32a85c5d77e94d0cd60c
2014-04-08 13:35:21 -07:00
Fabrice Di Meglio
db03d7e93d
am 53c2cf79: Add support for saving and using the Preference\'s key value
...
* commit '53c2cf799fddfae7f6fc9ca1840ea345308b79ee':
Add support for saving and using the Preference's key value
2014-04-08 20:34:46 +00:00
Fabrice Di Meglio
53c2cf799f
Add support for saving and using the Preference's key value
...
- make public and hide the PreferenceGroupAdapter class
- add setActivated(int position) to be able to set the activated item
- udpate getView(int position, View convertView, ViewGroup parent) to set/unset
the activated item
Change-Id: I8a653ad6541bb6b7a043ba7c3d95e5ecad924a0d
2014-04-08 13:22:07 -07:00
Fabrice Di Meglio
1d6f207c0d
am 19de4fff: Merge "Add support for key value for SearchIndexableData"
...
* commit '19de4ffff3c9ebca70694b55b9784afe86f5c11b':
Add support for key value for SearchIndexableData
2014-04-08 20:15:06 +00:00
Fabrice Di Meglio
19de4ffff3
Merge "Add support for key value for SearchIndexableData"
2014-04-08 20:11:27 +00:00
Ying Wang
33f319f714
am 30f05c29: Merge "Fix sdk build."
...
* commit '30f05c29c56a04f8d8ab2851d0c20a2b66406cfa':
Fix sdk build.
2014-04-08 19:20:36 +00:00
Ying Wang
30f05c29c5
Merge "Fix sdk build."
2014-04-08 19:16:46 +00:00
Ying Wang
ff0bb30752
Fix sdk build.
...
Change-Id: I3e620315e082b46ba5fcd4511b9c258bf610ddf5
2014-04-08 12:14:50 -07:00
Kenny Guy
f328cd6c5e
am cfd3cd6d: Merge "Pipe notifications from related users to listeners."
...
* commit 'cfd3cd6df375793d714fe3b6570791e377cab1e5':
Pipe notifications from related users to listeners.
2014-04-08 18:07:42 +00:00
Kenny Guy
cfd3cd6df3
Merge "Pipe notifications from related users to listeners."
2014-04-08 17:59:27 +00:00
Ying Wang
27e0f545e5
am 777a8e0a: Expose APIs used to be hidden due to Doclava bug.
...
* commit '777a8e0aec6d8fd4813e75a39c5611c5cb660f9f':
Expose APIs used to be hidden due to Doclava bug.
2014-04-08 17:59:15 +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
b48fb43ff8
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:45:05 +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
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
67f99e3e73
am 560d1d9c: Merge "Remove SkFloatToScalar."
...
* commit '560d1d9cb24498643cea26c35a1a2481b70a9e68':
Remove SkFloatToScalar.
2014-04-08 14:45:50 +00:00
Leon Scroggins III
560d1d9cb2
Merge "Remove SkFloatToScalar."
2014-04-08 14:39:49 +00:00
Yohei Yukawa
110553b3c9
am 59fee2d5: Merge "Allow IMEs to start/stop receiving onUpdateCursor callback"
...
* commit '59fee2d5534965f0986e68e0c3562da5e65e6c45':
Allow IMEs to start/stop receiving onUpdateCursor callback
2014-04-08 06:26:09 +00:00
Yohei Yukawa
59fee2d553
Merge "Allow IMEs to start/stop receiving onUpdateCursor callback"
2014-04-08 05:48:45 +00:00
Sailesh Nepal
75c11006d2
Merge "Add InCallCall class to communicate with InCallService" into master-nova
2014-04-08 05:14:37 +00:00
Sailesh Nepal
6043793d3e
Add InCallCall class to communicate with InCallService
...
Change-Id: I3916e33e184f57bb6e58ed93a26b866d3ce0e7df
2014-04-07 22:10:27 -07:00
John Reck
824b90ac95
am 1f3f55b4: Merge "Enable RT, round 2"
...
* commit '1f3f55b434ce324c5fdbe74db1982fea4812a2e9':
Enable RT, round 2
2014-04-08 02:56:43 +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
a2d9c7dbd0
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:43 +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
9e861c7fac
am ff17bc9c: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit 'ff17bc9cac2f9b178fcbfe3a0af307b4d16c2389':
Import translations. DO NOT MERGE
2014-04-08 02:22:52 +00:00
Baligh Uddin
2f6639ddff
am d0ce581e: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit 'd0ce581e61af91158bf7e6f9ceecc4ab91d1369e':
Import translations. DO NOT MERGE
2014-04-08 02:22:49 +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
ff17bc9cac
Merge "Import translations. DO NOT MERGE"
2014-04-08 02:16:43 +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
Alan Viverette
4d3c957b77
am a75ee14e: Update APIs to fix build
...
* commit 'a75ee14e6739ddc243d0ba905f48e9c22323c9fd':
Update APIs to fix build
2014-04-08 02:07:27 +00:00
Alan Viverette
a75ee14e67
Update APIs to fix build
...
Change-Id: Id3c0401a60ff35cd9a07ecb46fb377a00829cf90
2014-04-07 18:59:51 -07:00
Eric Laurent
94f5ed868a
am f5325314: Merge "Revert "Initial implementation of USB Audio output.""
...
* commit 'f5325314ccb6809de95c9c4fa2304fe87537640a':
Revert "Initial implementation of USB Audio output."
2014-04-08 01:29:24 +00:00
Eric Laurent
f5325314cc
Merge "Revert "Initial implementation of USB Audio output.""
2014-04-08 01:23:21 +00:00
John Reck
3ecfa8093c
am e2c45526: Veto pool TODO
...
* commit 'e2c455264351964bf1ae78da2256c17258f0d3ea':
Veto pool TODO
2014-04-08 01:09:31 +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
fd57f066ab
am 85189c5d: Merge "Fence on draws that are reported"
...
* commit '85189c5dafb08f051c7024f42ceedcbcf5dbbc7c':
Fence on draws that are reported
2014-04-08 00:40:00 +00:00
John Reck
e2c4552643
Veto pool TODO
...
Change-Id: I50067dba630b75aa539e4406cfc15f66949684b3
2014-04-07 17:38:47 -07:00
John Reck
85189c5daf
Merge "Fence on draws that are reported"
2014-04-08 00:32:15 +00:00
Alan Viverette
59dd5be1e1
am af22ce47: Merge "Color theming for VectorDrawable, general clean up"
...
* commit 'af22ce470112b8ee2ea7edf17b5d7c78e92d8ff7':
Color theming for VectorDrawable, general clean up
2014-04-08 00:02:48 +00:00