Jason Sams
802aaf3b9d
am 47de3060: Merge "Fix element size on 64b"
...
* commit '47de306050576535014ff2b0c08006f951eea2ee':
Fix element size on 64b
2014-06-18 22:54:08 +00:00
Stephen Hines
b02dadd47c
Merge "Create FieldPacker.getPos() to get the actual amount of data used for FP."
2014-06-18 22:48:04 +00:00
Brian Carlstrom
8e21e21550
Merge "Switch from core to core-libart"
2014-06-18 22:48:04 +00:00
Brian Carlstrom
dbcae5ceb7
Switch from core to core-libart
...
Bug: 14298175
Change-Id: I89db18bf3d88f9511cb2ad943c64ecdbaf09d96f
2014-06-18 17:43:27 -07:00
Ricardo Cervera
10276c32ec
Merge "docs: Updated the screenshot for the Android Studio page." into klp-modular-dev
2014-06-18 22:47:18 +00:00
Mark Renouf
7deaf7c530
am f2dcb390: Merge "Limit swipe dismiss progress to positive values" into klp-modular-dev
...
* commit 'f2dcb390444ffb42cf8637c99f53d821917554e6':
Limit swipe dismiss progress to positive values
2014-06-18 19:37:02 +00:00
Ye Wen
5376c00db3
Merge "Move IMms.aidl to frameworks/base (2/3)"
2014-06-18 19:24:54 +00:00
Ye Wen
369a107fd6
Move IMms.aidl to frameworks/base (2/3)
...
Change-Id: Ia771496f92a841c72d950212b2f525aa0c733d7f
2014-06-18 18:25:20 -07:00
Winson Chung
47d1206fb8
Merge "Toggling Recents from home should actually toggle Recents instead of launching the first task."
2014-06-19 00:17:11 +00:00
Winson Chung
1f76132d4d
Toggling Recents from home should actually toggle Recents instead of launching the first task.
...
Change-Id: Id60c54839c9f13299ec8d514e73e37c10735f30c
2014-06-18 18:21:42 -07:00
Winson Chung
7ab650cb43
Adding start delay to the task view transforms.
...
- Adding slight delay to task bar buttons to allow touch feedback to show
Change-Id: I9f31ca378541fc34c7b741840c7f038340684b13
2014-06-18 14:30:32 -07:00
Robert Ly
8312bfd618
am 5cfea842: Merge "docs: add allowembedded" into klp-modular-dev
...
* commit '5cfea84264911b93057a667cbcaf90e10740d658':
docs: add allowembedded
2014-06-18 18:33:31 +00:00
Alan Viverette
88dc8f1e41
Merge "Fix clamped starting position, seek bar hotspot bounds"
2014-06-18 18:28:24 +00:00
Alan Viverette
304624100b
Fix clamped starting position, seek bar hotspot bounds
...
BUG: 15720430
Change-Id: I11d40c747ea1a3665e9e2058d95dda1bc8a547ab
2014-06-18 17:54:58 -07:00
Alan Viverette
29fa90490b
Merge "Fix switch & slider anim, make View drawable hotspot API public"
2014-06-18 18:28:24 +00:00
Alan Viverette
8de1494557
Fix switch & slider anim, make View drawable hotspot API public
...
BUG: 15287810
Change-Id: Ic7a9549dc1ba8afd07e9a196371ed349a54aaf2f
2014-06-18 18:05:15 -07:00
Ricardo Cervera
3812613373
docs: Updated the screenshot for the Android Studio page.
...
Change-Id: Ia2a91bf9341dd9a0ee8572e6de1998cb41ac5c92
2014-06-18 09:40:13 -07:00
Quddus Chong
82ea0eb213
am ef655f26: docs: Added "games" metadata tag for Play Games landing page in d.a.c. Bug: 15709471
...
* commit 'ef655f26fceba274b75e41f0b085434aa12914c8':
docs: Added "games" metadata tag for Play Games landing page in d.a.c. Bug: 15709471
2014-06-18 16:07:41 +00:00
Quddus Chong
ef655f26fc
docs: Added "games" metadata tag for Play Games landing page in d.a.c.
...
Bug: 15709471
Change-Id: Ibac4bd844245e71a8cb975bd86d07f9df0c25be5
2014-06-18 08:57:24 -07:00
Nicolas Prevot
63798c596d
Introducing crossProfileIntentFilters that skip the current profile.
...
For these crossProfileIntentFilters, the activities in the current profile cannot
respond to the intent.
Only activities in the target profile can respond to the intent.
BUG: 14936725
Change-Id: I5e2704c2b56ff50a8339dd49284956391d7fad7e
2014-06-18 14:13:19 +01:00
Stephen Hines
fa1275a6e7
Create FieldPacker.getPos() to get the actual amount of data used for FP.
...
We need larger buffers to handle 64-bit RS object types, but 32-bit code
will never fill all of the getData().length bytes. This allows us to retain
our verification code.
We have to modify an existing use of FieldPacker that was doing partial
updates of the underlying buffer. This was really relying on the old data
to be implicitly selected and written back, but that is not guaranteed by
the original API. This also required a fix to the FieldPacker.reset() API,
which was not allowing the FieldPacker to ever point to the final entry in
its buffer.
Change-Id: Idcd52790ac2b0ab1eff3f043e7eec2832953f04b
2014-06-18 00:24:44 -07:00
Jinsuk Kim
a062a9339a
Implement portSelect/sendKeyEvent for HdmiControlService
...
TIF (TV Input Framework) uses these API to switch inputs, send
keys for selected device on CEC bus. Also renamed getActiveInput
to getActivePortId to use a unified term for port/input.
Change-Id: I8196825c0d960988cc1c0bb58a628ccd8ab1957e
2014-06-18 03:53:16 +00:00
Griff Hazen
df48918c3f
am a2d30107: (-s ours) am f546eeb1: Merge "DO NOT MERGE Reduce chance of notification listener dropped messages." into klp-modular-dev
...
* commit 'a2d30107c401f66dacec3853bc9efdbaca7558e8':
DO NOT MERGE Reduce chance of notification listener dropped messages.
2014-06-18 03:22:28 +00:00
Robert Ly
dc7918654e
am d664830c: am 95df0762: Merge "docs: Edits to the L Preview API overview." into klp-modular-dev
...
* commit 'd664830ce43c7eb6be6b4d11f9740542172cabec':
docs: Edits to the L Preview API overview.
2014-06-18 03:22:22 +00:00
Robert Ly
6827bded78
am 04095773: am b5d79bd2: Merge "Android TV Landing Page" into klp-modular-dev
...
* commit '04095773beb2fed34ae7cd3d80c8f6f8e8cea05e':
Android TV Landing Page
2014-06-18 03:22:17 +00:00
Joe Fernandez
af99194714
am 003ff78a: am 8e18e016: Wear Landing page fixes
...
* commit '003ff78a84f2b216660b524fc49665394a339d25':
Wear Landing page fixes
2014-06-18 03:22:12 +00:00
Griff Hazen
a2d30107c4
am f546eeb1: Merge "DO NOT MERGE Reduce chance of notification listener dropped messages." into klp-modular-dev
...
* commit 'f546eeb1ede3c33ca3ec7fff6b8deb9d4e5cbc3e':
DO NOT MERGE Reduce chance of notification listener dropped messages.
2014-06-18 03:18:24 +00:00
Robert Ly
d664830ce4
am 95df0762: Merge "docs: Edits to the L Preview API overview." into klp-modular-dev
...
* commit '95df0762c40bb79418d5fc8d59bc997a419e6250':
docs: Edits to the L Preview API overview.
2014-06-18 03:13:23 +00:00
Robert Ly
04095773be
am b5d79bd2: Merge "Android TV Landing Page" into klp-modular-dev
...
* commit 'b5d79bd2ab8b0382e05f38653ce0fbb56290ea58':
Android TV Landing Page
2014-06-18 03:13:19 +00:00
Joe Fernandez
003ff78a84
am 8e18e016: Wear Landing page fixes
...
* commit '8e18e0169d3488e9a9ca02d1ff7aee06932a54a3':
Wear Landing page fixes
2014-06-18 03:13:15 +00:00
Joe Fernandez
8e18e0169d
Wear Landing page fixes
...
- fixed scroll animation
- un-hardcoded G+ widget
Change-Id: I679d6d5baf65516a163bb01ec3bf90c1b53e647b
2014-06-17 20:00:33 -07:00
Deepanshu Gupta
5ba5ab3111
am 1595c61d: am 5a49fc33: am c57b410c: Add a script to rename fonts for SDK. [DO NOT MERGE]
...
* commit '1595c61d2f1f081111958b4a22e8fec25402f3cd':
Add a script to rename fonts for SDK. [DO NOT MERGE]
2014-06-18 00:20:35 +00:00
Deepanshu Gupta
1595c61d2f
am 5a49fc33: am c57b410c: Add a script to rename fonts for SDK. [DO NOT MERGE]
...
* commit '5a49fc331ec7d5aa2532d650c32ea68733cbd5c0':
Add a script to rename fonts for SDK. [DO NOT MERGE]
2014-06-18 00:15:35 +00:00
Deepanshu Gupta
5a49fc331e
am c57b410c: Add a script to rename fonts for SDK. [DO NOT MERGE]
...
* commit 'c57b410c8ef41e269f82f3b42a8d22a15c08755b':
Add a script to rename fonts for SDK. [DO NOT MERGE]
2014-06-18 00:10:34 +00:00
Colin Cross
0ead2a00f4
am 15967d0a: am 88b37eda: Merge "Fix reading memory usage for 64-bit processes"
...
* commit '15967d0a8f8f858b0ed6aaf9d5aab5c65b94257f':
Fix reading memory usage for 64-bit processes
2014-06-17 22:53:09 +00:00
Colin Cross
15967d0a8f
am 88b37eda: Merge "Fix reading memory usage for 64-bit processes"
...
* commit '88b37edaeab7b31cab0f5115e5c9f63a49991408':
Fix reading memory usage for 64-bit processes
2014-06-17 22:47:50 +00:00
Wonsik Kim
e8aa6f815c
Merge "TvInputHardware: Add HDMI port ID"
2014-06-17 22:26:08 +00:00
Wonsik Kim
a358b53e1d
TvInputHardware: Add HDMI port ID
...
Bug: 15570939
Change-Id: I957804124fa5e417de8c98c6d41332609097d995
2014-06-19 10:35:33 +09:00
Wonsik Kim
d7c29189aa
TvInputHardware: Integration with audio framework changes
...
TvInputHardwareManager detects AudioPort specified by tv_input and
connect source to sink via AudioManager.createAudioPatch().
Bug: 15177175
Change-Id: I2252eb0df2d8287889ed28cc7d76dc1a659fd08b
2014-06-19 10:35:33 +09:00
Jungshik Jang
bce527139a
Merge "Add SystemAudioAutoInitiationAction and SystemAudioStatusAction"
2014-06-17 22:26:08 +00:00
Jungshik Jang
187d01765b
Add SystemAudioAutoInitiationAction and SystemAudioStatusAction
...
Once all device discovery action is done if there is audio amplifier
on device list, it should trigger system audio initiation action.
On or off of system audio is decided by Tv's last audio setting
(speaker). If system audio was the last audio setting, it will
try to turn on system audio; otherwise will turn it off.
In other hands, SystemAudioStatusAction is added to update
system audio status (mute or volume) after
SystemAudioAutoInitiationAction. In fact, RequestArcAction has
almost same code as it has and will refactore RequesArcAction
in the following changes.
Change-Id: I3d591242e79549cb73e14546f0d057ba08f878ef
2014-06-18 11:37:11 +09:00
Deepanshu Gupta
128be2a919
am 5ba5ab31: (-s ours) am 1595c61d: am 5a49fc33: am c57b410c: Add a script to rename fonts for SDK. [DO NOT MERGE]
...
* commit '5ba5ab3111d3738ac33efbeb7c4e87f46d923b37':
Add a script to rename fonts for SDK. [DO NOT MERGE]
2014-06-18 01:47:15 +00:00
Sungsoo Lim
f76ba856f3
Merge "Print a warning message instead of throwing IllegalStateException"
2014-06-17 22:28:18 +00:00
Wonsik Kim
f752ed40cb
Merge "TvInputHardware: Integration with audio framework changes"
2014-06-17 22:26:08 +00:00
Matthew Williams
e934fd21d0
Merge "Flesh out job scheduler test app"
2014-06-18 18:28:24 +00:00
Matthew Williams
f7c4fddf44
Flesh out job scheduler test app
...
adds the rest of the constraints - charging, idle, and allows you
to cancel all.
Change-Id: I43b7cac94446f6860ca0387440b3c8f995a2c0f3
2014-06-18 18:52:47 -07:00
Kenny Guy
c6543afd6b
Merge "Update API for launcher apps to use abstract class."
2014-06-17 22:01:53 +00:00
Svetoslav
6170cca05e
Not touchable windows should not hide windows behind
...
When computing which windows to report for accessibility we were not
reporting windows behind non touchable ones. However, if a window is
not-touchable the touch events go to the window behind it. Hence, a
not-touchable window should not affect the reproted windows for
accessibility.
Change-Id: I213a32b33b0986a73d8bbdf0a3e40e6ca6e4261b
2014-06-17 14:54:39 -07:00
Colin Cross
88b37edaea
Merge "Fix reading memory usage for 64-bit processes"
2014-06-17 21:47:03 +00:00
Colin Cross
0c6bc73c5e
Fix reading memory usage for 64-bit processes
...
64-bit process will have virtual addresses that don't fit in an
unsigned long if ActivityManagerService is in a 32-bit process,
and the locations of the '-' and ' ' characters in the maps
are not predictable. Fix the sscanf for finding the start of the
mapping, and use it again to find the end of the mapping. Also
fix a few 64-bit warnings.
Change-Id: I8855c76085142768be1d45346f1032fd37cbe4eb
2014-06-17 15:25:45 -07:00