Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
156,482 Commits 3 Branches 0 Tags
bc189d8a40d045397b64f0a85f824764fb0cc637
Commit Graph

4696 Commits

Author SHA1 Message Date
George Mount
da8ec6f42b am d5f92cb6: am 055417d3: am f7b281a6: Merge "Use Alpha instead of TransitionAlpha for Activity Transitions." into lmp-dev 
* commit 'd5f92cb668532757e06258918fa184703f96c809':
  Use Alpha instead of TransitionAlpha for Activity Transitions.
 2014-09-08 18:59:33 +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
Nicolas Prevot
7068faf4ce am b329d04e: am de896104: am 09286405: Merge "Marking two flags as final." into lmp-dev 
* commit 'b329d04ec7ab0818d9deeb644d363151d278a48d':
  Marking two flags as final.
 2014-09-08 16:33:00 +00: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
b7451e4923 am 444c3a9e: am f919288d: am b78a0a11: Merge "Ensure ApplicationInfo is for correct user for system/android package." into lmp-dev 
* commit '444c3a9eb36e5a2fa9e19c0aed2691503ace43e4':
  Ensure ApplicationInfo is for correct user for system/android package.
 2014-09-08 13:57:09 +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
Robin Lee
2c22d1920f Merge "Revert DevicePolicyManager PrivateKey APIs" 2014-09-08 11:18:24 +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
755d7a5877 am c0c51adc: am 630dfb41: am 081ba853: Merge "Use correct API for badging" into lmp-dev 
* commit 'c0c51adc77aca5fcdb7cd08f0fa3b73395848eb0':
  Use correct API for badging
 2014-09-07 23:25:20 +00: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
Winson Chung
2604908350 am df52495c: am 3004eee6: am 04682c2f: Removing unnecessary delays, ensuring transition thumbnail is the size of the header. (Bug. 16987565) 
* commit 'df52495ccc0b655031bb92b4961d7298076f2a72':
  Removing unnecessary delays, ensuring transition thumbnail is the size of the header. (Bug. 16987565)
 2014-09-07 20:35:10 +00: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
963ed62ba5 am f307a884: am 459f3911: am 9a77bddd: Merge "Fix issue #17391969: Only exception on Message.recycle() when target-sdk > 20" into lmp-dev 
* commit 'f307a8847ec546401a5d5e1aaecb7f29a097cf66':
  Fix issue #17391969: Only exception on Message.recycle() when target-sdk > 20
 2014-09-07 19:31:03 +00:00
Dianne Hackborn
432fa09116 am 7c021a1b: am 8c7be259: am 6a83e4d1: Merge "Work on issue #17357238: Recents is often slow if not used in a while" into lmp-dev 
* commit '7c021a1b46ca076ec911daf7d515101fa7d61453':
  Work on issue #17357238: Recents is often slow if not used in a while
 2014-09-07 19:30:57 +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
Robin Lee
6902e8eb7b Revert DevicePolicyManager PrivateKey APIs 
These were committed to the wrong branch and left some debug
statements in.

Bug: 15065444
Change-Id: Idc25774c9ab1a61080290bebd6f5c4f24e6ee2e0
 2014-09-06 21:07:14 +01: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
260efa2fd5 am 1d7f775c: am bb9e9c7b: am 2dfada6c: Merge "Cleanup - Change name of confirm credentials method after API review" into lmp-dev 
* commit '1d7f775cca1def096906bd96f60d8767e15cbaf2':
  Cleanup - Change name of confirm credentials method after API review
 2014-09-05 22:09:47 +00: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
0497ebed94 am 084a748c: am 590f0f34: am b1d65d18: Merge "Fix runtime restart" into lmp-dev 
* commit '084a748cdfb8707bf5a28af4123a62a316a14ce1':
  Fix runtime restart
 2014-09-05 19:00:25 +00: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
13daae1862 am 170ace43: am 35952bf0: am 6f0cf112: Merge "Addressing API council comments for UserManager." into lmp-dev 
* commit '170ace439d91cb86f7b5b6f8129d44e2e5c40d61':
  Addressing API council comments for UserManager.
 2014-09-05 17:35:22 +00: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
e341247c58 am a849cbc0: am 7b45868e: am b59b5205: Merge "Keep contact affinities separate across users." into lmp-dev 
* commit 'a849cbc0f870791acfd3dd3698cc81256ac1db6e':
  Keep contact affinities separate across users.
 2014-09-05 17:18:05 +00:00
Esteban Talavera
d8dd59afd8 am 07dfb259: am 4414705e: am 2c6aa357: Merge "Changed value of EXTRAs to match constant name in code." into lmp-dev 
* commit '07dfb259b5af6921ec80588df2d01f28805e8b15':
  Changed value of EXTRAs to match constant name in code.
 2014-09-05 17:17:53 +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
George Mount
0a6f664ff2 am b7c6a799: am 86d466b3: am b555f0cf: Merge "Fix selection of epicenter in Activity Transitions." into lmp-dev 
* commit 'b7c6a7990a59a70ab1876f7e6a1322a92fbcc4ed':
  Fix selection of epicenter in Activity Transitions.
 2014-09-05 15:55:47 +00:00
George Mount
e4bf22a740 am 6629a210: am f43c2592: am da6df616: Merge "Fix NPE when Window disappears during a transition." into lmp-dev 
* commit '6629a21012a09b30ba50446aa9fdf901d803afd9':
  Fix NPE when Window disappears during a transition.
 2014-09-05 15:55:42 +00:00
George Mount
729aa5b2b6 am a538aac4: am e389d9d0: am 47229456: Merge "API Review: Change SharedElementListener to SharedElementCallback." into lmp-dev 
* commit 'a538aac40e100719fbcfd24b87aab48e29ae31eb':
  API Review: Change SharedElementListener to SharedElementCallback.
 2014-09-05 15:55:20 +00:00
Kenny Guy
8ebc2f1a0d am b14b98f6: am cc3fa1ef: am 42484d43: Merge "Fix RemoteViews to inflate views for current user." into lmp-dev 
* commit 'b14b98f6a1828f26f23d678e43fb32d1d86eea66':
  Fix RemoteViews to inflate views for current user.
 2014-09-05 15:54:37 +00: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
Craig Mautner
f25a0c2ced am 7dfb0390: am b8479376: am d5bb6256: Merge "Update API per council request" into lmp-dev 
* commit '7dfb0390a83b79cbdc334e19f03b1da790871943':
  Update API per council request
 2014-09-05 15:33:16 +00: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