79381 Commits

Author SHA1 Message Date
Scott Main
7db989b305 am a2860267: update make file with \'since\' tag for api level 16, update version number
* commit 'a2860267cad115659018d636bf9203a644c680a7':
  update make file with 'since' tag for api level 16, update version number
2012-06-21 21:24:10 -07:00
Scott Main
a2860267ca update make file with 'since' tag for api level 16, update version number
Change-Id: I30d04dcde5cd505959d94c274634018b3602cb26
2012-06-21 21:20:42 -07:00
Adam Powell
9b5cdf4f14 am 4dd21c8e: Volume changes in MediaRouteChooserDialog
* commit '4dd21c8e77c0d369ee835f50cba1701e76aa18c4':
  Volume changes in MediaRouteChooserDialog
2012-06-21 20:49:06 -07:00
Adam Powell
4dd21c8e77 Volume changes in MediaRouteChooserDialog
Use the max volume reported by the selected route as the max value to set.

Change-Id: I9848dfb201387843e7ed398ac61e2d13e14e3f51
2012-06-21 19:59:53 -07:00
Craig Mautner
a6b8189f8e am 9ce1ea3a: Merge "Fix starting window problems." into jb-dev
* commit '9ce1ea3aa744fdd5a63ecedd07859fb2faa6f8e1':
  Fix starting window problems.
2012-06-21 18:58:59 -07:00
Craig Mautner
9ce1ea3aa7 Merge "Fix starting window problems." into jb-dev 2012-06-21 18:56:27 -07:00
Craig Mautner
f412095686 Fix starting window problems.
Three problems fixed:
1. When one Activity took over for another Activity not all of the
starting window state was being copied over. Now copying over more
parameters.

2. When the visibility of an Activity was being changed the dummy
animation was overwriting the existing animation. If that animation
was the starting window animating then it started over when the
dummy animation was assigned. Now the dummy animation no longer
replaces an existing starting window animation.

3. The test for whether to animate away the starting window only
looked to see if the Activity had already drawn a window but did
not include the starting window. This caused the starting window
to immediately be hidden when the Activity was removed if no
windows were drawn, thereby exposing the fading window behind.
Now the starting window is included in the hasAppShownWindows test
and is animated away if it is exposed.

Fixes bug 6691421.

Change-Id: I4d32a1546c201652574a44d9e7f2752f1f1eb5a6
2012-06-21 18:25:39 -07:00
RoboErik
a3bd05f212 am b047b1f7: Merge "b/6705777 Remove \'speaker\' from strings" into jb-dev
* commit 'b047b1f73800ff92eea4ff4b3adc62e5a20eb8df':
  b/6705777 Remove 'speaker' from strings
2012-06-21 17:22:50 -07:00
RoboErik
b047b1f738 Merge "b/6705777 Remove 'speaker' from strings" into jb-dev 2012-06-21 17:20:55 -07:00
RoboErik
be76e21543 b/6705777 Remove 'speaker' from strings
We should just say Tablet or Phone when selecting the local
playback instead of Tablet speakers or Phone speaker.

Change-Id: Ia6c439f711bacb7b1e70fbcf4887df8141f91b61
2012-06-21 17:05:52 -07: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
Dianne Hackborn
eef58e858a am e06e1619: Merge "Fix issue #6700897: Activity paused by activating the..." into jb-dev
* commit 'e06e1619a153a902083d2a1a0c01c86d3c7e546e':
  Fix issue #6700897: Activity paused by activating the...
2012-06-21 15:52:23 -07:00
Adam Powell
95cf8c1121 Merge "Allow ungrouping media routes when a group is the only alternate route" into jb-dev 2012-06-21 15:44:47 -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
Dianne Hackborn
e06e1619a1 Merge "Fix issue #6700897: Activity paused by activating the..." into jb-dev 2012-06-21 15:14:44 -07:00
Dianne Hackborn
f530ac323b Fix issue #6700897: Activity paused by activating the...
...lock screen does not response to onNewIntent()

We now keep activities stopped even while the lock screen is
displayed.  (We used to keep them stopped while the screen was
off, and then resume the top activity when the screen was turned
on even though they are covered by the lock screen.)

When a new intent is being delivered to an application, if it
is not resumed it is held in a pending list until the next
time the activity is resumed.  Unfortunately that means for
the case where the activity is being held stopped due to the
screen off or lock screen, it will not receive any new intents,
even though it is at the top of the stack.

Fix this by adding an additional condition that allows the new
intent to be delivered immediately if the activity manager is
sleeping and the target activity is at the top of the stack.

Also some debug output improvements, since pending new intents
were not being included in the debug output, making it impossible
to see we were in that situation.

Change-Id: I5df82ac21657f1c82e05fd8bf21474e883f44e6f
2012-06-21 14:17:48 -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
Craig Mautner
42a6516de9 am 89c6bec3: Merge "Make sure onScreenTurnedOn is called at power on." into jb-dev
* commit '89c6bec3218d2f3f6d9fbe04fe2936021440ea80':
  Make sure onScreenTurnedOn is called at power on.
2012-06-21 14:07:13 -07:00
Craig Mautner
89c6bec321 Merge "Make sure onScreenTurnedOn is called at power on." into jb-dev 2012-06-21 14:04:10 -07:00
Eric Fischer
242f1323d2 am cda69964: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'cda6996408d785f368e67afaca79a6afa6f57b1b':
  Import translations. DO NOT MERGE
2012-06-21 13:12:08 -07:00
Eric Fischer
cda6996408 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-21 13:10:49 -07:00
Craig Mautner
4f5d1511b9 Make sure onScreenTurnedOn is called at power on.
KeyguardViewMediator.onScreenTurnedOn is not called if the device is
booted into the power-on state. In this case mScreenOn remains false
and the lockscreen will always appear after outgoing calls. This fix
ensures that onScreenTurnedOn is called when the device is powered
up in the on state.

Fixes bug 6709173.

Change-Id: I7557d8f002307b9125bc53b13bc3cb4c5c9b2758
2012-06-21 13:03:41 -07:00
Eric Fischer
ed6103d573 Import translations. DO NOT MERGE
Change-Id: If3ebb62b4c2a912512600e51129551e23cf31553
2012-06-21 12:57:27 -07:00
Jake Hamby
dcd6e38c6a am 65d4445b: Merge "Add config option to enable links to Cell Broadcast app." into jb-dev
* commit '65d4445bfd3351609f786fdf6038ddd362a3d6ca':
  Add config option to enable links to Cell Broadcast app.
2012-06-21 12:34:35 -07:00
Jake Hamby
65d4445bfd Merge "Add config option to enable links to Cell Broadcast app." into jb-dev 2012-06-21 12:32:39 -07:00
Jake Hamby
43af7e0756 Add config option to enable links to Cell Broadcast app.
Add "config_cellBroadcastAppLinks" internal boolean config item,
defaulting to false. For devices with the Cell Broadcast app,
setting this config option to true will add a menu item to the
MMS app to jump to the list of received cell broadcasts, and a
preferences item to Settings to jump to cell broadcast settings.

Bug: 6709985
Change-Id: I9fe1919e6d76ba1dfe1e1381e2c38ecdd5e0a867
2012-06-21 12:17:18 -07:00
Chris Wren
70a7be0799 am ed5cc0e1: revert I057b7ac0 now that the layouts are the expected height.
* commit 'ed5cc0e1f7648962f5c93e1277d282be75bcd537':
  revert I057b7ac0 now that the layouts are the expected height.
2012-06-21 12:03:43 -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
Adam Powell
fd7ea06787 am d7c00d2b: Merge "MediaRouter group volume reporting" into jb-dev
* commit 'd7c00d2bdd011d3a73faf1c4a5bb8012d24dd648':
  MediaRouter group volume reporting
2012-06-21 11:52:19 -07:00
Eric Fischer
7059a022fe am da036c8a: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'da036c8a5709d5b985e0dd63c379e93135768c81':
  Import translations. DO NOT MERGE
2012-06-21 11:52:11 -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
Chris Wren
ed5cc0e1f7 revert I057b7ac0 now that the layouts are the expected height.
Bug: 6546766
Change-Id: I736290b897b864228ecc3e46d86ef566efda1efd
2012-06-21 13:07:29 -04: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
Adam Powell
d7c00d2bdd Merge "MediaRouter group volume reporting" into jb-dev 2012-06-21 00:12:04 -07:00
Adam Powell
f8ac14a7f5 MediaRouter group volume reporting
RouteGroups always report back the loudest volume of their component
routes. Maintain this through volume update requests (such as those
reported by volume hard keys) such that each route updates
individually, but the group slider always indicates the loudest value.

Change-Id: I5de4b9048bf55682b6271e9485fe50496a1c97c2
2012-06-20 23:59:14 -07:00
Eric Fischer
da036c8a57 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-20 22:42:58 -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
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
Daniel Sandler
064f9907c9 Unhide new methods on RemoteViews and Notification.
Change-Id: I0cbc270d9d7e9e728482c3b10650a32589636c9d
2012-06-21 00:15:01 -04:00