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

125137 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Scott Main
d0f2c01c5f am 41b60030: am 60d18cea: am 21207588: am 790c5a4c: am 29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs 
* commit '41b600304e6a2d007711ec814647e4dddbdd96ca':
  fix some typos for GoogleApiClient doc
 2014-03-12 15:19:19 +00:00
Scott Main
8a1e3ac58c am 6fc25fb7: am a17a7000: am 2ada4e31: am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs 
* commit '6fc25fb727e788ea6f33e6cd8a0421750be2ef9a':
  fix typos
 2014-03-12 15:19:14 +00:00
Neil Fuller
ad895779f8 Merge "Add APIs for better interoperability with Java 1.7" 2014-03-12 11:46:11 +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
John Spurlock
2fcac8ba6f am b41c951f: am cb5f813b: am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs 
* commit 'b41c951fb1b2a27d3278948f809e90a7c203ca4b':
  Fix doc typos in Vibrator.java
 2014-03-11 23:20:19 +00:00
Scott Main
41b600304e am 60d18cea: am 21207588: am 790c5a4c: am 29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs 
* commit '60d18ceaf12ec24cea18d21121845dc4edcd5272':
  fix some typos for GoogleApiClient doc
 2014-03-11 23:20:16 +00:00
Scott Main
6fc25fb727 am a17a7000: am 2ada4e31: am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs 
* commit 'a17a7000f2e1c5d38694c6329a8efdcad48fe1d5':
  fix typos
 2014-03-11 23:20:13 +00:00
Dianne Hackborn
5c71949572 Merge "Reduce wake lock noise in battery history." 2014-03-11 22:59:21 +00:00
RoboErik
3484dff61d Merge "Fix SDK build" 2014-03-11 22:46:06 +00:00
RoboErik
1ebd4ad6cd Fix SDK build 
Change-Id: I4bf73294cc9d970e17d1cddb840b53cc42155d14
 2014-03-11 15:44:40 -07:00
Chris Craik
e361ad7ab1 Remove experimental perspective projection 
Change-Id: Iad688c8395ccd4673cc129973802b5f01dfb45ba
 2014-03-11 15:41:40 -07:00
Chris Craik
b26264948c Merge "Improve shadow tessellation performance" 2014-03-11 22:35:46 +00:00
Chris Craik
726118b352 Improve shadow tessellation performance 
- Tune and simplify shadow parameters
- Remove additional inner rings
- Improve polygon ray casting algorithm

Change-Id: If0f28b2d66ae0480b675942bb65e8fcd2864425d
 2014-03-11 15:23:36 -07: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
Scott Main
60d18ceaf1 am 21207588: am 790c5a4c: am 29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs 
* commit '212075889eab9aab2c48881803888a1b827d77ba':
  fix some typos for GoogleApiClient doc
 2014-03-11 19:18:55 +00:00
Scott Main
a17a7000f2 am 2ada4e31: am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs 
* commit '2ada4e310d728756fc9bf69086987bfe215dc487':
  fix typos
 2014-03-11 19:18:48 +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
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
Scott Main
212075889e am 790c5a4c: am 29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs 
* commit '790c5a4c06e0ceee8fbdbed575e93ef257124569':
  fix some typos for GoogleApiClient doc
 2014-03-11 17:43:42 +00:00
Scott Main
2ada4e310d am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs 
* commit '7b0c111b5f3595de5cac61b0657a6f2ecb7e77bd':
  fix typos
 2014-03-11 17:43:38 +00:00
Baligh Uddin
c1d9bb8bea Merge "Import translations. DO NOT MERGE" 2014-03-11 17:33:23 +00:00
Baligh Uddin
d75a745f85 Merge "Import translations. DO NOT MERGE" 2014-03-11 17:33:18 +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
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