Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,873 Commits 3 Branches 0 Tags
c72fba82a68992fe5bec05e4415ae98deaa66ea3
Commit Graph

26069 Commits

Author SHA1 Message Date
Gilles Debunne
c72fba82a6 Ensure batch edit mode is ended on window focus loss 
This is a translation of this open source contribution:
https://android-review.googlesource.com/38503

Change-Id: I4d3adf89d0752e6fd5ec2cdad3a54d4e764a1fe7
 2012-06-26 14:48:07 -07:00
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
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
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
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
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
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
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
alanv
78bfb98295 Fix GlowPadView accessibility behavior. 
Bug: 6702412
Change-Id: If5ab75e77b0090a405004c66da0083e81d59deb4
 2012-06-20 13:22:45 -07:00
Dianne Hackborn
ae5bd3a998 am cb1c45ed: am b6ce1f31: Merge "Fix issue #6675499: java.lang.RuntimeException: Unable to start..." into jb-dev 
* commit 'cb1c45ed80df368051368a478fa931d3333c99f6':
  Fix issue #6675499: java.lang.RuntimeException: Unable to start...
 2012-06-20 12:10:36 -07:00
Dianne Hackborn
cb1c45ed80 am b6ce1f31: Merge "Fix issue #6675499: java.lang.RuntimeException: Unable to start..." into jb-dev 
* commit 'b6ce1f311ce154af713ebc4f543fc2aaed446939':
  Fix issue #6675499: java.lang.RuntimeException: Unable to start...
 2012-06-20 12:08:00 -07:00
Dianne Hackborn
b6ce1f311c Merge "Fix issue #6675499: java.lang.RuntimeException: Unable to start..." into jb-dev 2012-06-20 12:06:14 -07:00
Jean-Michel Trivi
6009dc014f am b92d2a13: am 18ddb6ce: Merge "Remote volume handling in MediaRouter" into jb-dev 
* commit 'b92d2a13c4ab34862968f47191d2713de3701757':
  Remote volume handling in MediaRouter
 2012-06-20 09:12:59 -07:00
Jean-Michel Trivi
b92d2a13c4 am 18ddb6ce: Merge "Remote volume handling in MediaRouter" into jb-dev 
* commit '18ddb6ce6f3672a24a6f86ee4b28f5baa746bc20':
  Remote volume handling in MediaRouter
 2012-06-20 09:10:18 -07:00
Jean-Michel Trivi
18ddb6ce6f Merge "Remote volume handling in MediaRouter" into jb-dev 2012-06-20 09:07:59 -07:00
Luca Zanolin
2e134263f5 am 50ff53be: am 17c1425f: Merge "Clone the list of listeners before notifing any event." into jb-dev 
* commit '50ff53be520c0fb272507d406286711e46601386':
  Clone the list of listeners before notifing any event.
 2012-06-20 02:37:36 -07:00
Luca Zanolin
50ff53be52 am 17c1425f: Merge "Clone the list of listeners before notifing any event." into jb-dev 
* commit '17c1425f5ab5c6f734a700d74b5bd8118f289cd5':
  Clone the list of listeners before notifing any event.
 2012-06-20 02:34:33 -07:00
Luca Zanolin
17c1425f5a Merge "Clone the list of listeners before notifing any event." into jb-dev 2012-06-20 02:32:12 -07:00
Hung-ying Tyan
87ab6962e4 Fix crash when SimpleCursorAdapter changes cursor from null 
when the spinner's drop-down view is shown.

Bug: 6637141

Change-Id: I62f759f778b040db386cc72a753c3b2745517b7e
 2012-06-20 15:58:43 +08:00
Jean-Michel Trivi
1357012968 Remote volume handling in MediaRouter 
Extend MediaRouter.UserRouteInfo to enable setting playback
 information, which includes volume. When the user route instance
 has a RemoteControlClient, forward any playback information to it.
 Enable specifying a callback to be notified of volume events
 on the route.
Extend MediaRouter.RouteInfo to enable retrieving playback
 information.

Update RemoteControlClient javadoc to reflect which parts of the
 API are not intended to be made public.

Change-Id: I59d728eb61747af6c8c89d53f0faeb07940594c3
 2012-06-19 19:41:35 -07:00
Adam Powell
b10345898c am da828803: am 2dde147b: Merge "Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter." into jb-dev 
* commit 'da8288037cff76367c3088adaa174ddb27bf55c2':
  Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter.
 2012-06-19 19:22:44 -07:00
Adam Powell
da8288037c am 2dde147b: Merge "Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter." into jb-dev 
* commit '2dde147b28684fc32f03ad748af8eb87d5408c7c':
  Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter.
 2012-06-19 19:20:05 -07:00
Adam Powell
2dde147b28 Merge "Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter." into jb-dev 2012-06-19 19:18:34 -07:00
Jeff Brown
e6d2016be0 Merge "Clean up PowerManager API." 2012-06-19 18:48:20 -07:00
Romain Guy
c63c7bf944 am b56fe8ab: am f96d117e: Merge "Add extra systrace tracing" into jb-dev 
* commit 'b56fe8abf6735337b65e050f44e1baf2f3f813ed':
  Add extra systrace tracing
 2012-06-19 18:43:31 -07:00
Jeff Brown
1244cdaedd Clean up PowerManager API. 
Mostly just moved the code around and improved the docs.

Fixed a minor inefficiency in WakeLock.setWorkSource() where
we would tell the power manager that the work source was changed
even when the old work source and new work source were both null.

Fixed a bug in WakeLock.setWorkSource() where we would not
notify the power manager that the work source was changed if
there was no work source previously specified.

Added synchronized to WakeLock.setReferenceCounted.

Added a checked in WakeLock.acquireLocked() and WakeLock.release()
to check whether the wake lock is actually not held / held
before performing the corresponding operation.  This change avoids
making redundant calls into the power manager service in the
case where the wake lock is not reference counted and acquire()
or release() have been called multiple times.

Made the PowerManager and WakeLock classes final.  They are not
directly instantiable by applications so this change does not
break the API.

Removed a little dead code (one private constructor and an
unused constant).

Change-Id: I4e10cf893506115938a35756136c101256dccf30
 2012-06-19 18:42:05 -07:00
Romain Guy
b56fe8abf6 am f96d117e: Merge "Add extra systrace tracing" into jb-dev 
* commit 'f96d117e9bf2d5998677521330697628c95ec3f1':
  Add extra systrace tracing
 2012-06-19 18:40:50 -07:00
Romain Guy
f96d117e9b Merge "Add extra systrace tracing" into jb-dev 2012-06-19 18:39:08 -07:00
Jim Miller
ea03338dfa am 27d1916e: am fce2ec4d: Merge "Fix 6656710: center dot pattern in GlowPadView" into jb-dev 
* commit '27d1916e85ad994c3a440a80066737a8492eb791':
  Fix 6656710: center dot pattern in GlowPadView
 2012-06-19 18:36:04 -07:00
Jim Miller
27d1916e85 am fce2ec4d: Merge "Fix 6656710: center dot pattern in GlowPadView" into jb-dev 
* commit 'fce2ec4da468c2d5ba26de8d051ff7ee64bb01c3':
  Fix 6656710: center dot pattern in GlowPadView
 2012-06-19 18:33:27 -07:00
Jim Miller
94754ef36d Fix 6656710: center dot pattern in GlowPadView 
This fixes a bug where the dots weren't aligned with the center of the view.
The matrix should not contain the offset of the image itself since we really
want to scale about the abstract points.  The code now subtracts the image
centering positions (cx,cy) from the point to be scaled.

Change-Id: I1d46a5d51b1fd1d39944c64baf86c306c2d5e923
 2012-06-19 18:28:25 -07:00
Romain Guy
77e67cf905 Add extra systrace tracing 
This change shows how much time is spent updating and executing
framework display lists within a frame.
This change also fixes a crash that happnes if you attempt to
perform a dumpsys gfxinfo while the app is drawing (we are telling
developers to use this new tool.)

Change-Id: Ia4047a78a42b545ab77176ef4f371c300686548c
 2012-06-19 18:21:06 -07:00
Adam Powell
849df0b5a7 Add an XML attribute for controlling which route types a 
MediaRouteButton in a layout will alter.

Change-Id: I897a68188fa87e4c2dbc88794117a3ef87ffaab0
 2012-06-19 17:47:48 -07:00
Irfan Sheriff
07f834d487 Merge "Cleanup softap interface to netd" 2012-06-19 17:43:06 -07:00
Todd Poynor
12da27224d Merge "Battery stats: parse wakeup sources stats for android-3.4" 2012-06-19 17:27:15 -07:00
Adam Powell
ec23ce5cb4 am f99e81a6: am 2a2b021a: Merge "Permit MediaRouteButton to select system routes in toggle mode." into jb-dev 
* commit 'f99e81a6ff22b6b93dd057802e553f66c0a7b97b':
  Permit MediaRouteButton to select system routes in toggle mode.
 2012-06-19 17:05:01 -07:00
Adam Powell
f99e81a6ff am 2a2b021a: Merge "Permit MediaRouteButton to select system routes in toggle mode." into jb-dev 
* commit '2a2b021a2133b769e0b82fd6edc166ba98129680':
  Permit MediaRouteButton to select system routes in toggle mode.
 2012-06-19 17:03:01 -07:00
Adam Powell
2a2b021a21 Merge "Permit MediaRouteButton to select system routes in toggle mode." into jb-dev 2012-06-19 17:00:35 -07:00
Todd Poynor
73f534a2dd Battery stats: parse wakeup sources stats for android-3.4 
Change-Id: I30b2362ca7260d187e8ed4e047b30c446d32ca98
 2012-06-19 16:57:39 -07:00
Jim Miller
01b8e660ef am 904f26bd: am f7e820bb: Merge "Fix 6693743: update animation ring for keyguard and search panel" into jb-dev 
* commit '904f26bd2684f64ac8b3c41394f09c4143a600b5':
  Fix 6693743: update animation ring for keyguard and search panel
 2012-06-19 16:45:59 -07:00
Jim Miller
904f26bd26 am f7e820bb: Merge "Fix 6693743: update animation ring for keyguard and search panel" into jb-dev 
* commit 'f7e820bbc9d23e0657bbd6252fe285ba08a2551a':
  Fix 6693743: update animation ring for keyguard and search panel
 2012-06-19 16:43:39 -07:00
Jim Miller
f7e820bbc9 Merge "Fix 6693743: update animation ring for keyguard and search panel" into jb-dev 2012-06-19 16:41:50 -07:00
Irfan Sheriff
90542758d4 Cleanup softap interface to netd 
Change-Id: I01e6c5b5a5a8ddaf05b979f9cc6d1293c86e8773
 2012-06-19 16:21:22 -07:00