Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
139,926 Commits 3 Branches 0 Tags
b65ea7bfc6797d1aa8ef359f144eb2b8070dbf72
Commit Graph

40919 Commits

Author SHA1 Message Date
Dianne Hackborn
b65ea7bfc6 Fix issue #15689396: pre-installed DemoAPI tests fail... 
...with a NPE on emulators running Google x86 API 19 image

Change-Id: Ib989127f48b0c02ec645b99827a9b775188684d8
 2014-06-20 12:18:55 -07:00
Ruben Brunk
a783875420 Merge "camera2: Add AE antibanding + fps range metadata." 2014-06-20 02:04:45 +00:00
Igor Murashkin
e76e8bce93 Merge "camera2: Fix deadlocks in shim #close and make #testInvalidCapture pass" 2014-06-20 03:08:23 +00:00
Ruben Brunk
5776aafc7e camera2: Add AE antibanding + fps range metadata. 
Bug: 15116722
Change-Id: I627748e162f26c42f6bbcfc21ee4b1081e1f25ad
 2014-06-19 19:20:36 -07:00
Andres Morales
626861c5a5 Merge "Framework changes to support NFC trustlet." 2014-06-20 02:15:46 +00:00
Andres Morales
3b33fd283c Framework changes to support NFC trustlet. 
Adds a system-only ability to register for receiving
tags from NfcService at the lockscreen.

Change-Id: I4b50941031e8d1f40ebb6314211226e70a2ad187
 2014-06-20 10:05:52 -07:00
George Mount
9285d1bf9c Exclude views that aren't on screen from Activity Transitions. 
Bug 15704207

Change-Id: I114a5191536b5c59c6c2d1074fab8505a8ad2fdb
 2014-06-20 14:09:57 +00:00
Dianne Hackborn
5ff885cd3b Revert "Add support for tint attribute in VectorDrawable" 
This reverts commit ab41ea17e6b0407fa76bc9f9183190a9bbc7f560.

Was causing system UI to crash.
 2014-06-19 23:02:37 -07:00
Yorke Lee
4d9950d13a Merge "Revert "Add ability to set and get DefaultPhoneApplication"" 2014-06-20 02:09:17 +00:00
Yorke Lee
cf9bc5e76d Revert "Add ability to set and get DefaultPhoneApplication" 
This reverts commit 8bdb1ff3279ab9fde0499231580c76dc2533f3c4.

Change-Id: Idc6d64820c23a650e5f0113ed8ff0860c61ea6af
 2014-06-20 10:05:17 -07:00
Igor Murashkin
49b2b13510 camera2: Fix deadlocks in shim #close and make #testInvalidCapture pass 
* Also fixes configureOutputs to allow it to unconfigure
* Adds IAE checks in a few spots to validate surfaces aren't null

Bug: 15116722
Change-Id: I9ec88bccb3600eb12747d84436ead27952e87646
 2014-06-19 17:36:07 -07:00
John Spurlock
ffb9439172 Merge "If we're not showing switch text, don't include in measure." 2014-06-20 00:24:32 +00:00
John Spurlock
e599488968 If we're not showing switch text, don't include in measure. 
Naive fix for switch crashes when !showText.

Bug:15770311
Change-Id: I68839b61b907d62159e2c12349005683e9ac6436
 2014-06-20 10:53:54 -04:00
Alan Viverette
a97f80562e Merge "Don't show text in Material-styled switch" 2014-06-20 00:11:43 +00:00
Alan Viverette
2a37cf8d76 Don't show text in Material-styled switch 
BUG: 15754341
Change-Id: Iae43b31c6e445207a0c95b48d0f0befac0f5cc78
 2014-06-19 17:09:10 -07:00
Alan Viverette
e93c90126b Merge "Add support for tint attribute in VectorDrawable" 2014-06-20 00:06:01 +00:00
Alan Viverette
9a77cb92da Add support for tint attribute in VectorDrawable 
Also fixes docs reference in TypedArray.

BUG: 15375203
Change-Id: I8cd2f43bd73f50084e21e5b986af9dc1c1447ad6
 2014-06-19 17:16:17 -07:00
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
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
Craig Mautner
bb27b1c3a6 Merge "Allow a root activity to relinquish task identity" 2014-06-19 20:37:59 +00:00
Craig Mautner
9d4e9bcebb Allow a root activity to relinquish task identity 
If a an acitivty with attribute android:relinquishTaskIdentity true
is the root activity of a task then the intent of that task will
be that of the first activity in the stack with
android:relinquishTaskIdentity set false.

The ability to set intent also includes the ability to set the
TaskDescription of the task.

Fixes bug 15675610.
Fixes bug 10428661.

Change-Id: Ib28a9eae3b9832eeeef9106adbebe344184ee5ae
 2014-06-19 16:40:01 -07:00
Brian Attwell
0d8acb2ceb Merge "setSelectedHeader() when switching to fragment" 2014-06-18 19:24:54 +00: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
George Mount
4c20ea2972 Fix blinking animation during Visibility transitions. 
Bug 15618501

Change-Id: I9dff9eb386a4bfb51caec24f3f7cc0fad06ae04c
 2014-06-18 11:13:06 -07: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
Yorke Lee
2e58ab7660 Merge "Add UNDEMOTE_METHOD to ContactsContract" 2014-06-19 14:48:39 +00:00
Yorke Lee
0e040b0ea1 Add UNDEMOTE_METHOD to ContactsContract 
Bug: 15593967
Change-Id: I9404107d65a0e6ac5f58dd5dd4b6b5df519ec20f
 2014-06-18 15:02:44 -07:00
Igor Murashkin
4961bc88d7 camera2: Map camera characteristics in the managed layer 
Change-Id: Ic86c8df3d703e7cf89caa856387e2c0a1b977401
 2014-06-17 22:55:16 +00:00
Mark Renouf
d1e01b7631 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
 2014-06-18 21:09:39 +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
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 Greenwalt
19f01ebe90 Merge "Remove Obsolete enable/disableApn functions." 2014-06-17 21:43:29 +00:00
Raph Levien
580ecd4b2b Merge "Simple implementation of drawPosText" 2014-06-19 14:48:39 +00:00
Raph Levien
3f0d616722 Simple implementation of drawPosText 
The existing implementation of drawPosText is broken in various subtle
ways, in any case doesn't work with Minikin. This patch just implements
it by drawing a separate run for each Unicode character, which should
have the least surprising results for complex scripts such as Khmer.

Part of b/11750374 Resolve TODO items for Minikin

Change-Id: I874ae3c163f0cbe3cdf0160564fab04305aed5aa
 2014-06-19 11:22:45 -07:00
ztenghui
65eb8e844e Merge "Add path support into xml files for PathInterpolator and ObjectAnimator." 2014-06-19 14:48:39 +00:00
ztenghui
cf4832f69c Add path support into xml files for PathInterpolator and ObjectAnimator. 
The test case is showing that AnimatedVectorDrawable is able to use path to
define time interpolator and object movement now.

Change-Id: If3c0418265d0fd762c8f5f0bb8c39cce3ad34ef3
 2014-06-19 10:56:28 -07:00
Adam Powell
adb11e0732 Merge "Fix ActionBar#isShowing when called before first layout" 2014-06-19 14:48:39 +00:00
Adam Powell
f65bfb700b Fix ActionBar#isShowing when called before first layout 
Fix a regression introduced by the new hide offset API addition where
an action bar height of 0 (not yet measured) would cause the bar to be
considered hidden.

Bug 14574446

Change-Id: Ic8e22923ab59df6078136daa336e074c4b7adaf5
 2014-06-19 10:55:28 -07:00
John Reck
af0b9c83a3 Merge "Revert changes to invalidateChild" 2014-06-19 17:43:18 +00:00