OSDN Git Service

android-x86/frameworks-base.git
10 years agoMerge "TvInputHardware: Integration with audio framework changes"
Wonsik Kim [Thu, 19 Jun 2014 01:58:01 +0000 (01:58 +0000)]
Merge "TvInputHardware: Integration with audio framework changes"

10 years agoTvInputHardware: Integration with audio framework changes
Wonsik Kim [Tue, 27 May 2014 01:38:21 +0000 (10:38 +0900)]
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

10 years agoMerge "Toggling Recents from home should actually toggle Recents instead of launching...
Winson Chung [Thu, 19 Jun 2014 01:23:47 +0000 (01:23 +0000)]
Merge "Toggling Recents from home should actually toggle Recents instead of launching the first task."

10 years agoToggling Recents from home should actually toggle Recents instead of launching the...
Winson Chung [Thu, 19 Jun 2014 01:21:42 +0000 (18:21 -0700)]
Toggling Recents from home should actually toggle Recents instead of launching the first task.

Change-Id: Id60c54839c9f13299ec8d514e73e37c10735f30c

10 years agoAdding start delay to the task view transforms.
Winson Chung [Wed, 18 Jun 2014 21:25:34 +0000 (14:25 -0700)]
Adding start delay to the task view transforms.

- Adding slight delay to task bar buttons to allow touch feedback to show

Change-Id: I9f31ca378541fc34c7b741840c7f038340684b13

10 years agoMerge "Flesh out job scheduler test app"
Matthew Williams [Thu, 19 Jun 2014 01:54:31 +0000 (01:54 +0000)]
Merge "Flesh out job scheduler test app"

10 years agoFlesh out job scheduler test app
Matthew Williams [Thu, 19 Jun 2014 01:52:47 +0000 (18:52 -0700)]
Flesh out job scheduler test app

adds the rest of the constraints - charging, idle, and allows you
to cancel all.
Change-Id: I43b7cac94446f6860ca0387440b3c8f995a2c0f3

10 years agoMerge "Fix clamped starting position, seek bar hotspot bounds"
Alan Viverette [Thu, 19 Jun 2014 01:06:39 +0000 (01:06 +0000)]
Merge "Fix clamped starting position, seek bar hotspot bounds"

10 years agoFix clamped starting position, seek bar hotspot bounds
Alan Viverette [Thu, 19 Jun 2014 00:54:58 +0000 (17:54 -0700)]
Fix clamped starting position, seek bar hotspot bounds

BUG: 15720430
Change-Id: I11d40c747ea1a3665e9e2058d95dda1bc8a547ab

10 years agoMerge "Clean up tessellation cache in prep for other tesselation types"
Chris Craik [Wed, 18 Jun 2014 22:44:30 +0000 (22:44 +0000)]
Merge "Clean up tessellation cache in prep for other tesselation types"

10 years agoClean up tessellation cache in prep for other tesselation types
Chris Craik [Tue, 17 Jun 2014 20:47:05 +0000 (13:47 -0700)]
Clean up tessellation cache in prep for other tesselation types

bug:15536396

Also fixes compilation warning, avoids SkPaint deep copy

Change-Id: I74334f08b1d34c6789aabf968ff62db5bacbed1b

10 years agoFix docs breakage from refactor
Jason Monk [Wed, 18 Jun 2014 22:28:46 +0000 (18:28 -0400)]
Fix docs breakage from refactor

Change-Id: I567249542ee02e4bde3e0e03cdfae8969104c1b8

10 years agoMerge "Fix switch & slider anim, make View drawable hotspot API public"
Alan Viverette [Thu, 19 Jun 2014 01:05:45 +0000 (01:05 +0000)]
Merge "Fix switch & slider anim, make View drawable hotspot API public"

10 years agoFix switch & slider anim, make View drawable hotspot API public
Alan Viverette [Thu, 19 Jun 2014 01:05:15 +0000 (18:05 -0700)]
Fix switch & slider anim, make View drawable hotspot API public

BUG: 15287810
Change-Id: Ic7a9549dc1ba8afd07e9a196371ed349a54aaf2f

10 years agoMerge "Update API for launcher apps to use abstract class."
Kenny Guy [Wed, 18 Jun 2014 16:55:35 +0000 (16:55 +0000)]
Merge "Update API for launcher apps to use abstract class."

10 years agoMerge "Use the right package name for MountServiceIdler"
Christopher Tate [Tue, 17 Jun 2014 22:22:05 +0000 (22:22 +0000)]
Merge "Use the right package name for MountServiceIdler"

10 years agoUse the right package name for MountServiceIdler
Christopher Tate [Tue, 17 Jun 2014 22:07:01 +0000 (15:07 -0700)]
Use the right package name for MountServiceIdler

Manifest package != .java "package" decl for system process entities.

Change-Id: I162f8fed6b62b27d056049b55f77e776090a4c80

10 years agoMerge "Revert "Publish DevicePolicyManager CA certificate APIs""
Robin Lee [Tue, 17 Jun 2014 22:15:07 +0000 (22:15 +0000)]
Merge "Revert "Publish DevicePolicyManager CA certificate APIs""

10 years agoRevert "Publish DevicePolicyManager CA certificate APIs"
Robin Lee [Tue, 17 Jun 2014 22:12:28 +0000 (22:12 +0000)]
Revert "Publish DevicePolicyManager CA certificate APIs"

This reverts commit 5260bf69946563dc47c17e7441b352adfce384c5.

Change-Id: I5e44fdac8a7375576b25171f58e31a1fa0e3c569

10 years agoNot touchable windows should not hide windows behind
Svetoslav [Tue, 17 Jun 2014 21:47:16 +0000 (14:47 -0700)]
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

10 years agoMerge "Throw ISE on too-big-views-with-layers"
John Reck [Wed, 18 Jun 2014 21:40:56 +0000 (21:40 +0000)]
Merge "Throw ISE on too-big-views-with-layers"

10 years agoThrow ISE on too-big-views-with-layers
John Reck [Wed, 18 Jun 2014 21:21:29 +0000 (14:21 -0700)]
Throw ISE on too-big-views-with-layers

 Bug: 12971954

Change-Id: I3ef995e91f236014b0a72a90846ef19ce6dc42b1

10 years agoam 7deaf7c5: am f2dcb390: Merge "Limit swipe dismiss progress to positive values...
Mark Renouf [Wed, 18 Jun 2014 21:09:39 +0000 (21:09 +0000)]
am 7deaf7c5: am f2dcb390: Merge "Limit swipe dismiss progress to positive values" into klp-modular-dev

* commit '7deaf7c5304aed9ca2ed6dc0e6c5e853127e6020':
  Limit swipe dismiss progress to positive values

10 years agoam 8312bfd6: am 5cfea842: Merge "docs: add allowembedded" into klp-modular-dev
Robert Ly [Wed, 18 Jun 2014 21:09:23 +0000 (21:09 +0000)]
am 8312bfd6: am 5cfea842: Merge "docs: add allowembedded" into klp-modular-dev

* commit '8312bfd6181037eb7dab04a38bca9b6231bcad00':
  docs: add allowembedded

10 years agoam f2dcb390: Merge "Limit swipe dismiss progress to positive values" into klp-modular-dev
Mark Renouf [Wed, 18 Jun 2014 19:37:02 +0000 (19:37 +0000)]
am f2dcb390: Merge "Limit swipe dismiss progress to positive values" into klp-modular-dev

* commit 'f2dcb390444ffb42cf8637c99f53d821917554e6':
  Limit swipe dismiss progress to positive values

10 years agoMerge "setSelectedHeader() when switching to fragment"
Brian Attwell [Wed, 18 Jun 2014 20:29:07 +0000 (20:29 +0000)]
Merge "setSelectedHeader() when switching to fragment"

10 years agoMerge "Fix blinking animation during Visibility transitions."
George Mount [Wed, 18 Jun 2014 20:21:17 +0000 (20:21 +0000)]
Merge "Fix blinking animation during Visibility transitions."

10 years agoam 5cfea842: Merge "docs: add allowembedded" into klp-modular-dev
Robert Ly [Wed, 18 Jun 2014 18:33:31 +0000 (18:33 +0000)]
am 5cfea842: Merge "docs: add allowembedded" into klp-modular-dev

* commit '5cfea84264911b93057a667cbcaf90e10740d658':
  docs: add allowembedded

10 years agoFix blinking animation during Visibility transitions.
George Mount [Tue, 17 Jun 2014 17:14:39 +0000 (10:14 -0700)]
Fix blinking animation during Visibility transitions.

Bug 15618501

Change-Id: I9dff9eb386a4bfb51caec24f3f7cc0fad06ae04c

10 years agoam ef655f26: docs: Added "games" metadata tag for Play Games landing page in d.a...
Quddus Chong [Wed, 18 Jun 2014 16:07:41 +0000 (16:07 +0000)]
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

10 years agodocs: Added "games" metadata tag for Play Games landing page in d.a.c.
Quddus Chong [Wed, 18 Jun 2014 15:56:28 +0000 (08:56 -0700)]
docs: Added "games" metadata tag for Play Games landing page in d.a.c.
Bug: 15709471

Change-Id: Ibac4bd844245e71a8cb975bd86d07f9df0c25be5

10 years agoFix dirty calculation for layer updates
John Reck [Tue, 17 Jun 2014 23:18:09 +0000 (16:18 -0700)]
Fix dirty calculation for layer updates

 Bug: 15682142

 Defer early return of alpha <= 0 for damage accumulation until
 popTransform() so that layer updates will be performed regardless
 of alpha

Change-Id: Ifb94dd3ed2d96d610e6f2f3071933903016273a5

10 years agoam f546eeb1: Merge "DO NOT MERGE Reduce chance of notification listener dropped messa...
Griff Hazen [Wed, 18 Jun 2014 03:18:24 +0000 (03:18 +0000)]
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.

10 years agoam 95df0762: Merge "docs: Edits to the L Preview API overview." into klp-modular-dev
Robert Ly [Wed, 18 Jun 2014 03:13:23 +0000 (03:13 +0000)]
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.

10 years agoam b5d79bd2: Merge "Android TV Landing Page" into klp-modular-dev
Robert Ly [Wed, 18 Jun 2014 03:13:19 +0000 (03:13 +0000)]
am b5d79bd2: Merge "Android TV Landing Page" into klp-modular-dev

* commit 'b5d79bd2ab8b0382e05f38653ce0fbb56290ea58':
  Android TV Landing Page

10 years agoam 8e18e016: Wear Landing page fixes
Joe Fernandez [Wed, 18 Jun 2014 03:13:15 +0000 (03:13 +0000)]
am 8e18e016: Wear Landing page fixes

* commit '8e18e0169d3488e9a9ca02d1ff7aee06932a54a3':
  Wear Landing page fixes

10 years agoWear Landing page fixes
Joe Fernandez [Wed, 18 Jun 2014 03:00:33 +0000 (20:00 -0700)]
Wear Landing page fixes

- fixed scroll animation
- un-hardcoded G+ widget

Change-Id: I679d6d5baf65516a163bb01ec3bf90c1b53e647b

10 years agoam 1595c61d: am 5a49fc33: am c57b410c: Add a script to rename fonts for SDK. [DO...
Deepanshu Gupta [Wed, 18 Jun 2014 00:20:35 +0000 (00:20 +0000)]
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]

10 years agoam 5a49fc33: am c57b410c: Add a script to rename fonts for SDK. [DO NOT MERGE]
Deepanshu Gupta [Wed, 18 Jun 2014 00:15:35 +0000 (00:15 +0000)]
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]

10 years agoam c57b410c: Add a script to rename fonts for SDK. [DO NOT MERGE]
Deepanshu Gupta [Wed, 18 Jun 2014 00:10:34 +0000 (00:10 +0000)]
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]

10 years agoam 15967d0a: am 88b37eda: Merge "Fix reading memory usage for 64-bit processes"
Colin Cross [Tue, 17 Jun 2014 22:53:09 +0000 (22:53 +0000)]
am 15967d0a: am 88b37eda: Merge "Fix reading memory usage for 64-bit processes"

* commit '15967d0a8f8f858b0ed6aaf9d5aab5c65b94257f':
  Fix reading memory usage for 64-bit processes

10 years agoam 88b37eda: Merge "Fix reading memory usage for 64-bit processes"
Colin Cross [Tue, 17 Jun 2014 22:47:50 +0000 (22:47 +0000)]
am 88b37eda: Merge "Fix reading memory usage for 64-bit processes"

* commit '88b37edaeab7b31cab0f5115e5c9f63a49991408':
  Fix reading memory usage for 64-bit processes

10 years agoMerge "Fix reading memory usage for 64-bit processes"
Colin Cross [Tue, 17 Jun 2014 22:40:26 +0000 (22:40 +0000)]
Merge "Fix reading memory usage for 64-bit processes"

10 years agoFix reading memory usage for 64-bit processes
Colin Cross [Tue, 17 Jun 2014 22:18:07 +0000 (15:18 -0700)]
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

10 years agoMerge "Introduce <application> attribute android:fullBackupOnly={boolean}"
Christopher Tate [Thu, 19 Jun 2014 00:51:23 +0000 (00:51 +0000)]
Merge "Introduce <application> attribute android:fullBackupOnly={boolean}"

10 years agoIntroduce <application> attribute android:fullBackupOnly={boolean}
Christopher Tate [Wed, 18 Jun 2014 00:12:35 +0000 (17:12 -0700)]
Introduce <application> attribute android:fullBackupOnly={boolean}

It is quite possible for an application to be happy with having the OS
save full-data archives of its data, but still need to selectively
filter the set of saved files or otherwise participate in full-data
backup and restore.  In general we assume that any app which provides
a backup agent implementation will be directly participating via the
incremental key/value backup API; this new attribute allows an app
to tell the OS "perform full-data backup/restore for me even though
I am supplying my own agent implementation to participate."

Change-Id: I810c50d44aa683b1f23604b7d1f3e96a1722103a

10 years agoMerge "Fix bug when Keyguard gets hidden."
Jorim Jaggi [Wed, 18 Jun 2014 00:06:49 +0000 (00:06 +0000)]
Merge "Fix bug when Keyguard gets hidden."

10 years agoMerge "Throw exception when a bad adapter is passed to Spinner"
Alan Viverette [Tue, 17 Jun 2014 23:48:49 +0000 (23:48 +0000)]
Merge "Throw exception when a bad adapter is passed to Spinner"

10 years agoThrow exception when a bad adapter is passed to Spinner
Alan Viverette [Tue, 17 Jun 2014 23:43:45 +0000 (16:43 -0700)]
Throw exception when a bad adapter is passed to Spinner

BUG: 13570583
Change-Id: Ia38fa907bad7634f79d0da15b885905de23c9c46

10 years agoUpdate accessibility focus color
Alan Viverette [Tue, 17 Jun 2014 23:25:57 +0000 (16:25 -0700)]
Update accessibility focus color

BUG: 15453163
Change-Id: I1504246cfdf7c4af2c9817c47b6bb71f7dc53573

10 years agoFix bug when Keyguard gets hidden.
Jorim Jaggi [Tue, 17 Jun 2014 22:04:47 +0000 (15:04 -0700)]
Fix bug when Keyguard gets hidden.

We make sure in Keyguard that we only hide ourselves in
startKeyguardExitAnimation ourselves when we requested a hide.

In addition, this change also fixes a bug in WindowAnimator that
it should only call startKeyguardExitAnimation when Keyguard actually
requested a hide.

Bug: 15676717
Change-Id: I2279cccb9916985b7e9a2f41137878be5782cb9c

10 years agoMerge "docs: add allowembedded" into klp-modular-dev
Robert Ly [Wed, 18 Jun 2014 18:25:32 +0000 (18:25 +0000)]
Merge "docs: add allowembedded" into klp-modular-dev

10 years agodocs: add allowembedded
Robert Ly [Mon, 16 Jun 2014 06:03:01 +0000 (23:03 -0700)]
docs: add allowembedded

Change-Id: I748db66a62c85ad37f900b5bde83be178a1c6902

10 years agoMerge "Battery saver notifications should be public."
John Spurlock [Wed, 18 Jun 2014 13:42:01 +0000 (13:42 +0000)]
Merge "Battery saver notifications should be public."

10 years agoBattery saver notifications should be public.
John Spurlock [Wed, 18 Jun 2014 13:40:00 +0000 (09:40 -0400)]
Battery saver notifications should be public.

Bug:15713445
Change-Id: I2ed0e47bcc3120baf85c8529b7ef15756e215ea7

10 years agoImplement portSelect/sendKeyEvent for HdmiControlService
Jinsuk Kim [Wed, 18 Jun 2014 01:00:39 +0000 (10:00 +0900)]
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

10 years agoam a2d30107: (-s ours) am f546eeb1: Merge "DO NOT MERGE Reduce chance of notification...
Griff Hazen [Wed, 18 Jun 2014 03:22:28 +0000 (03:22 +0000)]
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.

10 years agoam d664830c: am 95df0762: Merge "docs: Edits to the L Preview API overview." into...
Robert Ly [Wed, 18 Jun 2014 03:22:22 +0000 (03:22 +0000)]
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.

10 years agoam 04095773: am b5d79bd2: Merge "Android TV Landing Page" into klp-modular-dev
Robert Ly [Wed, 18 Jun 2014 03:22:17 +0000 (03:22 +0000)]
am 04095773: am b5d79bd2: Merge "Android TV Landing Page" into klp-modular-dev

* commit '04095773beb2fed34ae7cd3d80c8f6f8e8cea05e':
  Android TV Landing Page

10 years agoam 003ff78a: am 8e18e016: Wear Landing page fixes
Joe Fernandez [Wed, 18 Jun 2014 03:22:12 +0000 (03:22 +0000)]
am 003ff78a: am 8e18e016: Wear Landing page fixes

* commit '003ff78a84f2b216660b524fc49665394a339d25':
  Wear Landing page fixes

10 years agoMerge "Add SystemAudioAutoInitiationAction and SystemAudioStatusAction"
Jungshik Jang [Wed, 18 Jun 2014 02:38:11 +0000 (02:38 +0000)]
Merge "Add SystemAudioAutoInitiationAction and SystemAudioStatusAction"

10 years agoAdd SystemAudioAutoInitiationAction and SystemAudioStatusAction
Jungshik Jang [Tue, 17 Jun 2014 08:48:42 +0000 (17:48 +0900)]
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

10 years agoam 5ba5ab31: (-s ours) am 1595c61d: am 5a49fc33: am c57b410c: Add a script to rename...
Deepanshu Gupta [Wed, 18 Jun 2014 01:47:15 +0000 (01:47 +0000)]
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]

10 years agoMerge "Print a warning message instead of throwing IllegalStateException"
Sungsoo Lim [Wed, 18 Jun 2014 01:44:35 +0000 (01:44 +0000)]
Merge "Print a warning message instead of throwing IllegalStateException"

10 years agoMerge "Add getSystemPhoneApplication to TelecommManager"
Yorke Lee [Thu, 19 Jun 2014 00:48:15 +0000 (00:48 +0000)]
Merge "Add getSystemPhoneApplication to TelecommManager"

10 years agoAdd getSystemPhoneApplication to TelecommManager
Yorke Lee [Wed, 18 Jun 2014 20:01:26 +0000 (13:01 -0700)]
Add getSystemPhoneApplication to TelecommManager

Change-Id: Ie67698e8363d1498b37692dc7be23b14a0d8c388

10 years agoMerge "Fix the default VPN confirm dialog component name."
Sreeram Ramachandran [Thu, 19 Jun 2014 00:37:43 +0000 (00:37 +0000)]
Merge "Fix the default VPN confirm dialog component name."

10 years agoFix the default VPN confirm dialog component name.
Sreeram Ramachandran [Thu, 19 Jun 2014 00:30:22 +0000 (17:30 -0700)]
Fix the default VPN confirm dialog component name.

This was a mistake introduced in http://ag/479286.

Bug: 15087985
Change-Id: I09e1cdcbfbe36b322db9b3178324a9ebb7d5e586

10 years agoMerge "TvContract: Change constants of canonical genres to all-caps values"
Jae Seo [Thu, 19 Jun 2014 00:25:04 +0000 (00:25 +0000)]
Merge "TvContract: Change constants of canonical genres to all-caps values"

10 years agoMerge "Fix job service validation in secondary users"
Christopher Tate [Thu, 19 Jun 2014 00:35:51 +0000 (00:35 +0000)]
Merge "Fix job service validation in secondary users"

10 years agoFix job service validation in secondary users
Christopher Tate [Wed, 18 Jun 2014 20:53:31 +0000 (13:53 -0700)]
Fix job service validation in secondary users

Bug 15714663

Change-Id: I101bcc979f30062bec36f462522227b857b58054

10 years agoMerge "TvContract: Add columns for video format and resolution"
Jae Seo [Thu, 19 Jun 2014 00:24:49 +0000 (00:24 +0000)]
Merge "TvContract: Add columns for video format and resolution"

10 years agoMerge "Add Cherokee, Canadian Aboriginal Syllabics, and Yi fonts."
Roozbeh Pournader [Thu, 19 Jun 2014 00:07:34 +0000 (00:07 +0000)]
Merge "Add Cherokee, Canadian Aboriginal Syllabics, and Yi fonts."

10 years agoAdd Cherokee, Canadian Aboriginal Syllabics, and Yi fonts.
Roozbeh Pournader [Wed, 18 Jun 2014 03:21:47 +0000 (20:21 -0700)]
Add Cherokee, Canadian Aboriginal Syllabics, and Yi fonts.

Bug: 15708701
Change-Id: I1cdd26798ace5eec24d09b9b5b49eb943edacbe9

10 years agoTvContract: Change constants of canonical genres to all-caps values
Jae Seo [Tue, 17 Jun 2014 23:10:43 +0000 (16:10 -0700)]
TvContract: Change constants of canonical genres to all-caps values

This is just for consistency with other constant values.

Change-Id: If226af08e66532c9110bc88e3c68d3958c67cdb6

10 years agoTvContract: Add columns for video format and resolution
Jae Seo [Fri, 13 Jun 2014 22:52:49 +0000 (15:52 -0700)]
TvContract: Add columns for video format and resolution

Added COLUMN_VIDEO_FORMAT to the Channels table to indicate typical
video format for programs from a given TV channel, which can later be
used to filter out channels. Also defined common video formats and
resolutions and a utility method to get the video resolution for a given
format.

Added COLUMN_VIDEO_WIDTH and COLUMN_VIDEO_HEIGHT to the Programs table
to indicate the actual video dimension for each individual TV program,
which can be shown as a part of program information by applications.

Bug: 1535111115456031
Change-Id: Id72e25de40f06a1b615620365e06cf11e4cd9f81

10 years agocamera2: Map camera characteristics in the managed layer
Igor Murashkin [Tue, 17 Jun 2014 19:04:07 +0000 (12:04 -0700)]
camera2: Map camera characteristics in the managed layer

Change-Id: Ic86c8df3d703e7cf89caa856387e2c0a1b977401

10 years agoMerge "Add READ_ALL_VOICEMAIL permission in the core"
fafaisland [Tue, 17 Jun 2014 22:54:26 +0000 (22:54 +0000)]
Merge "Add READ_ALL_VOICEMAIL permission in the core"

10 years agoAdd READ_ALL_VOICEMAIL permission in the core
fafaisland [Tue, 17 Jun 2014 18:22:22 +0000 (11:22 -0700)]
Add READ_ALL_VOICEMAIL permission in the core

Bug:15695227

Change-Id: I96bebcd949293679d938b2ec290820d4ed9035fa

10 years agoMerge "Don't end lock task mode when not in lock task mode"
Christopher Tate [Wed, 18 Jun 2014 23:50:54 +0000 (23:50 +0000)]
Merge "Don't end lock task mode when not in lock task mode"

10 years agoDon't end lock task mode when not in lock task mode
Christopher Tate [Wed, 18 Jun 2014 23:37:52 +0000 (16:37 -0700)]
Don't end lock task mode when not in lock task mode

Change-Id: I3724d68ed7116d47024638d56c5bf43c4866f82e

10 years agoMerge "Adding start delay to the task view transforms."
Winson Chung [Wed, 18 Jun 2014 23:45:22 +0000 (23:45 +0000)]
Merge "Adding start delay to the task view transforms."

10 years agoam 3aa4de11: am 802aaf3b: am 47de3060: Merge "Fix element size on 64b"
Jason Sams [Wed, 18 Jun 2014 23:14:14 +0000 (23:14 +0000)]
am 3aa4de11: am 802aaf3b: am 47de3060: Merge "Fix element size on 64b"

* commit '3aa4de11b05599d75af92a15820731144941c38f':
  Fix element size on 64b

10 years agoam 802aaf3b: am 47de3060: Merge "Fix element size on 64b"
Jason Sams [Wed, 18 Jun 2014 23:08:35 +0000 (23:08 +0000)]
am 802aaf3b: am 47de3060: Merge "Fix element size on 64b"

* commit '802aaf3b9d029e8f6fdb1bf0a81758484801d330':
  Fix element size on 64b

10 years agoam 47de3060: Merge "Fix element size on 64b"
Jason Sams [Wed, 18 Jun 2014 22:54:08 +0000 (22:54 +0000)]
am 47de3060: Merge "Fix element size on 64b"

* commit '47de306050576535014ff2b0c08006f951eea2ee':
  Fix element size on 64b

10 years agoMerge "Stronger PackageParser contract, more split work."
Jeff Sharkey [Wed, 18 Jun 2014 23:09:53 +0000 (23:09 +0000)]
Merge "Stronger PackageParser contract, more split work."

10 years agoStronger PackageParser contract, more split work.
Jeff Sharkey [Wed, 18 Jun 2014 01:18:49 +0000 (18:18 -0700)]
Stronger PackageParser contract, more split work.

Require that method callers always provide relevant paths, instead of
relying on constructor.  Move DisplayMetrics to be an overall parser
parameter, and move PARSE_TRUSTED_OVERLAY to flags.

Parse split APKs and apply deterministic ordering based on split
names.  Assert consistent package name and version code across all
split APKs in a package, and enforce unique split names and required
base APK.

Collect certificates for split APKs, enforcing they're all signed
consistently.  Better flow control and resource cleanup when
collecting certs.  Refactor validation code so it's easier to reason
about.  Cleaner maintenance of read buffer when draining stream
contents.

Change-Id: I8bc8c62095fbb933227b9e76ad8771f4b1246fe8

10 years agoMerge "Don't make translucent window opaque during activity transition."
George Mount [Wed, 18 Jun 2014 22:58:44 +0000 (22:58 +0000)]
Merge "Don't make translucent window opaque during activity transition."

10 years agoDon't make translucent window opaque during activity transition.
George Mount [Thu, 12 Jun 2014 23:35:35 +0000 (16:35 -0700)]
Don't make translucent window opaque during activity transition.

Bug 15535332

Returning transitions will continue to not work until
Bug 14869070 is fixed.

Change-Id: If0128b58eb852b037924ae6dea8e975fedbe5be7

10 years agoMerge "Fix element size on 64b"
Jason Sams [Wed, 18 Jun 2014 21:21:29 +0000 (21:21 +0000)]
Merge "Fix element size on 64b"

10 years agoFix element size on 64b
Jason Sams [Wed, 18 Jun 2014 20:17:57 +0000 (13:17 -0700)]
Fix element size on 64b

RenderScript Element types know their own size.  This
change properly tracks the new object sizes.

Change-Id: I3cbf76a7ec5f68056ed5599e9406cea05ba86969

10 years agoMerge "Change lock-task DPM authorization to packages"
Jason Monk [Wed, 18 Jun 2014 13:22:26 +0000 (13:22 +0000)]
Merge "Change lock-task DPM authorization to packages"

10 years agoUpdate corp badge assets.
Kenny Guy [Wed, 18 Jun 2014 10:52:25 +0000 (11:52 +0100)]
Update corp badge assets.

Bug: 15445217
Change-Id: Ie91548625be91272ee684be2c314a9d2e9376b76

10 years agoMerge "Limit swipe dismiss progress to positive values" into klp-modular-dev
Mark Renouf [Wed, 18 Jun 2014 19:32:06 +0000 (19:32 +0000)]
Merge "Limit swipe dismiss progress to positive values" into klp-modular-dev

10 years agoLimit swipe dismiss progress to positive values
Mark Renouf [Wed, 18 Jun 2014 14:43:29 +0000 (10:43 -0400)]
Limit swipe dismiss progress to positive values

BUG: 15716749

Change-Id: Ibd6daa1a515611e5c9b8a02c6df75130aa8c093b

10 years agoMerge "Fix build break in log statement"
Adam Lesinski [Wed, 18 Jun 2014 20:03:59 +0000 (20:03 +0000)]
Merge "Fix build break in log statement"

10 years agoFix build break in log statement
Adam Lesinski [Wed, 18 Jun 2014 19:56:28 +0000 (12:56 -0700)]
Fix build break in log statement

For logging purposes, a uint32_t was being converted into
a void pointer, which on certain systems would be a conversion
to a different size.

Change-Id: I90af69ab975d84c9c8cbb1cce94ff4e9cc6edcf2

10 years agoMerge "Improve constant state for VectorDrawable"
ztenghui [Wed, 18 Jun 2014 19:57:31 +0000 (19:57 +0000)]
Merge "Improve constant state for VectorDrawable"

10 years agoImprove constant state for VectorDrawable
ztenghui [Mon, 16 Jun 2014 17:30:58 +0000 (10:30 -0700)]
Improve constant state for VectorDrawable

    Now inflation will not cause duplicated constant states.
    And update tests.

Change-Id: I66861e5451c4c10d18756e8522546ea1cb938a55

10 years agoFix bitmap tinting
Alan Viverette [Wed, 18 Jun 2014 17:57:12 +0000 (10:57 -0700)]
Fix bitmap tinting

BUG: 15716407
Change-Id: I4008c9763fedc2f716040cd3f73ad79d77343960