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

136707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
94d643a1c2 Merge "Check for null" 2014-05-23 23:26:03 +00:00
Chris Craik
2425efab83 am dcdd43b6: (-s ours) Merge "DO NOT MERGE Inspect SkShader to determine hw shader." into lmp-preview-dev 
* commit 'dcdd43b62eacb2988b5621456b941d47500e830c':
  DO NOT MERGE Inspect SkShader to determine hw shader.
 2014-05-23 23:25:27 +00:00
Chris Craik
cd3a824548 Merge "DO NOT MERGE Inspect SkShader to determine hw shader." into lmp-preview-dev 2014-05-23 23:21:49 +00:00
Christopher Tate
6000a6c663 Merge "Run the task manager service at startup" 2014-05-23 23:18:13 +00:00
Christopher Tate
8f64f80888 Run the task manager service at startup 
Also moves most of it into android.app.task rather than android.content.

Bug 14993295
Bug 14997851

Change-Id: I9b5738d026ea2526cdfbc96d0239c74687c51611
 2014-05-23 16:07:45 -07:00
Zhijun He
2f6da3e739 am 0eb2fa3c: Merge "Camera2: Mark the under-specified tags for FUTURE" into lmp-preview-dev 
* commit '0eb2fa3cf88d037f645555e3a1c4644cdf0a67c9':
  Camera2: Mark the under-specified tags for FUTURE
 2014-05-23 22:48:08 +00:00
Zhijun He
c1631fd890 Merge "Camera2: Mark the under-specified tags for FUTURE" into lmp-preview-dev 2014-05-23 22:44:33 +00:00
Christopher Tate
792d52a59b am 55b23ac2: (-s ours) Merge "DO NOT MERGE - Don\'t crash uninstalling updates to system apps" into lmp-preview-dev 
* commit '55b23ac23d27bbab5c1aa5688e5eb9e13d92e7d3':
  DO NOT MERGE - Don't crash uninstalling updates to system apps
 2014-05-23 22:38:51 +00:00
Craig Mautner
deec695253 Merge "Add code for persisting tasks and activities to disk" 2014-05-23 22:37:20 +00:00
Christopher Tate
ec41d7abab Merge "DO NOT MERGE - Don't crash uninstalling updates to system apps" into lmp-preview-dev 2014-05-23 22:36:12 +00:00
Alan Viverette
9c32f25eb6 am 106210a7: Merge "Handle hybrid themes correctly in Drawable cache" into lmp-preview-dev 
* commit '106210a703563cfb11c23ab80d8f29b990df7ec5':
  Handle hybrid themes correctly in Drawable cache
 2014-05-23 22:33:51 +00:00
Alan Viverette
0b723fdbaa Merge "Handle hybrid themes correctly in Drawable cache" into lmp-preview-dev 2014-05-23 22:30:42 +00:00
Glenn Kasten
e01043797d Merge "Remove android.media.AudioFormat default constructor" 2014-05-23 22:14:17 +00:00
Scott Main
387f87f517 am c138c822: am e5c9c92c: am a4c95869: am 1f1bb9d0: Merge "add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav." into klp-docs 
* commit 'c138c822072386c66ad0c32ac5f1fb5d0bfb23c7':
  add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav.
 2014-05-23 22:01:24 +00:00
Scott Main
c138c82207 am e5c9c92c: am a4c95869: am 1f1bb9d0: Merge "add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav." into klp-docs 
* commit 'e5c9c92c23196269ccf50024f76f84779b821c32':
  add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav.
 2014-05-23 21:57:57 +00:00
Alan Viverette
70929a3cb5 am 89425f4f: Merge "Fix selection handle offsets" into lmp-preview-dev 
* commit '89425f4f4bc05f64988ca5fceb0fd5d2e370f499':
  Fix selection handle offsets
 2014-05-23 21:56:46 +00:00
Scott Main
e5c9c92c23 am a4c95869: am 1f1bb9d0: Merge "add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav." into klp-docs 
* commit 'a4c95869ed2727ecc471e218b204657b7eaf8b5c':
  add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav.
 2014-05-23 21:52:43 +00:00
Alan Viverette
7a57c01aac Merge "Fix selection handle offsets" into lmp-preview-dev 2014-05-23 21:52:40 +00:00
Eric Laurent
6b02c898f5 am 5231cb4b: am b928b7c2: am ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState" 
* commit '5231cb4bfbdd20200555f263ee73b439e33d1ec0':
  AudioService: fix cross deadlock in VolumeStreamState
 2014-05-23 21:49:41 +00:00
Scott Main
a4c95869ed am 1f1bb9d0: Merge "add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav." into klp-docs 
* commit '1f1bb9d06830552269c68bf3bd1e7184f1a7bb9d':
  add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav.
 2014-05-23 21:49:15 +00:00
Scott Main
1f1bb9d068 Merge "add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav." into klp-docs 2014-05-23 21:45:33 +00:00
Jae Seo
b609419073 am 41db0959: (-s ours) Merge "DO NOT MERGE. Add more columns to TV metadata to enable newly requested use cases" into lmp-preview-dev 
* commit '41db09593f96303dfed57c5e87b581a74950d055':
  DO NOT MERGE. Add more columns to TV metadata to enable newly requested use cases
 2014-05-23 21:43:56 +00:00
Eric Laurent
5231cb4bfb am b928b7c2: am ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState" 
* commit 'b928b7c2bf12a5dbd31b08d244b0ff8d2a9851c1':
  AudioService: fix cross deadlock in VolumeStreamState
 2014-05-23 21:41:47 +00:00
Jae Seo
cd39dc783e Merge "DO NOT MERGE. Add more columns to TV metadata to enable newly requested use cases" into lmp-preview-dev 2014-05-23 21:40:59 +00:00
Eric Laurent
b928b7c2bf am ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState" 
* commit 'ba64d298bee228b8e27ea17fb31fbff4b4188304':
  AudioService: fix cross deadlock in VolumeStreamState
 2014-05-23 21:37:54 +00:00
Eric Laurent
ba64d298be Merge "AudioService: fix cross deadlock in VolumeStreamState" 2014-05-23 21:34:25 +00:00
Eric Laurent
fdbee869be AudioService: fix cross deadlock in VolumeStreamState 
Synchronize modifications of volume index by VolumeStreamState
class mutex instead of using synchronized methods.
This avoids possible cross deadlock when modifying volume on
two stream types simultaneously and one is slave to the other.

Bug: 13730145.

Change-Id: I13406c71010ce0c2e2f08f660b6101f310396c98
 2014-05-23 21:32:06 +00:00
Alan Viverette
0ff33fba40 am a8b23365: Merge "Add support for setColorFilter in VectorDrawable" into lmp-preview-dev 
* commit 'a8b2336554daef1cf299ef0cbb6c51981a1e719f':
  Add support for setColorFilter in VectorDrawable
 2014-05-23 21:22:50 +00:00
Alan Viverette
d6405c1c75 Merge "Add support for setColorFilter in VectorDrawable" into lmp-preview-dev 2014-05-23 21:20:45 +00:00
John Reck
d04d303e5d resolved conflicts for merge of 1f6c973b to master 
Change-Id: I0d0a72f1d737fa80ac4c258c1f9fc52ef85724bd
 2014-05-23 13:56:35 -07:00
Zhijun He
8949225294 Camera2: Mark the under-specified tags for FUTURE 
Also clean up the tag ids.

Bug: 15168075
Change-Id: I57fb6fb37e512c224370c72d806a4b702360f29f
 2014-05-23 13:49:59 -07:00
justinzhang
c137a2d6c1 Merge "Hide status bars in lock task" 2014-05-23 20:46:28 +00:00
justinzhang
5286d3ff47 Hide status bars in lock task 
Call StatusBarManager to show/hide status bars for lock task.
(Same CL as https://googleplex-android-review.git.corp.google.com/#/c/461068/,
sorry for the confusion.)

Bug: 13669575
Change-Id: I5c90bdb1d868aa02d3679e854b5ccbe434d996d6
 2014-05-23 16:44:25 -04:00
John Reck
4967c18308 Merge "Bag of scheduling tweaks" into lmp-preview-dev 2014-05-23 20:43:36 +00:00
Craig Mautner
b20f796dab Check for null 
Fixes bug 15129354.

Change-Id: I88865c021a024ab94e44dc71f09f8325a79e0775
 2014-05-23 13:28:40 -07:00
Alan Viverette
6ff38eea0b Fix selection handle offsets 
BUG: 14313604
Change-Id: If8a1c60a90b89a94716c25abb3511c8612cbb973
 2014-05-23 20:25:20 +00:00
Ruben Brunk
3df29eb31f am f029447f: (-s ours) Merge "DO NOT MERGE: Javadoc fix." into lmp-preview-dev 
* commit 'f029447fa014c9d3728c16860d00a713edad5c1e':
  DO NOT MERGE: Javadoc fix.
 2014-05-23 20:13:44 +00:00
Igor Murashkin
e48fb064ac am 31771fd6: Merge "camera2: Refactor CameraMetadata.Key out into 3 key classes" into lmp-preview-dev 
* commit '31771fd63b8d08207012c4877a08679fa9b9d539':
  camera2: Refactor CameraMetadata.Key out into 3 key classes
 2014-05-23 20:13:38 +00:00
Victoria Lease
e5bf17eaf8 resolved conflicts for merge of 25208987 to master 
Change-Id: If900fc2d9892f3ff743d94cb209780047da0110f
 2014-05-23 13:10:33 -07:00
Ruben Brunk
db67ffd62b Merge "DO NOT MERGE: Javadoc fix." into lmp-preview-dev 2014-05-23 20:02:01 +00:00
Igor Murashkin
db9c3aee75 Merge "camera2: Refactor CameraMetadata.Key out into 3 key classes" into lmp-preview-dev 2014-05-23 20:00:58 +00:00
John Reck
a5dda645da Bag of scheduling tweaks 
Bug: 15118640

 * Prevent over-stuffing the queue by dropping frames
 * Prevent double-drawing in one pulse by RT by deferring
   vsync registration until post-draw so that it catches
   the next vsync pulse instead of the current one
 * Bias vsync race condition towards the UI thread
 * Fix queueDelay to actually work

Change-Id: Ibf584258bd93ebcbba058bd976dc8b307f1c6155
 2014-05-23 12:56:38 -07:00
Victoria Lease
01b67a2a1a Merge "Roboto v2" into lmp-preview-dev 2014-05-23 19:53:25 +00:00
Griff Hazen
f9e22aaaff Merge commit '1e5746c6' into mergemaster 
Conflicts:
	CleanSpec.mk

Change-Id: I8b278405eeab3ffd23eef9ae04bedb8e8803d739
 2014-05-23 12:40:46 -07:00
Dmitriy Ivanov
9b7135645e am 190ed5db: am 2137d6a8: am d5ee4144: Merge "Increase start timeout for wrapped process" 
* commit '190ed5db4ac90612c1f6420f87ea462076fbe1a0':
  Increase start timeout for wrapped process
 2014-05-23 19:34:53 +00:00
Christopher Tate
60d9d1f19f am 8c0660c2: am d6d7587a: am a0166b58: Merge "Activity chooser "Always" button is not working" 
* commit '8c0660c257d4cab61c37a03a64b7081f3095b9b5':
  Activity chooser "Always" button is not working
 2014-05-23 19:34:47 +00:00
Andrew Solovay
4daf2779f4 am 59f61cc2: am 768a899f: am b5960898: am 9562863c: doc: Updated branding guidelines per request from @deniseamling. 
* commit '59f61cc23d47f7ad714cf99be32fd70a66dba84e':
  doc: Updated branding guidelines per request from @deniseamling.
  Noted that OnSharedPreferenceChangeListener does not store a strong reference to the listener.
 2014-05-23 19:33:57 +00:00
Ruben Brunk
5e3c3aa44d DO NOT MERGE: Javadoc fix. 
Bug: 15189630

Change-Id: I4644ec782e636104fc06a27716f2fd224003e8d2
(cherry picked from commit 0a03a2ab50b665d382f92a1219177c3bd6fc568b)
 2014-05-23 19:04:47 +00:00
Igor Murashkin
d6d65154e5 camera2: Refactor CameraMetadata.Key out into 3 key classes 
Before:
* CameraMetadata.Key<T>

After:
* CameraCharacteristics.Key<T>
* CaptureResult.Key<T>
* CaptureRequest.Key<T>

CameraMetadata#get has been removed (each metadata subclass has
its own #get now) due to java generic limitations (in particular
a type bound <T1<T2> extends Key<T2>> is an illegal bound).

CameraMetadataNative gets a new #dumpToLog function to dump the native
metadata to logcat.

Bug: 15091017
Change-Id: Ic56c54c0d184e209e20de374dc8a6d79527c209f
 2014-05-23 11:55:29 -07:00
Victoria Lease
42460150cb Roboto v2 
Fresh new revisions of our Roboto family of fonts, including family
aliases for sans-serif-medium and sans-serif-black. Enjoy!

Change-Id: I2337ccbd1767a7769deea885e0900f1ca4329779
Bug: 15170360
 2014-05-23 11:25:47 -07:00