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

80860 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
a08e6881c5 am ed044cda: am 09829b71: Merge "Expand volume APIs for MediaRouter" into jb-dev 
* commit 'ed044cda8f6a7600923eecdec682c449f86e0429':
  Expand volume APIs for MediaRouter
 2012-06-20 22:45:09 -07:00
Eric Fischer
3650ce0479 Merge "Import translations. DO NOT MERGE" 2012-06-20 22:43:46 -07:00
Eric Fischer
2220c2ef87 Merge "Import translations. DO NOT MERGE" 2012-06-20 22:43:16 -07:00
Adam Powell
ed044cda8f am 09829b71: Merge "Expand volume APIs for MediaRouter" into jb-dev 
* commit '09829b71de3a84cb9d1bc0d8aad78dd16daadddf':
  Expand volume APIs for MediaRouter
 2012-06-20 22:35:44 -07:00
Jeff Brown
223d224fcb am 071ed334: am fc32ec9a: Merge "Don\'t reset brightness to 0 on initial boot." into jb-dev 
* commit '071ed3348739cb3f2bb9ef169067440c8c61b881':
  Don't reset brightness to 0 on initial boot.
 2012-06-20 22:34:42 -07:00
Hiroshi Lockheimer
5b0128c571 am e5934259: am b342cdd7: Merge "made the pressed state white" into jb-dev 
* commit 'e5934259fc80b13ee6f54309fa23ee1889cb501a':
  made the pressed state white
 2012-06-20 22:34:39 -07:00
Pannag Sanketi
c83788cec9 am 4bae6149: am 60c5b714: Merge "Crash in SurfaceTextureTarget filter open" into jb-dev 
* commit '4bae6149bd419eac00e5782a30d19463957e3c42':
  Crash in SurfaceTextureTarget filter open
 2012-06-20 22:34:36 -07:00
Craig Mautner
8f47078eb7 am e96f06ae: am 255cb779: Merge "Make animations persist after completion." into jb-dev 
* commit 'e96f06ae1607be2af6fa810bb3913cac679d0ac9':
  Make animations persist after completion.
 2012-06-20 22:34:34 -07:00
Svetoslav Ganov
1ca3609a70 am e523faa8: am 5070a7f0: Merge "Change hard-coded URL for accessibility script." into jb-dev 
* commit 'e523faa84f656785adbbd67414f9a141ec49d800':
  Change hard-coded URL for accessibility script.
 2012-06-20 22:34:31 -07:00
Hung-ying Tyan
9c42639cdd am cc9a4e3e: am 927c7fd1: Merge "Fix crash when SimpleCursorAdapter changes cursor from null" into jb-dev 
* commit 'cc9a4e3e2a3716965cd0b76d48e8e840e6ce0f41':
  Fix crash when SimpleCursorAdapter changes cursor from null
 2012-06-20 22:34:28 -07:00
Adam Powell
09829b71de Merge "Expand volume APIs for MediaRouter" into jb-dev 2012-06-20 22:32:39 -07:00
Jeff Brown
071ed33487 am fc32ec9a: Merge "Don\'t reset brightness to 0 on initial boot." into jb-dev 
* commit 'fc32ec9a51cb78e58ae673abc327f4ef7be98fad':
  Don't reset brightness to 0 on initial boot.
 2012-06-20 22:31:17 -07:00
Hiroshi Lockheimer
e5934259fc am b342cdd7: Merge "made the pressed state white" into jb-dev 
* commit 'b342cdd7ba333d5cec8a85dc093f55751bc37c3c':
  made the pressed state white
 2012-06-20 22:31:15 -07:00
Pannag Sanketi
4bae6149bd am 60c5b714: Merge "Crash in SurfaceTextureTarget filter open" into jb-dev 
* commit '60c5b714dc747eef0b5c2a57db60b162315fba2f':
  Crash in SurfaceTextureTarget filter open
 2012-06-20 22:31:12 -07:00
Craig Mautner
e96f06ae16 am 255cb779: Merge "Make animations persist after completion." into jb-dev 
* commit '255cb7798160a083124cd2033e0619f8b3ed731c':
  Make animations persist after completion.
 2012-06-20 22:31:09 -07:00
Svetoslav Ganov
e523faa84f am 5070a7f0: Merge "Change hard-coded URL for accessibility script." into jb-dev 
* commit '5070a7f0f4bf817e884b9e6ea8ee23c99209c50e':
  Change hard-coded URL for accessibility script.
 2012-06-20 22:31:05 -07:00
Hung-ying Tyan
cc9a4e3e2a am 927c7fd1: Merge "Fix crash when SimpleCursorAdapter changes cursor from null" into jb-dev 
* commit '927c7fd1fec8ff26fd4bf8cc64eb12dd634cb60b':
  Fix crash when SimpleCursorAdapter changes cursor from null
 2012-06-20 22:31:00 -07:00
Adam Powell
8e37a85bf3 Expand volume APIs for MediaRouter 
Allow applications to set a requested volume level on RouteInfo
objects. If requested for a user route, the app-supplied callback will
be invoked to perform actual volume adjustment.

Change-Id: I856990a0da7292492aa15e6562dbc3d055b848a0
 2012-06-20 22:19:29 -07:00
Jeff Brown
fc32ec9a51 Merge "Don't reset brightness to 0 on initial boot." into jb-dev 2012-06-20 20:37:37 -07:00
Eric Fischer
9a05cfd1e8 Import translations. DO NOT MERGE 
Change-Id: Ic0044b2b8a5d2973a6fcc10f947bdf3b47c0bb6d
 2012-06-20 19:58:14 -07:00
Eric Fischer
2553e8bc3d Import translations. DO NOT MERGE 
Change-Id: Id09fac4eb8e3d90e64eb2609315df5d8dd5f9130
 2012-06-20 19:55:18 -07:00
Hiroshi Lockheimer
b342cdd7ba Merge "made the pressed state white" into jb-dev 2012-06-20 19:47:19 -07:00
Jeff Brown
8e306a68e8 Don't reset brightness to 0 on initial boot. 
Bug: 6705012
Change-Id: I8114fda081784abbe720d5eaa637aa5234b5a947
 2012-06-20 19:46:32 -07:00
Pannag Sanketi
60c5b714dc Merge "Crash in SurfaceTextureTarget filter open" into jb-dev 2012-06-20 19:32:44 -07:00
Craig Mautner
255cb77981 Merge "Make animations persist after completion." into jb-dev 2012-06-20 19:28:16 -07:00
Pannag Sanketi
22f2a8728e Crash in SurfaceTextureTarget filter open 
If the filter graph in an app closes out, the SurfaceTextureTarget
filter was losing the reference to the original surfacetexture, and the
app would re-start the graph without setting the surfacetexture again,
thus leading to a crash in registering a surface from surfacetexture.

Typical scenarios is start/stop immediately in camera effects recording.

Fix part of b/6651352
Fix part of b/6655597

Change-Id: Ib2bae7e886784e91b3a886f7ccd439ff190feb22
 2012-06-20 19:23:48 -07:00
Craig Mautner
a371154f08 Make animations persist after completion. 
Transition animations were set to fillAfter=false which caused them
to revert when they had completed. Normally this would not have
mattered as the final state was obscured by the new Activity. In
the case of the Phone app the Activities churn so much that the
original Activity was exposed.

Fixes bug 6691421.

Change-Id: I96b8a43d0a2cac9a34a14a309548c41451c65a57
 2012-06-20 18:49:38 -07:00
Svetoslav Ganov
5070a7f0f4 Merge "Change hard-coded URL for accessibility script." into jb-dev 2012-06-20 18:09:58 -07:00
Hung-ying Tyan
927c7fd1fe Merge "Fix crash when SimpleCursorAdapter changes cursor from null" into jb-dev 2012-06-20 17:56:40 -07:00
Svetoslav Ganov
93e417b560 am 0a79d2fb: am dce5af63: Merge "Fix GlowPadView accessibility behavior." into jb-dev 
* commit '0a79d2fbcdf6ee5b0375de223e5230e5e538362f':
  Fix GlowPadView accessibility behavior.
 2012-06-20 16:58:18 -07:00
Svetoslav Ganov
0a79d2fbcd am dce5af63: Merge "Fix GlowPadView accessibility behavior." into jb-dev 
* commit 'dce5af632ce8899905fbf187b9505f6753d5a562':
  Fix GlowPadView accessibility behavior.
 2012-06-20 16:55:07 -07:00
Svetoslav Ganov
dce5af632c Merge "Fix GlowPadView accessibility behavior." into jb-dev 2012-06-20 16:52:16 -07:00
alanv
3ff50a0a8a Change hard-coded URL for accessibility script. 
The old version of the script is broken and is cached due to an error in
our gstatic configuration. We had to change the name to avoid hitting the
cached version on external proxies.

Bug: 6702042
Change-Id: I0e5ee8b3a6ae8c7ba11f5760f2f99d4b5614ac97
 2012-06-20 16:51:00 -07:00
Jean-Michel Trivi
ecab2aab19 am e44440f4: am bd6b1820: Merge "Unhide new API in android.media.MediaRouter for remote playback" into jb-dev 
* commit 'e44440f40c6b005dce2eba1b37b3cabe97133152':
  Unhide new API in android.media.MediaRouter for remote playback
 2012-06-20 16:46:55 -07:00
Jean-Michel Trivi
63258b253c am 7fe75d97: am fc178e38: Merge "Asynchronous handling of remote volume updates" into jb-dev 
* commit '7fe75d9759544d9b2eccac19aacb8c3992dfcc02':
  Asynchronous handling of remote volume updates
 2012-06-20 16:46:51 -07:00
Jean-Michel Trivi
e44440f40c am bd6b1820: Merge "Unhide new API in android.media.MediaRouter for remote playback" into jb-dev 
* commit 'bd6b1820d931ef11fc7fc5b8571a8265c1ed4994':
  Unhide new API in android.media.MediaRouter for remote playback
 2012-06-20 16:43:55 -07:00
Jean-Michel Trivi
7fe75d9759 am fc178e38: Merge "Asynchronous handling of remote volume updates" into jb-dev 
* commit 'fc178e381d3db299901a96461122eb22a4ffb43e':
  Asynchronous handling of remote volume updates
 2012-06-20 16:43:52 -07:00
Jean-Michel Trivi
bd6b1820d9 Merge "Unhide new API in android.media.MediaRouter for remote playback" into jb-dev 2012-06-20 16:41:44 -07:00
Jean-Michel Trivi
fc178e381d Merge "Asynchronous handling of remote volume updates" into jb-dev 2012-06-20 16:41:25 -07:00
Amith Yamasani
05187871c1 am 1806afb2: am 998a6836: Merge "Add a private method to retrieve the header list from PreferenceActivity" into jb-dev 
* commit '1806afb2c48eefea8a881fece8dc5233d403d649':
  Add a private method to retrieve the header list from PreferenceActivity
 2012-06-20 15:53:50 -07:00
Amith Yamasani
1806afb2c4 am 998a6836: Merge "Add a private method to retrieve the header list from PreferenceActivity" into jb-dev 
* commit '998a68369fcf7928b6fa58d6312426f88a27a39e':
  Add a private method to retrieve the header list from PreferenceActivity
 2012-06-20 15:48:27 -07:00
Amith Yamasani
998a68369f Merge "Add a private method to retrieve the header list from PreferenceActivity" into jb-dev 2012-06-20 15:44:48 -07:00
Scott Main
006217fa23 am 90c2eea8: am 59ea115d: Cherrypick from ics-mr1 Change-Id: I2f63aef72962990afeb2bf236e0cce3bac3af738 docs: Remove side padding built into Design images to improve alignment. a few HTML adjustments for alignment as well 
* commit '90c2eea8d0fdad51412ff7fa97a55b7930dec3c9':
  Cherrypick from ics-mr1 Change-Id: I2f63aef72962990afeb2bf236e0cce3bac3af738 docs: Remove side padding built into Design images to improve alignment. a few HTML adjustments for alignment as well
 2012-06-20 15:05:52 -07:00
Scott Main
90c2eea8d0 am 59ea115d: Cherrypick from ics-mr1 Change-Id: I2f63aef72962990afeb2bf236e0cce3bac3af738 docs: Remove side padding built into Design images to improve alignment. a few HTML adjustments for alignment as well 
* commit '59ea115def6ed7277f6f159e0670b5a37c3ca126':
  Cherrypick from ics-mr1 Change-Id: I2f63aef72962990afeb2bf236e0cce3bac3af738 docs: Remove side padding built into Design images to improve alignment. a few HTML adjustments for alignment as well
 2012-06-20 14:59:04 -07:00
Scott Main
59ea115def Cherrypick from ics-mr1 Change-Id: I2f63aef72962990afeb2bf236e0cce3bac3af738 
docs: Remove side padding built into Design images to improve alignment.
a few HTML adjustments for alignment as well

Change-Id: I432e25128a90b0376a2a469859b0ad49b035a2df
 2012-06-20 14:50:55 -07:00
Jean-Michel Trivi
2cd5d25378 Unhide new API in android.media.MediaRouter for remote playback 
Expose new functionality for handling remote volume in:
 android.media.MediaRouter.RouteInfo
 android.media.MediaRouter.UserRouteInfo
 android.media.MediaRouter.VolumeCallback

Change-Id: I8fd9c92be606364599e65939f318e11c2860bab9
 2012-06-20 14:36:23 -07:00
Richard Ngo
e2bd3fac1c made the pressed state white 
Change-Id: Ic30f6f9aa574731ff1ed52364262c0d9b795dca0
 2012-06-20 14:03:55 -07:00
Amith Yamasani
423d48bbba Add a private method to retrieve the header list from PreferenceActivity 
This is required by Settings app to be able to update the header list
if the accounts list changed.

Bug: 6685701
Change-Id: If27f83ec86fe1f3519a6e25de4e4fe4864133dc8
 2012-06-20 13:54:53 -07:00
Jean-Michel Trivi
f98de1e8dd Asynchronous handling of remote volume updates 
Remote playback information updates will be posted from the
 application thread, and sent to AudioService. Because they
 require locking the stack containing the remote playback
 information, the update should happen on AudioService's handler
 thread to avoid lock contention.

Change-Id: Ie04898295e08c16dd8ab5985fd825301e9cf1981
 2012-06-20 13:40:22 -07:00
Mathias Agopian
99babf48f6 am 8b389539: am 06c93386: Merge "Exit boot animation cleanly." into jb-dev 
* commit '8b3895392662640b84d3e2bbadb0bc53c456cea5':
  Exit boot animation cleanly.
 2012-06-20 13:40:03 -07:00