Commit Graph

4494 Commits

Author SHA1 Message Date
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
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
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
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
David Christie
e7baf5afc0 Merge "Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69" into lmp-dev 2014-09-04 20:53:39 +00:00
David Christie
c20b795cf0 Add @SystemApi annotations to methods used by GmsCore.
-Currently these methods are called using reflection for location.
Bug: 17371392
Change-Id: I6546f5b485415beff69164ba0d526757ee831f69
2014-09-04 20:53:21 +00:00
Adam Lesinski
430f5680b6 Merge "Add Configuration changes to UsageStats" into lmp-dev 2014-09-04 20:35:51 +00:00
Jason Monk
d8927a84fb Merge "Change constants from API review feedback" into lmp-dev 2014-09-04 19:40:30 +00:00
Kenny Guy
773200640b Fix RemoteViews to inflate views for current user.
Fix RemoteViews so that it loads resources from
user that created the RemoteViews but inflates
for the user applying the RemoteViews.
Fix Notification to rebuild RemoteViews with
same ApplicationInfo as original app.

Bug: 17302505
Change-Id: I39f21eef83d63e9e494ea35818e1eb969edd38d7
2014-09-04 20:18:35 +01:00
Adam Lesinski
7f61e96db7 Add Configuration changes to UsageStats
Bug:17354208
Change-Id: I9b2f595e51b656607e30e798926cfb7e25134944
2014-09-04 12:15:32 -07:00
Kenny Guy
6e0a5aef30 Merge "Revert "Ensure all RemoteViews use myUserId rather than context."" into lmp-dev 2014-09-04 19:14:25 +00:00
Jason Monk
5503a55c0b Change constants from API review feedback
Bug: 17390600
Change-Id: Ie93da8eb6786b7135e8b852804a95f376fcb9d91
2014-09-04 14:25:45 -04:00
George Mount
0f6c32af06 Merge ""Back" with translucent window now sets ActivityOptions." into lmp-dev 2014-09-04 18:03:52 +00:00
George Mount
9e18397112 "Back" with translucent window now sets ActivityOptions.
Also made convertToTranslucent set the canvas opacity.

Bug 16215650

Change-Id: Id4325eaed34cda1269d874f239aeb5f6f82c959f
2014-09-04 11:02:29 -07:00
Chris Wren
0fb810a3fa Merge "Honor per-app sensitivity setting." into lmp-dev 2014-09-04 17:42:18 +00:00
Kenny Guy
692356b7c3 Revert "Ensure all RemoteViews use myUserId rather than context."
This reverts commit 5287e37687f117ac0b690100ad90842eff58d15a.
Reverting because only worked if settings cache had been populated
already.

Bug: 17302505
Change-Id: I4360606e9d9c6409951f0a02bd0b78c55085e0c6
2014-09-04 18:24:31 +01:00
Chris Wren
3ad4e3a45b Honor per-app sensitivity setting.
Settings are stored by NotificationManagerService in the policy file,
and are communicated to NotificationListeners via a hidden API on the
RankingMap object.

Bug: 16324353
Change-Id: I2d5cf6782273744cbf9b309dec76780cc0a4c39e
2014-09-04 11:49:06 -04:00
Alexandra Gherghina
0cd0b186c3 Merge "Fix NPE from empty PackageInfo" into lmp-dev 2014-09-04 15:33:50 +00:00
Alexandra Gherghina
db811dbc70 Fix NPE from empty PackageInfo
Bug: 17325905
Change-Id: I38ae5e242b1bf615620cf069a2cccede6ee42125
2014-09-04 15:46:23 +01:00
Dan Sandler
d2961355bd Merge "Notification: Limit length of accepted strings" into lmp-dev 2014-09-04 13:36:34 +00:00
Kenny Guy
a449018105 Merge "Ensure all RemoteViews use myUserId rather than context." into lmp-dev 2014-09-04 13:09:32 +00:00
Kenny Guy
879ebec4e2 Ensure all RemoteViews use myUserId rather than context.
Remote views may be inflated in another user so
explicitly use processes user id rather than the
user id of the context.

Bug: 17302505
Change-Id: I985c91745f03dd7e6b2ab6357600077664d8e6be
2014-09-04 12:40:24 +01:00