48196 Commits

Author SHA1 Message Date
Jose Lima
9d50ea90f7 am c770e064: am dd0db799: am 5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev
* commit 'c770e064effb79c33472f54652bd95aa14a8d6ec':
  Added LEANBACK_LAUNCHER Intent category
2014-03-12 15:19:37 +00:00
John Spurlock
f0b56b5805 am 2fcac8ba: am b41c951f: am cb5f813b: am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs
* commit '2fcac8ba6fe870d78eca7b75c0e846a229f08819':
  Fix doc typos in Vibrator.java
2014-03-12 15:19:23 +00:00
Jeff Brown
f08ea09fc0 Merge "Retain display when creating specialized contexts." 2014-03-12 03:43:17 +00:00
Jeff Brown
defd4a6b04 Retain display when creating specialized contexts.
Fixed a bug that cause Context.createPackageContext() to discard
display information.  Likewise also fixes issues where the
activity token, override configuration, user handle, and
restriction state might be discarded.

As part of this change, reworked how Contexts are created to make
initialization easier to understand and less error-prone.
The init() methods have been removed and most of the state is
now stored in final variables.

Bug: 12015587
Change-Id: If795851f1cd078bef889b76a52e00d9b3c06ab11
2014-03-11 19:30:00 -07:00
Dianne Hackborn
5c71949572 Merge "Reduce wake lock noise in battery history." 2014-03-11 22:59:21 +00:00
RoboErik
1ebd4ad6cd Fix SDK build
Change-Id: I4bf73294cc9d970e17d1cddb840b53cc42155d14
2014-03-11 15:44:40 -07:00
Jose Lima
dd0db799ee am 5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev
* commit '5f0c0498a1382ef955cccca95920ec878fe2a64c':
  Added LEANBACK_LAUNCHER Intent category
2014-03-11 19:19:11 +00:00
John Spurlock
b41c951fb1 am cb5f813b: am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs
* commit 'cb5f813bb642e72777643dcd2bcbd92cc2039388':
  Fix doc typos in Vibrator.java
2014-03-11 19:18:59 +00:00
Winson Chung
303e1ff1fe Initial changes for recents.
Change-Id: Ide2c202b4a5b25410f0f32bd0a81ccf817ede38f
2014-03-11 12:03:08 -07:00
Jessica Hummel
4cfde32ff0 Merge "Move the provisioning intents to DevicePolicyManager." 2014-03-11 18:40:52 +00:00
Jose Lima
5f0c0498a1 Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev 2014-03-11 18:08:53 +00:00
Jessica Hummel
f72078bdc5 Move the provisioning intents to DevicePolicyManager.
Change-Id: Ibde867b193e64c1fda8d9c84b0d1be36a1592035
2014-03-11 18:05:29 +00:00
John Spurlock
cb5f813bb6 am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs
* commit '0a3cb2ce1b2472b7e4ca6739eaeaa50975abf6ab':
  Fix doc typos in Vibrator.java
2014-03-11 17:43:46 +00:00
Jose Lima
38b75b6126 Added LEANBACK_LAUNCHER Intent category
Change-Id: I4f5ccfa9725106f558972c73abbe3f9435267c75
2014-03-11 10:43:31 -07:00
Baligh Uddin
c1d9bb8bea Merge "Import translations. DO NOT MERGE" 2014-03-11 17:33:23 +00:00
Jean-Michel Trivi
7ca2b89585 Merge "AudioTrack write method with data in ByteBuffer" 2014-03-11 17:12:59 +00:00
Dianne Hackborn
e5167ca61e Reduce wake lock noise in battery history.
When the work source of a wake lock was changed, this would
cause the old wake lock to be released in battery stats before
the new one was acquired (the power manager would correctly
keep holding the associated wake lock).  This resulted in a
pointless entry in the battery history showing the last wake
lock being released and a new one acquired.

This change adds a new path in to battery stats to report
when a wake lock has changed, allowing it to acquire the
new wake locks first before the old ones, so it can't drop
down to zero wake locks.  This also provides better timing
information, as the same current time can be used for both
operations.

In addition, added a new kind of history entry for the
current time, so you can tell when in actual world clock
time the battery data is happening.

Change-Id: Ibbf2eed83bb93f31f60267889b7bc5b9e71e355f
2014-03-11 10:02:40 -07:00
Narayan Kamath
42a51ae881 Fix scaleNinePatch.
Use yDivs for yDivs, and not xDivs.

bug: 13394494
Change-Id: I4ca5fe33cf61922a894f071927ef08b2d7db7dd0
2014-03-11 16:50:30 +00:00
Narayan Kamath
549046038e am 4645c5ba: am a8706527: am b071a07d: am a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."
* commit '4645c5ba33e6b8c2623f8e3c86d4ed584f9708a9':
  Remove java.io.tmpdir assignment in AndroidRuntime (again).
2014-03-11 15:24:42 +00:00
Narayan Kamath
a870652789 am b071a07d: am a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."
* commit 'b071a07da89a8736fa4fd757f9a6c6e990d0e858':
  Remove java.io.tmpdir assignment in AndroidRuntime (again).
2014-03-11 15:17:45 +00:00
Narayan Kamath
b3802a8e23 Remove java.io.tmpdir assignment in AndroidRuntime (again).
This was brought back by a bad merge conflict resolution
in change 0efbd9a463c848118c7685f4bfc8765a82caa761.

Change-Id: I0c7cbe8ee396293619eabf4d0a3c2f06c76bdd6e
2014-03-11 15:02:10 +00:00
Narayan Kamath
2802c173d3 am ad35099a: am b485d8e1: am 194e77aa: am 0f3fd6c6: Merge "Remove stray logging statement."
* commit 'ad35099a87b52e1df86237911eecda5e12961ee4':
  Remove stray logging statement.
2014-03-11 12:11:39 +00:00
Narayan Kamath
b485d8e1e4 am 194e77aa: am 0f3fd6c6: Merge "Remove stray logging statement."
* commit '194e77aafe32cacc00f69b25bec6eeea67eb0205':
  Remove stray logging statement.
2014-03-11 12:06:00 +00:00
Narayan Kamath
0f3fd6c66e Merge "Remove stray logging statement." 2014-03-11 12:00:55 +00:00
Narayan Kamath
c3955e7e5a Remove stray logging statement.
bug: https://code.google.com/p/android/issues/detail?id=66974
Change-Id: Ie34c102de143cf6aeb16c78778dda3ef5e928380
2014-03-11 11:08:41 +00:00
Alan Viverette
9b3c038c92 Merge "Unify touch feedback drawable and reveal drawable" 2014-03-11 02:10:57 +00:00
Alan Viverette
ba346f9d8d Unify touch feedback drawable and reveal drawable
BUG: 13030730
Change-Id: I65a50a00bd76b80bb242b1573b89e443e2e143fe
2014-03-10 19:09:28 -07:00
Jean-Michel Trivi
7ca0452fa6 AudioTrack write method with data in ByteBuffer
New write method with data in ByteBuffer. Allows blocking and
 non-blocking write.
If the ByteBuffer is not direct, the implementation uses the
 existing implementation with a byte array.

Bug 7919023

Change-Id: I6935e3e05783d7d7672614b194941a87abbb50cf
2014-03-11 01:34:03 +00:00
Jeff Brown
d0fd73d7c5 am 1c4d86c7: am f54d62dc: am fc7315c6: am 6d71e165: Merge "Round off when calculate next step in Seekbar"
* commit '1c4d86c7b4eba393058db62fc1e61c9dc30aaa82':
  Round off when calculate next step in Seekbar
2014-03-11 00:38:11 +00:00
Jeff Brown
e769cdf017 am 1491aaf5: am 14006523: am 33282d66: am a41ddccd: Merge "Fixed typo errors in documentation"
* commit '1491aaf503de47491bc97457c77bb51c0320793e':
  Fixed typo errors in documentation
2014-03-11 00:38:01 +00:00
Jeff Brown
22c38e67d4 am 3c6bb4d4: am f2e837e5: am e7f7af96: am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter"
* commit '3c6bb4d4ec58d03f023280c8be8d95d984c8d1f1':
  take account of RotationVector's new extra parameter
2014-03-11 00:37:53 +00:00
Jeff Brown
f54d62dc80 am fc7315c6: am 6d71e165: Merge "Round off when calculate next step in Seekbar"
* commit 'fc7315c6c17e6ebc559d2ea0afb8be64c5d7b86c':
  Round off when calculate next step in Seekbar
2014-03-11 00:15:38 +00:00
Jeff Brown
1400652309 am 33282d66: am a41ddccd: Merge "Fixed typo errors in documentation"
* commit '33282d66155e8d68acea512989ec61cb15fae1ce':
  Fixed typo errors in documentation
2014-03-11 00:11:14 +00:00
Jeff Brown
f2e837e579 am e7f7af96: am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter"
* commit 'e7f7af964baa3c5d36abd163e33ad139310049d2':
  take account of RotationVector's new extra parameter
2014-03-11 00:11:05 +00:00
Jeff Brown
6d71e165ba Merge "Round off when calculate next step in Seekbar" 2014-03-11 00:06:40 +00:00
Jeff Brown
a41ddccdc6 Merge "Fixed typo errors in documentation" 2014-03-11 00:06:25 +00:00
Jeff Brown
35c8ebab0a Merge "take account of RotationVector's new extra parameter" 2014-03-11 00:04:49 +00:00
Michael Wright
9bec0f5cc1 Merge "Support unique calibration per orientation" 2014-03-10 23:40:51 +00:00
Michael Wright
35514312e5 Merge changes I81c76e8c,I4daac2b1
* changes:
  Initialize mAffineTransform and update on modification
  Allow persistence of input device calibration
2014-03-10 23:39:52 +00:00
Adam Powell
005c0324c5 am 8566f156: am c8b43bc0: am fd6b9975: Prevent overflow from MeasureSpec.adjust; measure cache fix
* commit '8566f1561bb99eeff16b7845156c978b42ada227':
  Prevent overflow from MeasureSpec.adjust; measure cache fix
2014-03-10 23:38:19 +00:00
Jason Gerecke
d522074232 Support unique calibration per orientation
Updates the format of the calibration XML to store the Surface rotation
that a specific calibration applies to. Also updates the API to require
a rotation value for get/set, and has the native framework supply this
according to the current rotation whenever it changes.

Change-Id: I72b6703f646dd18db537365c5c9843f720a5f41e
2014-03-10 16:33:48 -07:00
Adam Powell
c8b43bc002 am fd6b9975: Prevent overflow from MeasureSpec.adjust; measure cache fix
* commit 'fd6b99750bfab7f930ee375a79009874a3196165':
  Prevent overflow from MeasureSpec.adjust; measure cache fix
2014-03-10 23:31:04 +00:00
Jason Gerecke
d6396d6720 Allow persistence of input device calibration
This patch extends the PersistentDataStore store to read and write
input device calibration data. A new SET_INPUT_CALIBRATION permission
grants apps the ability to update this information, and a new
TouchCalibration class is used to wrap the raw calibration data.

Change-Id: I4daac2b15ef03616ea5b068c1e77bebd0ce7b8c1
2014-03-10 15:54:21 -07:00
Jose Lima
30df0be254 Merge "Change comment for platform version in master" 2014-03-10 22:23:24 +00:00
Amith Yamasani
724cc1f04f Merge "Allow related users to show activities on primary user" 2014-03-10 21:36:25 +00:00
Adam Powell
fd6b99750b Prevent overflow from MeasureSpec.adjust; measure cache fix
Extract the size from the MeasureSpec value before adding the
delta. The opposite order could result in a negative delta causing
overflow into size from the EXACTLY mode, creating a very large size
value in the resulting MeasureSpec.

Don't reapply optical bounds insets after pulling a value from the
measurement cache. (The insets will have already been applied before
insertion into the cache.)

Change-Id: Ib0154f4d6c3a7c31e7fee24fd7d5d10cc5dc71a1
2014-03-10 14:09:18 -07:00
Baligh Uddin
faf781ba38 Import translations. DO NOT MERGE
Change-Id: I84c201baa48bcc71b1d1cad3442818b004655a70
Auto-generated-cl: translation import
2014-03-10 13:05:19 -07:00
Benoit Goby
6835033af4 am c6f0b54d: Merge "Add CAP_BLOCK_SUSPEND to system server" into klp-modular-dev
* commit 'c6f0b54d695b49966a13bb196800a985ac6ce212':
  Add CAP_BLOCK_SUSPEND to system server
2014-03-10 19:02:54 +00:00
Brian Carlstrom
02c7f9582b am 7b7d111b: am 9e736723: am ec4c7752: am ab97d617: Merge "Only pass -Xprofile-* options to ART"
* commit '7b7d111ba21c7c5ad161207a75f72948c427b1b0':
  Only pass -Xprofile-* options to ART
2014-03-10 17:57:35 +00:00
Jose Lima
b9f62bf2b8 Change comment for platform version in master
Change-Id: Iebee3f110a6183c43fd338d89ec46f7ae99f7611
2014-03-10 10:55:22 -07:00