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

139870 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zhijun He
6e335c44c6 Merge "Camera: Implement HAL1 and higher HAL API coexistence" 2014-06-19 20:37:59 +00:00
Zhijun He
4c91380114 Camera: Implement HAL1 and higher HAL API coexistence 
A higher hal version device like HAL3.2 can be opened as HAL1.0 device
if HAL supports it. This only applies to camera API1.

Change-Id: I4ae9f59f4317158cc1bd7ed7726e4032cdd1fa07
 2014-06-19 15:46:02 -07:00
Paul Soulos
5781fec20a Merge "Adds usage stat columns to Entity" 2014-06-19 22:33:55 +00:00
Paul Soulos
42cdda831d Adds usage stat columns to Entity 
Change-Id: I273675ee85aba49440a494e4ae27e9104ffb2fe0
 2014-06-19 16:13:38 -07:00
Jinsuk Kim
d1fdf0238a Merge "Report device status event in HdmiControlService" 2014-06-19 22:55:19 +00:00
Jinsuk Kim
4893c7efde Report device status event in HdmiControlService 
This change allows the event listener (TIF) to get notified
of the CEC logical device status change (addition/removal),
and update the available tv inputs accordingly.

Change-Id: I7f2798ad47212120ecac8093ad281f683a3d125e
 2014-06-20 07:26:17 +09:00
Jeff Sharkey
0270cfb71d Merge "Explicitly collect manifest digests." 2014-06-19 22:08:21 +00:00
Jeff Sharkey
032f2b246b Explicitly collect manifest digests. 
Previously it was a side effect of collectCertificates().

Bug: 15740334
Change-Id: I2e044fdcc1c86ce730b9570bfbecf873366325e1
 2014-06-19 15:49:05 -07:00
Brian Attwell
0d8acb2ceb Merge "setSelectedHeader() when switching to fragment" 2014-06-18 19:24:54 +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
George Mount
1798208443 Merge "Fix blinking animation during Visibility transitions." 2014-06-18 19:24:54 +00:00
Jeff Sharkey
7a2d46f39b Merge "Stronger PackageParser contract, more split work." 2014-06-18 18:28:24 +00:00
Jeff Sharkey
275e085d5a 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
 2014-06-18 16:04:13 -07:00
George Mount
52cd83e6cf Merge "Don't make translucent window opaque during activity transition." 2014-06-18 22:47:18 +00:00
Jason Monk
b593539faf Fix docs breakage from refactor 
Change-Id: I567249542ee02e4bde3e0e03cdfae8969104c1b8
 2014-06-18 18:28:46 -04:00
George Mount
3cc716c445 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
 2014-06-18 20:21:47 +00:00
Chris Craik
e48df00575 Merge "Clean up tessellation cache in prep for other tesselation types" 2014-06-18 19:24:54 +00:00
Chris Craik
6ac174b972 Clean up tessellation cache in prep for other tesselation types 
bug:15536396

Also fixes compilation warning, avoids SkPaint deep copy

Change-Id: I74334f08b1d34c6789aabf968ff62db5bacbed1b
 2014-06-18 15:31:55 -07: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
George Mount
4c20ea2972 Fix blinking animation during Visibility transitions. 
Bug 15618501

Change-Id: I9dff9eb386a4bfb51caec24f3f7cc0fad06ae04c
 2014-06-18 11:13:06 -07: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
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
Christopher Tate
d7e1685128 Merge "Use the right package name for MountServiceIdler" 2014-06-17 21:46:58 +00:00
Christopher Tate
f8ad7a9094 Use the right package name for MountServiceIdler 
Manifest package != .java "package" decl for system process entities.

Change-Id: I162f8fed6b62b27d056049b55f77e776090a4c80
 2014-06-17 15:07:01 -07:00
Robin Lee
6d3912e2ef Merge "Revert "Publish DevicePolicyManager CA certificate APIs"" 2014-06-17 21:55:55 +00:00
Robin Lee
2b5e917026 Revert "Publish DevicePolicyManager CA certificate APIs" 
This reverts commit 5260bf69946563dc47c17e7441b352adfce384c5.

Change-Id: I5e44fdac8a7375576b25171f58e31a1fa0e3c569
 2014-06-17 22:12:28 +00:00
Ruben Brunk
8bf102b1d2 Merge "camera2: Add shim frame duration and stall characteristics." 2014-06-17 21:43:29 +00:00
Ruben Brunk
3e4fed203f camera2: Add shim frame duration and stall characteristics. 
Bug: 15116722
Change-Id: Ief8b05d46fa12f63cf6a5d41e312c94d5a033553
 2014-06-19 14:50:45 -07:00
Alan Viverette
e3c433aa45 Persist selector on ListView and GridView layout 
BUG: 15472031
Change-Id: I0d10be3e0cf8a4d7580bd834e432c1c15fc481f5
 2014-06-19 14:36:59 -07:00
Yuncheol Heo
13045dd21c Add a config resource to support platform specific keysystems in WebView. 
Bug: 11759895
Change-Id: I19cc044817706d5ec2f5a236218249c0e30f98d4
 2014-06-20 06:21:13 +09:00
smain@google.com
9d40ab1206 am aa10b05a: am b6974e92: add info about enabling USB debugging to adb doc. part of initiative to document the flash process for L preview. 
* commit 'aa10b05a3b0c8b295c49e2c926bf558c34eb0419':
  add info about enabling USB debugging to adb doc. part of initiative to document the flash process for L preview.
 2014-06-19 20:23:55 +00:00
smain@google.com
aa10b05a3b am b6974e92: add info about enabling USB debugging to adb doc. part of initiative to document the flash process for L preview. 
* commit 'b6974e9261f9d0bb4af39950496428cd2b45eb6d':
  add info about enabling USB debugging to adb doc. part of initiative to document the flash process for L preview.
 2014-06-19 19:45:47 +00:00
smain@google.com
b6974e9261 add info about enabling USB debugging to adb doc. 
part of initiative to document the flash process for L preview.

Change-Id: I5177ba63d1cb2f291002b0fdb0b0209ca9e17072
 2014-06-19 11:58:35 -07:00
Jeff Sharkey
b9a45aae8d am 447b68e7: am b5e05cff: Merge "Fixing parcel leaks to avoid virtual memory leak" 
* commit '447b68e767943fdde297d78321378e2623985a0a':
  Fixing parcel leaks to avoid virtual memory leak
 2014-06-19 16:11:51 +00:00
Jeff Sharkey
447b68e767 am b5e05cff: Merge "Fixing parcel leaks to avoid virtual memory leak" 
* commit 'b5e05cffccc2ca1ce85ce9952b6c6845b46aa5c7':
  Fixing parcel leaks to avoid virtual memory leak
 2014-06-19 16:07:52 +00:00
Yorke Lee
2e58ab7660 Merge "Add UNDEMOTE_METHOD to ContactsContract" 2014-06-19 14:48:39 +00:00
Robert Ly
611e591a3a am 4d521ed9: Merge "new lmp prev landing page" into klp-modular-dev 
* commit '4d521ed9663a7a4f938b3c09f06af557614ca3d3':
  new lmp prev landing page
 2014-06-19 08:53:46 +00:00