81241 Commits

Author SHA1 Message Date
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
Haitao Feng
dbcfed9e2c Initialize mJunkPath to false
Change-Id: Ib48bb1d91736d27f055528c3ba275237ff5ada07
2012-06-22 09:20:26 +08:00
The Android Automerger
147db44d96 merge in jb-release history after reset to jb-dev 2012-06-21 17:51:11 -07:00
RoboErik
ab37038de0 am a3bd05f2: am b047b1f7: Merge "b/6705777 Remove \'speaker\' from strings" into jb-dev
* commit 'a3bd05f212a06551d8de403afbb7808189186ea3':
  b/6705777 Remove 'speaker' from strings
2012-06-21 17:25:51 -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
7527b369af am 8e453a03: am 95cf8c11: Merge "Allow ungrouping media routes when a group is the only alternate route" into jb-dev
* commit '8e453a034183e8688e05d0c6991608626702d56f':
  Allow ungrouping media routes when a group is the only alternate route
2012-06-21 16:47:40 -07:00
Dianne Hackborn
adb80930a9 am eef58e85: am e06e1619: Merge "Fix issue #6700897: Activity paused by activating the..." into jb-dev
* commit 'eef58e858a24c15fff303622dfe3990799e03b51':
  Fix issue #6700897: Activity paused by activating the...
2012-06-21 16:47:37 -07:00
Kenny Root
287a64af97 am ae017c55: am a9543a3d: Merge "Pass additional inputs when spawning apps via the Zygote and add SELinux permission checks."
* commit 'ae017c55824ca345186b0c9fc204401153bd8a23':
  Pass additional inputs when spawning apps via the Zygote and add SELinux permission checks.
2012-06-21 16:47:26 -07:00
Craig Mautner
ff695199ba am 42a6516d: am 89c6bec3: Merge "Make sure onScreenTurnedOn is called at power on." into jb-dev
* commit '42a6516de996b547ecbfc53fd7e101f2b8b6c490':
  Make sure onScreenTurnedOn is called at power on.
2012-06-21 16:47:19 -07:00
Eric Fischer
a0a708a236 am 242f1323: (-s ours) am cda69964: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '242f1323d2a2721bad4bd873785937d53ccdca8a':
  Import translations. DO NOT MERGE
2012-06-21 16:47:15 -07:00
Jake Hamby
50e5b2f24b am dcd6e38c: am 65d4445b: Merge "Add config option to enable links to Cell Broadcast app." into jb-dev
* commit 'dcd6e38c6a26ecee01058e68d0d963ce3c6c0fda':
  Add config option to enable links to Cell Broadcast app.
2012-06-21 16:47:10 -07:00
Chris Wren
ef46aa157b am 70a7be07: am ed5cc0e1: revert I057b7ac0 now that the layouts are the expected height.
* commit '70a7be0799bd1af77c0bcf2472d9c7e46f53c3c1':
  revert I057b7ac0 now that the layouts are the expected height.
2012-06-21 16:46:58 -07:00
Daniel Sandler
60abfa5c3a am 63d842cc: am d5353b47: Fix docs
* commit '63d842cc4da3c2eb998aaf9adacbf20e833dff02':
  Fix docs
2012-06-21 16:46:28 -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
0b800190d7 Don't crash in window manager if we fail getting .apk resources.
This normally shouldn't noramlly happen, but it can in the case of
bug 6647334 (crash in LoadedApk.makeApplication) where the package
manager information becomes inconsistent, and it could also happen
if an app was uninstalled or started updating at just the right
time during a launch.

Bug: 6647334
Change-Id: Iba22efe1d646cdac46099b2135466309577dfa54
2012-06-21 15:29:36 -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
Irfan Sheriff
55b9821dff Move ARP test functionality to ArpPeer
Change-Id: Iecd6037cf8e0faa626ba6c27cef014822a6bc61b
2012-06-21 15:08:29 -07:00
The Android Automerger
f3da1754a7 merge in jb-release history after reset to jb-dev 2012-06-21 14:19:42 -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
Chris Wren
1e9e53ec2e Merge "resolved conflicts for merge of 0a43f67e to master" 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
Chris Wren
bae2fe870a resolved conflicts for merge of 0a43f67e to master
Change-Id: I072b756bc501c7669593eff012b120905a2fd962
2012-06-21 16:46:14 -04:00
Eric Fischer
3807cf7980 Merge "Import translations. DO NOT MERGE" 2012-06-21 13:26:51 -07:00
Eric Fischer
d0a2845ab3 Import translations. DO NOT MERGE
Change-Id: Iad1ec06b30d1e06958ae84f36d860f9ec522135f
2012-06-21 13:15:26 -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
49d03616ab Merge "Import translations. DO NOT MERGE" 2012-06-21 13:11:06 -07:00
Eric Fischer
cda6996408 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-21 13:10:49 -07:00
Eric Fischer
cb156bb37d Import translations. DO NOT MERGE
Change-Id: I8a12ed839f28470b743707320c7ce2e04bfd0096
2012-06-21 13:05:10 -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
Romain Guy
eb129a266c am 16613476: am 0d6f4c06: Dejank: don\'t allocate when scrolling lists
* commit '16613476c80f20736ef6bd3d217ab56aa57b03c9':
  Dejank: don't allocate when scrolling lists
2012-06-21 12:03:58 -07:00
Adam Powell
c7be481af1 am fd7ea067: am d7c00d2b: Merge "MediaRouter group volume reporting" into jb-dev
* commit 'fd7ea06787f0be4def188621888d228f38f3a4d1':
  MediaRouter group volume reporting
2012-06-21 12:03:55 -07:00
Eric Fischer
18f4fefb85 am 7059a022: (-s ours) am da036c8a: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '7059a022fec306121885f207b4ab89d4302967a0':
  Import translations. DO NOT MERGE
2012-06-21 12:03:53 -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