127340 Commits

Author SHA1 Message Date
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
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
19de4ffff3 Merge "Add support for key value for SearchIndexableData" 2014-04-08 20:11:27 +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
cfd3cd6df3 Merge "Pipe notifications from related users to listeners." 2014-04-08 17:59:27 +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
Leon Scroggins III
560d1d9cb2 Merge "Remove SkFloatToScalar." 2014-04-08 14:39:49 +00:00
Yohei Yukawa
59fee2d553 Merge "Allow IMEs to start/stop receiving onUpdateCursor callback" 2014-04-08 05:48:45 +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
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
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
a75ee14e67 Update APIs to fix build
Change-Id: Id3c0401a60ff35cd9a07ecb46fb377a00829cf90
2014-04-07 18:59:51 -07:00
Eric Laurent
f5325314cc Merge "Revert "Initial implementation of USB Audio output."" 2014-04-08 01:23:21 +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
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
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
f7fbe099a8 Merge "Allow opaque windows to become translucent." 2014-04-07 23:28:44 +00:00
John Reck
96c637e941 Merge "Refcount RenderNode" 2014-04-07 22:42:21 +00:00
Leon Scroggins III
2e0103eb34 Remove SkFloatToScalar.
Now that SkScalar is always float (it may someday be double, but
float to double is trivial), remove callers of SkFloatToScalar,
which is deprecated in Skia.

BUG:13694396

Change-Id: I524a9bb6f7702bc810bac55fb9d2cd5361a01cf7
2014-04-07 18:41:17 -04:00
Craig Mautner
8ea553d03a am 8f2adcb1: am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."
* commit '8f2adcb10e9ddf2cc06cc4af431c9afb7be9d79a':
  [ActivityManager] Reduce report ANR on wrong activity.
2014-04-07 22:27:55 +00:00
Deepanshu Gupta
e9abc279fd Merge "Fix theme/style resolution in Layoutlib" 2014-04-07 22:27:01 +00:00
Craig Mautner
8f2adcb10e am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."
* commit '228cefa83dd7b95e5581f619bb597808af726f80':
  [ActivityManager] Reduce report ANR on wrong activity.
2014-04-07 22:21:33 +00:00
Craig Mautner
228cefa83d am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."
* commit '3fb2b7132b64c65163e7c6cd948e45f703e93687':
  [ActivityManager] Reduce report ANR on wrong activity.
2014-04-07 22:14:56 +00:00
Craig Mautner
3fb2b7132b Merge "[ActivityManager] Reduce report ANR on wrong activity." 2014-04-07 22:10:47 +00:00
John Reck
087bc0c14b Refcount RenderNode
Change-Id: I7a86db8acc2b78ef33d987a43a119f5933d7d752
2014-04-07 14:53:08 -07:00
Adam Hampson
5951c83dfb am ec571bd2: (-s ours) am ce802f48: Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev
* commit 'ec571bd203bb543aa1489e0c0a8bb67f5491630e':
  DO NOT MERGE Fix several bad function definitions.
2014-04-07 21:40:00 +00:00
Adam Hampson
ec571bd203 am ce802f48: Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev
* commit 'ce802f4898c5747038584596d9d689ca30c34c4e':
  DO NOT MERGE Fix several bad function definitions.
2014-04-07 21:33:54 +00:00
Adam Hampson
ce802f4898 Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev 2014-04-07 21:27:53 +00:00
Robert Greenwalt
124af56165 am 4455c599: (-s ours) am 0468e3c7: am e1d4847c: am 331fa429: am a3d3e8c4: (-s ours) am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '4455c5999f72daaf6f15c4394e413976f14337d3':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:59:05 +00:00
Robert Greenwalt
4455c5999f am 0468e3c7: am e1d4847c: am 331fa429: am a3d3e8c4: (-s ours) am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '0468e3c7fae6945e21314ae2971c51dcb36972ee':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:52:59 +00:00
Robert Greenwalt
fa30685038 am f00b906f: (-s ours) am cb163c68: am c855a28a: am 5f3c0630: am 522bd7fb: (-s ours) am 24444abf: am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit 'f00b906f01319a8177d2e2ab109ff01016b0bf4c':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:50:46 +00:00
Robert Greenwalt
0468e3c7fa am e1d4847c: am 331fa429: am a3d3e8c4: (-s ours) am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit 'e1d4847c120f4ab72b3acfed17c0015bdb2befaf':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:46:58 +00:00
Robert Greenwalt
f00b906f01 am cb163c68: am c855a28a: am 5f3c0630: am 522bd7fb: (-s ours) am 24444abf: am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit 'cb163c684d7a364684ef5b1a1937aa2e92856906':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:43:55 +00:00
Robert Greenwalt
e1d4847c12 am 331fa429: am a3d3e8c4: (-s ours) am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '331fa429cad1f464f0375a3466ba528b03c6e90d':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:41:00 +00:00
Robert Greenwalt
cb163c684d am c855a28a: am 5f3c0630: am 522bd7fb: (-s ours) am 24444abf: am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit 'c855a28a51ea10fcfb4dd20dcdbe26b6e08fe9d9':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:37:38 +00:00
Robert Greenwalt
331fa429ca am a3d3e8c4: (-s ours) am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit 'a3d3e8c4f92a637adc79ea21cc3c3ae49fe06312':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:34:49 +00:00
Robert Greenwalt
c855a28a51 am 5f3c0630: am 522bd7fb: (-s ours) am 24444abf: am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '5f3c0630e488bbcee687933b6350370a42354dc4':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:31:45 +00:00