Dianne Hackborn
9906e784fa
am 17990395: Merge "Fix issue #6717667 : expanded notification actions don\'t work on the lock screen" into jb-dev
...
* commit '17990395bc62f8ce1bae4f1880899f231a8e613b':
Fix issue #6717667 : expanded notification actions don't work on the lock screen
2012-06-25 17:37:15 -07:00
Dianne Hackborn
17990395bc
Merge "Fix issue #6717667 : expanded notification actions don't work on the lock screen" into jb-dev
2012-06-25 17:35:36 -07:00
Michael Jurka
c4d7721cb0
am 806a3602: Merge "Update documentation on max widget bitmap usage" into jb-dev
...
* commit '806a360275b3963d1941130ca2998a8abd76126f':
Update documentation on max widget bitmap usage
2012-06-25 15:28:48 -07:00
Michael Jurka
806a360275
Merge "Update documentation on max widget bitmap usage" into jb-dev
2012-06-25 15:26:48 -07:00
Michael Jurka
f25ab44975
Update documentation on max widget bitmap usage
...
Change-Id: I564afccc425f7e76501cb7ffd404ad369bdd396d
2012-06-25 15:11:21 -07:00
Dianne Hackborn
1927ae8a56
Fix issue #6717667 : expanded notification actions don't work on the lock screen
...
FLAG_ACTIVITY_CLOSE_SYSTEM_DIALOGS was a mistake.
Instead, and the infrastructure for the status bar to take care
of closing and hiding things itself when you press these buttons,
just like it does for the main Intent of the notification.
Bug: 6717667
Change-Id: I1b22186e0cedc05f46a1a3ec78053a72afaf61b1
2012-06-25 14:28:48 -07:00
Scott Main
451f034144
am e9b4b3e9: Merge "docs: clean up javadoc code snippets, unescaped entities" into jb-dev
...
* commit 'e9b4b3e94d396d176338c62f8c9f4c183b340f9b':
docs: clean up javadoc code snippets, unescaped entities
2012-06-25 12:33:55 -07:00
Scott Main
97e0a1c6f3
docs: clean up javadoc code snippets, unescaped entities
...
Change-Id: Idc21caceccaaa2cc11a6c46b453b6a9b26164f34
2012-06-25 11:25:20 -07:00
Jean-Baptiste Queru
c34188a954
resolved conflicts for merge of f8f76d52 to jb-dev-plus-aosp
...
Change-Id: I83beeb45320de2c3fc3a00c2f5cd86a17ac1dc9f
2012-06-23 07:08:59 -07:00
Jean-Baptiste Queru
f8f76d52a7
Merge "Add the possibility to modify the View focus rect"
2012-06-23 05:52:53 -07:00
Adam Powell
3b939b7242
am fd3fd482: Merge "Update route count properly when MediaRouteButton detects grouped/ungrouped events" into jb-dev
...
* commit 'fd3fd482ab6ab67b687696f51fa67714bd36fa49':
Update route count properly when MediaRouteButton detects grouped/ungrouped events
2012-06-23 05:36:54 -07:00
Adam Powell
f3b653a21c
Update route count properly when MediaRouteButton detects
...
grouped/ungrouped events
Change-Id: I1b00678cc3b548f347c51c3fcbfce18ecc8fbabe
2012-06-22 19:22:38 -07:00
Scott Main
101a120c27
am 9be0105f: docs: fix several links
...
* commit '9be0105fbc56eb1b1813bb7c5fe258a144867a43':
docs: fix several links
2012-06-22 13:33:30 -07:00
Scott Main
9be0105fbc
docs: fix several links
...
Change-Id: I89d9fd64dc22c90680bb05415cc966c255165af9
2012-06-22 12:35:08 -07:00
Adam Powell
92a175ca6f
am 3cd46244: Merge "Avoid memory leak by only registering callback while attached to window." into jb-dev
...
* commit '3cd4624448dcaddecc75461ef645da72e7e5c098':
Avoid memory leak by only registering callback while attached to window.
2012-06-22 10:46:15 -07:00
Adam Powell
3cd4624448
Merge "Avoid memory leak by only registering callback while attached to window." into jb-dev
2012-06-22 10:44:27 -07:00
Jack Palevich
101c449152
Avoid memory leak by only registering callback while attached to window.
...
Bug: 6710307
Change-Id: Idf57251e6feb48ec3e75e797144ff800fa874cc8
2012-06-22 16:06:57 +08:00
Adam Powell
8e453a0341
am 95cf8c11: Merge "Allow ungrouping media routes when a group is the only alternate route" into jb-dev
...
* commit '95cf8c1121a95750358ee99169c96d8d4dfb4950':
Allow ungrouping media routes when a group is the only alternate route
2012-06-21 15:52:28 -07:00
Adam Powell
f7e0a328c9
Allow ungrouping media routes when a group is the only alternate route
...
Fix a MediaRouteButton bug where group item counts weren't taken into
account when deciding whether to toggle between two available groups
or show the chooser dialog.
Change-Id: I6400ffd4cfe80c8072c5be360264b8ca91d71c41
2012-06-21 15:29:40 -07:00
Kenny Root
ae017c5582
am a9543a3d: Merge "Pass additional inputs when spawning apps via the Zygote and add SELinux permission checks."
...
* commit 'a9543a3dad0da58f30580bdf99b76bc2ab97a2df':
Pass additional inputs when spawning apps via the Zygote and add SELinux permission checks.
2012-06-21 14:17:13 -07:00
Daniel Sandler
63d842cc4d
am d5353b47: Fix docs
...
* commit 'd5353b475001f19e3cbc9c1a4165c9e6038a812f':
Fix docs
2012-06-21 11:52:38 -07:00
Daniel Sandler
0a43f67ef3
am 790024bf: Merge "Unhide new methods on RemoteViews and Notification." into jb-dev
...
* commit '790024bfe6dd2765dd5e552053797459aab72da1':
Unhide new methods on RemoteViews and Notification.
2012-06-21 11:52:34 -07:00
Romain Guy
16613476c8
am 0d6f4c06: Dejank: don\'t allocate when scrolling lists
...
* commit '0d6f4c06df0b0e35125f088ca028c7226b274dc4':
Dejank: don't allocate when scrolling lists
2012-06-21 11:52:22 -07:00
Kenny Root
a9543a3dad
Merge "Pass additional inputs when spawning apps via the Zygote and add SELinux permission checks."
2012-06-21 11:05:55 -07:00
Daniel Sandler
d5353b4750
Fix docs
...
Change-Id: Ic5ff9aa07e65166a4ecaeecc5fb5e0091275bdcc
2012-06-21 09:29:51 -04:00
Daniel Sandler
790024bfe6
Merge "Unhide new methods on RemoteViews and Notification." into jb-dev
2012-06-21 06:04:43 -07:00
Romain Guy
0d6f4c06df
Dejank: don't allocate when scrolling lists
...
The new display list properties introduces in JB were causing numerous
and expensive memory allocations while scrolling lists. During a scroll
ListView sometimes attempts to apply an offset to views before they are
drawn for the first time. This had the side effect of generating a new
IllegalStateException and its entire stack trace. The exception was
caught inside the display list and never seen by users.
Generating an exception is very expensive both in terms of allocated
memory and CPU time spent crawling the stack.
List scrolls/flings are a common case of this issue but it also happens
during various types of animations. A simple alpha animation, for instance,
can cause the problem to occur.
Another side effect of this issue is more frequent and longer GC pauses.
Change-Id: Ic1b37cc84f7c8f290209cfb990d030e96d6e0dc7
2012-06-21 00:39:35 -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
Daniel Sandler
064f9907c9
Unhide new methods on RemoteViews and Notification.
...
Change-Id: I0cbc270d9d7e9e728482c3b10650a32589636c9d
2012-06-21 00:15:01 -04: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
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
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
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
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
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
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
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
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
Chet Haase
3662fe5e35
am ebc9d317: Merge "Handle non-started LayoutTransition animations correctly" into jb-dev
...
* commit 'ebc9d317ff61bf8907809692d3efa899550d70d9':
Handle non-started LayoutTransition animations correctly
2012-06-19 16:01:48 -07:00