Commit Graph

4512 Commits

Author SHA1 Message Date
Kenny Guy
ff25ce9b7b am 9e9524a4: am 652e64d3: Merge "Revert "Ensure ApplicationInfo is for correct user for system/android package." Cache in ActivityThread means this still doesn\'t make sure we will get an ApplicationInfo for the user being requested. So reverting." into lmp-dev
* commit '9e9524a4fcd6392114b6f024a21d31e78e62422c':
  Revert "Ensure ApplicationInfo is for correct user for system/android package." Cache in ActivityThread means this still doesn't make sure we will get an ApplicationInfo for the user being requested. So reverting.
2014-09-08 20:21:08 +00:00
Elliott Hughes
1eb6a248ac Merge "resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp 2014-09-08 20:10:04 +00:00
Elliott Hughes
4656e69bf3 resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp
Change-Id: I5148eda624e8504f12dbc1288cd4a7a5b7c10850
2014-09-08 13:08:43 -07:00
Jorim Jaggi
58efcc60b9 am b226b3bf: am 5d629572: Merge "Restrict line count for BigTextStyle" into lmp-dev
* commit 'b226b3bfdde6bb1b0a6cf4b7bf40bcb5821784d8':
  Restrict line count for BigTextStyle
2014-09-08 20:05:18 +00:00
Kenny Guy
48f0b48555 Merge "Revert "Ensure ApplicationInfo is for correct user for system/android package." Cache in ActivityThread means this still doesn't make sure we will get an ApplicationInfo for the user being requested. So reverting." into lmp-dev 2014-09-08 20:02:10 +00:00
Jorim Jaggi
f98fbb710b Merge "Restrict line count for BigTextStyle" into lmp-dev 2014-09-08 19:46:45 +00:00
Kenny Guy
c2a4060005 Revert "Ensure ApplicationInfo is for correct user for system/android package."
Cache in ActivityThread means this still doesn't make sure we will
get an ApplicationInfo for the user being requested. So reverting.

This reverts commit 4a3b8aa08d743b28d53b327597abf03a925641f2.

Bug:17002733
Change-Id: Ie40eb31c4074cea09de3d6a41fe38b14e00eb059
2014-09-08 18:53:56 +00:00
George Mount
7f03e02dc4 am 055417d3: am f7b281a6: Merge "Use Alpha instead of TransitionAlpha for Activity Transitions." into lmp-dev
* commit '055417d3255810a5d940fe5a94b8713906370344':
  Use Alpha instead of TransitionAlpha for Activity Transitions.
2014-09-08 18:49:27 +00:00
George Mount
214e7ad175 Merge "Use Alpha instead of TransitionAlpha for Activity Transitions." into lmp-dev 2014-09-08 18:25:03 +00:00
Jorim Jaggi
457a10d29c Restrict line count for BigTextStyle
Also fixes paddings for the first line for InboxStyle notifications.

Bug: 17161340
Change-Id: I00a92f256d9ccad7cfbcecb591e84bb0d68ba635
2014-09-08 18:31:03 +02:00
Nicolas Prevot
1d793d1e53 am de896104: am 09286405: Merge "Marking two flags as final." into lmp-dev
* commit 'de89610479d59f55de4ef3cbeca62ec27a1c9031':
  Marking two flags as final.
2014-09-08 16:23:15 +00:00
Nicolas Prevot
97e75e1da9 Merge "Marking two flags as final." into lmp-dev 2014-09-08 16:06:30 +00:00
Kenny Guy
1cc7212086 am f919288d: am b78a0a11: Merge "Ensure ApplicationInfo is for correct user for system/android package." into lmp-dev
* commit 'f919288dc7c7fc0d7e1897fe107508b46ce5838c':
  Ensure ApplicationInfo is for correct user for system/android package.
2014-09-08 13:46:36 +00:00
Kenny Guy
6a28a8d55c Merge "Ensure ApplicationInfo is for correct user for system/android package." into lmp-dev 2014-09-08 13:25:02 +00:00
Nicolas Prevot
86a967312a Marking two flags as final.
Marking FLAG_PARENT_CAN_ACCESS_MANAGED and FLAG_MANAGED_CAN_ACCESS_PARENT
as final.

BUG:17387998

Change-Id: I1562b8638e7cce5706df4517493d1732f19ece8f
2014-09-08 12:15:35 +01:00
Amith Yamasani
bcc8ac2ce9 am 630dfb41: am 081ba853: Merge "Use correct API for badging" into lmp-dev
* commit '630dfb410afd44c9db401a1679d12aa1edcfcdea':
  Use correct API for badging
2014-09-07 23:15:17 +00:00
Amith Yamasani
d28665b3c8 Merge "Use correct API for badging" into lmp-dev 2014-09-07 22:56:19 +00:00
Amith Yamasani
fdf169cbea Use correct API for badging
Bug: 17414778
Change-Id: I7c0321d9435b0787a90cd62be80862069ba2d790
2014-09-07 15:45:57 -07:00
George Mount
0f0c473488 Use Alpha instead of TransitionAlpha for Activity Transitions.
Bug 17406204

Chrome needs to be notified when the shared element
should be hidden. The alpha setter can be overridden,
but setTransitionAlpha cannot. By setting alpha as
well as transitionAlpha, we get the immediate effect
from transitionAlpha along with enabling a trigger
for Chrome's shared element to hide.

Change-Id: I6ecb44872fd237afe89dbb36e43aa50c98693b52
2014-09-07 13:26:57 -07:00
Winson Chung
2e29a6dc03 am 3004eee6: am 04682c2f: Removing unnecessary delays, ensuring transition thumbnail is the size of the header. (Bug. 16987565)
* commit '3004eee618c3fad547768210f9252bad5abb0f69':
  Removing unnecessary delays, ensuring transition thumbnail is the size of the header. (Bug. 16987565)
2014-09-07 20:25:59 +00:00
Winson Chung
2e7f3bdcc9 Removing unnecessary delays, ensuring transition thumbnail is the size of the header. (Bug. 16987565)
Change-Id: Ic104876c5fe16997eca00e0a2b3d8644c927120c
2014-09-07 20:08:40 +00:00
Dianne Hackborn
b30ea42a8d am 459f3911: am 9a77bddd: Merge "Fix issue #17391969: Only exception on Message.recycle() when target-sdk > 20" into lmp-dev
* commit '459f391177dd796d25d68184a0844a0420a1f33a':
  Fix issue #17391969: Only exception on Message.recycle() when target-sdk > 20
2014-09-07 19:20:06 +00:00
Dianne Hackborn
7bc4c08323 am 8c7be259: am 6a83e4d1: Merge "Work on issue #17357238: Recents is often slow if not used in a while" into lmp-dev
* commit '8c7be25983e44e8e1bfcb721f50ae23ca7aabf32':
  Work on issue #17357238: Recents is often slow if not used in a while
2014-09-07 19:20:00 +00:00
Dianne Hackborn
b30c9920df Merge "Fix issue #17391969: Only exception on Message.recycle() when target-sdk > 20" into lmp-dev 2014-09-07 19:04:05 +00:00
Dianne Hackborn
a4e102ee58 Work on issue #17357238: Recents is often slow if not used in a while
Add a new activity attribute, resumeWhilePausing, that allows an
activity specifying it to immediately start running without waiting
for the previous activity to pause.  The recents activity is updated
to use this.

The implementation of this is ultimately fairly simple -- if we are
in the path of resuming such an activity, and find that we first need
to pause the existing activity, then within the activity manager we
do the regular pause flow but act like it has immediately finished
pausing right then so that we can immediately go on to the resume.
To make this clean, we tell the activity when asking it to pause that
it should not come back and tell us it is done, because we aren't in
any way waiting for it.

One potentially important change I needed to make here is the pause
callback no longer provides the saved persistent state, because we
now can't count on that callback happening.  I don't think there was
really any utility in this anyway -- all modern apps will have their
save state flow happen as part of stopping, not pausing, so we'll
only capture that saved state when the stop is reported back anyway.
And since we do send the saved state back when stopping, it would
always blow away whatever we had gotten at the pause.

Finally, update the documentation for AppTask.startActivity(), and
fix the implementation handling that to be cleaner -- we need to
deal with inTask first before getting in to "oh noes add NEW_TASK
if this isn't coming from a calling activity" flow.

Change-Id: Ia1da0fac90d7bdbaafdda2e34850d795ce17a39f
2014-09-05 18:43:43 -07:00
Dianne Hackborn
7895bc2e63 Fix issue #17391969: Only exception on Message.recycle() when target-sdk > 20
Change-Id: Iaf271c96901c5dba15831681269a49ad4aaa57fd
2014-09-05 17:50:47 -07:00
Jim Miller
09629ec160 am bb9e9c7b: am 2dfada6c: Merge "Cleanup - Change name of confirm credentials method after API review" into lmp-dev
* commit 'bb9e9c7b0586dc35158529e8d10cd6b10f5e7498':
  Cleanup - Change name of confirm credentials method after API review
2014-09-05 21:57:42 +00:00
Mark Doliner
d0646dca40 Small documentation fixes across many files.
Change-Id: I3e8787ce4bc6018ea1dc9aef2a2cd4e0a8dde663
2014-09-05 13:57:51 -07:00
Jim Miller
2f2ebcd688 Cleanup - Change name of confirm credentials method after API review
Fixes bug 17288988

Change-Id: I3d69b52e7ffc9f0268fb4dc9647f8704453668b7
2014-09-05 12:11:48 -07:00
Svetoslav
c420140874 am 590f0f34: am b1d65d18: Merge "Fix runtime restart" into lmp-dev
* commit '590f0f345077cb40068e86db5a30185d454b7734':
  Fix runtime restart
2014-09-05 18:48:47 +00:00
Svetoslav
7de2abb16c Fix runtime restart
Change-Id: Ic50c8b3b06603ad517fdc8a2392ad12318d46817
2014-09-05 11:28:00 -07:00
Svetoslav
79391c3c5d am 35952bf0: am 6f0cf112: Merge "Addressing API council comments for UserManager." into lmp-dev
* commit '35952bf0e8fd0ace78b015c3cde29b322cd939bb':
  Addressing API council comments for UserManager.
2014-09-05 17:24:34 +00:00
Chris Wren
b57da35784 am 7b45868e: am b59b5205: Merge "Keep contact affinities separate across users." into lmp-dev
* commit '7b45868e6083af082c232e32f48ebf24250f317d':
  Keep contact affinities separate across users.
2014-09-05 17:07:30 +00:00
Esteban Talavera
c8cf27016d am 4414705e: am 2c6aa357: Merge "Changed value of EXTRAs to match constant name in code." into lmp-dev
* commit '4414705e57f8f090ccc99ca39613827d7f650612':
  Changed value of EXTRAs to match constant name in code.
2014-09-05 17:07:19 +00:00
Svetoslav
c7d62f02b8 Addressing API council comments for UserManager.
bug:17390424

Change-Id: I498d2541289915cb7db16e5c3249ccc7a7dc5ee6
2014-09-05 10:07:02 -07:00
Kenny Guy
6df8d523b2 Ensure ApplicationInfo is for correct user for system/android package.
createPackageContextAsUser shortcuts creating the context for
system and android packages, however it should still make sure
the ApplicationInfo for the package is for the correct user.

Bug: 17002733

Change-Id: Ie10008449f13a4464a9797937c4413d6aa119fbe
2014-09-05 16:51:23 +01:00
Chris Wren
c237555c6c Merge "Keep contact affinities separate across users." into lmp-dev 2014-09-05 14:58:40 +00:00
Esteban Talavera
ac15b85229 Merge "Changed value of EXTRAs to match constant name in code." into lmp-dev 2014-09-05 14:46:10 +00:00
Chris Wren
da4bd209cf Keep contact affinities separate across users.
Also ignore people extras on USER_ALL notifications.

Bug: 16213960
Change-Id: Ic0341c88d42d4a4f12cac35c0f41c2746aec02ac
2014-09-05 10:36:32 -04:00
Anwar Ghuloum
248b369661 Merge "Timing Hacks DO NOT MERGE" into lmp-dev 2014-09-05 14:22:51 +00:00
Anwar Ghuloum
629dc18013 Timing Hacks DO NOT MERGE
Let's submit to see any lingering effects.

Bug: 17310019
Change-Id: I791bceec0b6aa8b80ac4e6c582a10c3f0ec7a906
2014-09-05 07:17:39 -07:00
George Mount
ffd09aed4e Merge "Fix selection of epicenter in Activity Transitions." into lmp-dev 2014-09-05 14:14:53 +00:00
George Mount
c2d66a0282 Merge "Fix NPE when Window disappears during a transition." into lmp-dev 2014-09-05 14:14:40 +00:00
George Mount
88dcd1a5f7 Merge "API Review: Change SharedElementListener to SharedElementCallback." into lmp-dev 2014-09-05 13:55:35 +00:00
Kenny Guy
da3af8fe1b Merge "Fix RemoteViews to inflate views for current user." into lmp-dev 2014-09-05 11:19:01 +00:00
Esteban Talavera
37f0184d96 Changed value of EXTRAs to match constant name in code.
As per API review.

Bug: 17389863
Change-Id: I85df4453d3241745b5400a6805d8c8bb4f41e92a
2014-09-05 11:18:49 +01:00
George Mount
c6186bffe4 Fix selection of epicenter in Activity Transitions.
Bug 17393451

Change-Id: Ibbcdc104ef3193fe8ce11fa27799801ea7e73986
2014-09-04 16:33:59 -07:00
George Mount
6e7fb60b93 Fix NPE when Window disappears during a transition.
Bug 17343866

Change-Id: I421a28e833ecb78cd542f3f6a728ac87b65ef832
2014-09-04 16:20:20 -07:00
George Mount
6558056e8f API Review: Change SharedElementListener to SharedElementCallback.
Bug 15863001
Bug 17289526

Changed SharedElementListener to SharedElementCallback
Renamed methods to use "on" prefix.
Adjusted javadoc to reflect usage in Fragments.

Change-Id: I7cc517c269a8e417cb5c3a0948bdd3b654d42472
2014-09-04 15:05:22 -07:00
Craig Mautner
7a629c2d04 Update API per council request
A few protected => public changes and picking up another change
in ViewAnimationUtils that got missed.

Fixes bug 17389511.

Change-Id: I75027535eade6427c2d9067369426297c168e77e
2014-09-04 14:57:04 -07:00