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

125223 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
4645c5ba33 am a8706527: am b071a07d: am a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)." 
* commit 'a870652789cc2b06b921fe66aa1bf48d4fc3e97c':
  Remove java.io.tmpdir assignment in AndroidRuntime (again).
 2014-03-11 15:21:04 +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
b071a07da8 am a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)." 
* commit 'a79af3647f7f93825b84cc25187527b5aac60a69':
  Remove java.io.tmpdir assignment in AndroidRuntime (again).
 2014-03-11 08:14:26 -07:00
Narayan Kamath
a79af3647f Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)." 2014-03-11 15:09: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
ad35099a87 am b485d8e1: am 194e77aa: am 0f3fd6c6: Merge "Remove stray logging statement." 
* commit 'b485d8e1e405296307197ae07c6ed214be3b4f58':
  Remove stray logging statement.
 2014-03-11 12:08:58 +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
194e77aafe am 0f3fd6c6: Merge "Remove stray logging statement." 
* commit '0f3fd6c66e8376e62ed61dd2b92ea4807571b3de':
  Remove stray logging statement.
 2014-03-11 05:03:36 -07: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
9a3ed5bd3c am 70c27436: am daa1c969: am aaf23a9a: am c3f5d694: Merge "Hang off call by power button while screen is on" 
* commit '70c274361ec6089c5ed9d1a62877d51b9ec1dcc8':
  Hang off call by power button while screen is on
 2014-03-11 00:37:57 +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
Lajos Molnar
7246fa5610 MediaPlayer: fix int overflow issue in MediaTimeProvider 
Bug: 13394783
Change-Id: I228ded5cf198852fda867d136cd8b1aacd8b6584
 2014-03-10 17:23:45 -07:00
Jeff Brown
1c4d86c7b4 am f54d62dc: am fc7315c6: am 6d71e165: Merge "Round off when calculate next step in Seekbar" 
* commit 'f54d62dc80b43a72adaa273836f00153ce7edc72':
  Round off when calculate next step in Seekbar
 2014-03-11 00:19:07 +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
1491aaf503 am 14006523: am 33282d66: am a41ddccd: Merge "Fixed typo errors in documentation" 
* commit '140065230900b465f85f64c5da5181d124076e1d':
  Fixed typo errors in documentation
 2014-03-11 00:15:14 +00:00
Jeff Brown
70c274361e am daa1c969: am aaf23a9a: am c3f5d694: Merge "Hang off call by power button while screen is on" 
* commit 'daa1c96954f666b9f661501e11014a57533eefad':
  Hang off call by power button while screen is on
 2014-03-11 00:15:11 +00:00
Jeff Brown
3c6bb4d4ec am f2e837e5: am e7f7af96: am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter" 
* commit 'f2e837e57900514a554f174a29730157160c1fa1':
  take account of RotationVector's new extra parameter
 2014-03-11 00:15:03 +00:00
Jeff Brown
fc7315c6c1 am 6d71e165: Merge "Round off when calculate next step in Seekbar" 
* commit '6d71e165ba961251f0705b75aafed74eba1bc570':
  Round off when calculate next step in Seekbar
 2014-03-10 17:11:57 -07: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
daa1c96954 am aaf23a9a: am c3f5d694: Merge "Hang off call by power button while screen is on" 
* commit 'aaf23a9a653457cccf54293b2ff76196718c7a1a':
  Hang off call by power button while screen is on
 2014-03-11 00:11:10 +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
33282d6615 am a41ddccd: Merge "Fixed typo errors in documentation" 
* commit 'a41ddccdc67ace7c9363efebbf6e51710928ce12':
  Fixed typo errors in documentation
 2014-03-10 17:08:27 -07:00
Jeff Brown
aaf23a9a65 am c3f5d694: Merge "Hang off call by power button while screen is on" 
* commit 'c3f5d694324fbe2831405ce60bc43bd0d0183d07':
  Hang off call by power button while screen is on
 2014-03-10 17:08:24 -07:00
Jeff Brown
e7f7af964b am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter" 
* commit '35c8ebab0ac66bf2c12b6986f90a07be402e0076':
  take account of RotationVector's new extra parameter
 2014-03-10 17:08:21 -07: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
c3f5d69432 Merge "Hang off call by power button while screen is on" 2014-03-11 00:06:01 +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
Adam Powell
8566f1561b am c8b43bc0: am fd6b9975: Prevent overflow from MeasureSpec.adjust; measure cache fix 
* commit 'c8b43bc0021aea63858044551f13cae86f4e5699':
  Prevent overflow from MeasureSpec.adjust; measure cache fix
 2014-03-10 23:35:16 +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
857aa7be88 Initialize mAffineTransform and update on modification 
This patch causes the InputReader to update its mAffineTransform to reflect
the currently-set calibration on startup and whenever its value is changed
through the InputManagerService.

Change-Id: I81c76e8cf168728ee140abaf148e1cd31687d5af
 2014-03-10 15:54:21 -07: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