drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
155,224 Commits 1 Branch 0 Tags
Commit Graph

11131 Commits

Author SHA1 Message Date
Amith Yamasani
568db8a032 am 081ba853: Merge "Use correct API for badging" into lmp-dev 
* commit '081ba8539011ed84abf6c5e9f7de02b26d86fbdf':
  Use correct API for badging
 2014-09-07 23:08:13 +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
8e98ff2b38 am a8733153: am 27e95059: Ensuring that we retry if the callback for animation started comes before the Recents activity starts. (Bug 17316671) 
* commit 'a8733153b889b8e627b834bb05f36dc9ce391bbe':
  Ensuring that we retry if the callback for animation started comes before the Recents activity starts. (Bug 17316671)
 2014-09-07 20:26:04 +00: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
663b98e90e am 622f0913: am b6f90339: Revert "Delay in app transition until home animation completes. (Bug 17012456)" 
* commit '622f09137394df0aa4683d7680a657679e70350c':
  Revert "Delay in app transition until home animation completes. (Bug 17012456)"
 2014-09-07 20:25:54 +00:00
Winson Chung
a43588d7cc am 27e95059: Ensuring that we retry if the callback for animation started comes before the Recents activity starts. (Bug 17316671) 
* commit '27e9505991500e9d5afee7fa485686905bbcf991':
  Ensuring that we retry if the callback for animation started comes before the Recents activity starts. (Bug 17316671)
 2014-09-07 20:15:20 +00:00
Winson Chung
89c58c5e72 am 04682c2f: Removing unnecessary delays, ensuring transition thumbnail is the size of the header. (Bug. 16987565) 
* commit '04682c2fa9f825cb2d09b6303c2b9b3b24e6bd19':
  Removing unnecessary delays, ensuring transition thumbnail is the size of the header. (Bug. 16987565)
 2014-09-07 20:15:15 +00:00
Winson Chung
d955fcd343 am b6f90339: Revert "Delay in app transition until home animation completes. (Bug 17012456)" 
* commit 'b6f90339750e6b33ee6b41f5e8e6502abc6543f4':
  Revert "Delay in app transition until home animation completes. (Bug 17012456)"
 2014-09-07 20:15:10 +00:00
Winson Chung
4e8dd649b4 Ensuring that we retry if the callback for animation started comes before the Recents activity starts. (Bug 17316671) 
Change-Id: I8e50e2cd9ba6a47dda21f21afbe14bb9d3eda979
 2014-09-07 20:08:55 +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
Winson Chung
d78d4f3acd Revert "Delay in app transition until home animation completes. (Bug 17012456)" 
This reverts commit e9883b8a92d72a3cfd947b3ce835bc8e4da2f1b2.

Change-Id: I61664e2a2589d09e5a93a776cf3c391049e7b284
 2014-09-07 20:08:22 +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
b08ec9c08b am 6a83e4d1: Merge "Work on issue #17357238: Recents is often slow if not used in a while" into lmp-dev 
* commit '6a83e4d1c445658f1e489b744119755c976e9eb0':
  Work on issue #17357238: Recents is often slow if not used in a while
 2014-09-07 19:10:40 +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
Svetoslav
a757f99d97 am 1458f58e: am 3b42928c: Merge "Print spooler UI polish and bug fixes." into lmp-dev 
* commit '1458f58e697e0079fc7fb90ea4094052f14a9688':
  Print spooler UI polish and bug fixes.
 2014-09-05 22:56:45 +00:00
Svetoslav
ca9dde9932 am 3b42928c: Merge "Print spooler UI polish and bug fixes." into lmp-dev 
* commit '3b42928c318d2732d75bb9c0ed7b864c47a265a2':
  Print spooler UI polish and bug fixes.
 2014-09-05 22:45:40 +00:00
Svetoslav
6552bf3da6 Print spooler UI polish and bug fixes. 
1. Added an empty state for pages that are being rendered.

2. Fixed a NPA on a binder thread when destoroying the
   remote print adapter.

3. Fixed a rare crash when the print activity gets an
   activity class callback while initializing.

4. Changed the preview pages on phone in land to four.

5. Fixed a flicker from a list of pages to an empty state
   and then back to the list of pages.

bug:15704969
bug:16966145

Change-Id: I0eea2f30a102d8fefcbf90187fa6d8612fb19434

Conflicts:
	packages/PrintSpooler/src/com/android/printspooler/widget/PageContentView.java
 2014-09-05 15:21:50 -07:00
Eino-Ville Talvala
663debf045 am a42873d6: am 8a52744d: Merge "Camera2: Final API revisions" into lmp-dev 
* commit 'a42873d60a55a65fe36de12c032714403e3e161f':
  Camera2: Final API revisions
 2014-09-05 21:57:16 +00:00
Eino-Ville Talvala
3954f349cd am 8a52744d: Merge "Camera2: Final API revisions" into lmp-dev 
* commit '8a52744d343dee6cc4958d0cc59484c036f3bf9f':
  Camera2: Final API revisions
 2014-09-05 20:55:50 +00:00
Eino-Ville Talvala
71aa8ab5d7 Merge "Camera2: Final API revisions" into lmp-dev 2014-09-05 20:43:52 +00:00
RoboErik
006775875a am a21df8dd: am 52dcc8a1: Merge "rename add/removeCallback to register/unregisterCallback" into lmp-dev 
* commit 'a21df8dda1a6b0f97d37d1f0cd6d2901e66cdc37':
  rename add/removeCallback to register/unregisterCallback
 2014-09-05 20:21:29 +00:00
RoboErik
8c1f4d1793 am 52dcc8a1: Merge "rename add/removeCallback to register/unregisterCallback" into lmp-dev 
* commit '52dcc8a1dbd3e48e65253fa82b35bceb8428da75':
  rename add/removeCallback to register/unregisterCallback
 2014-09-05 19:53:58 +00:00
RoboErik
dfafca7691 Merge "rename add/removeCallback to register/unregisterCallback" into lmp-dev 2014-09-05 19:49:36 +00:00
Eino-Ville Talvala
fd887436bd Camera2: Final API revisions 
- Rename listeners to callbacks. Listeners are single-method and are interfaces,
  while callbacks are abstract may get more methods in the future.
- Use register/unregister for registering callbacks, not add/remove.

Bug: 17389922
Change-Id: Ic6b46ad79cb43a43a85e2a4b63f059d3af99798b
 2014-09-05 12:43:11 -07:00
RoboErik
14f717a506 rename add/removeCallback to register/unregisterCallback 
bug:17390821
Change-Id: Id610b481083686dba2a28b6c7c47b747f89eef4f
 2014-09-05 11:40:33 -07:00
Svetoslav
ff10fae46c am 79b43f5b: am f1a858c7: Fix broken aidl 
* commit '79b43f5bbced73f6979a82edb5dae2399cbce1bf':
  Fix broken aidl
 2014-09-05 17:42:16 +00:00
Svetoslav
5cf8b4b751 am f1a858c7: Fix broken aidl 
* commit 'f1a858c7887ba8af0cf991fd6fa8a1f72e069ff1':
  Fix broken aidl
 2014-09-05 17:29:23 +00:00
Svetoslav
7b9d7bc1d4 am 1d85c1a4: am 4c8c9ac0: Merge "Update FrameStats API per api-council request." into lmp-dev 
* commit '1d85c1a4d3cf65a22907c5cb7f47f1e8765df832':
  Update FrameStats API per api-council request.
 2014-09-05 17:24:39 +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
Svetoslav
d0c362de1c Fix broken aidl 
Change-Id: I2187abd75b4f60e790b747a492ad610592f2ef53
 2014-09-05 10:19:39 -07:00
Svetoslav
6fadd4436b am 4c8c9ac0: Merge "Update FrameStats API per api-council request." into lmp-dev 
* commit '4c8c9ac06fc213d9bc9d82c39d55f425fee5b429':
  Update FrameStats API per api-council request.
 2014-09-05 17:13:29 +00:00
Svetoslav
bd7958e6d9 am 6f0cf112: Merge "Addressing API council comments for UserManager." into lmp-dev 
* commit '6f0cf112a712cd1a9e77a9b2b66e5f771d4e061e':
  Addressing API council comments for UserManager.
 2014-09-05 17:13:24 +00:00
Tom O'Neill
1c405630f5 am fac7b98e: am 971e730a: Merge "Suppress location tile in QS on lock screen" into lmp-dev 
* commit 'fac7b98ef883b2ec95c934b2d5116e83e39cf744':
  Suppress location tile in QS on lock screen
 2014-09-05 17:09:47 +00:00
Jorim Jaggi
c784d209a0 am eb775042: am 0e2b27df: Merge "Don\'t update notification layer when collapsing the panel" into lmp-dev 
* commit 'eb775042aeea79eb8a8b2521675097bfcf465c93':
  Don't update notification layer when collapsing the panel
 2014-09-05 17:09:12 +00:00
Jorim Jaggi
8a12c264ba am fea3c808: am 3dadb79a: Merge "Remove "forgot pattern" in pattern view" into lmp-dev 
* commit 'fea3c808c291b258ab340c8574c0023db6d1c01d':
  Remove "forgot pattern" in pattern view
 2014-09-05 17:08:59 +00:00
Christoph Studer
f1606d6f1a am 14161fff: am d6036d35: Merge "SysUI: Sort status bar notification icons" into lmp-dev 
* commit '14161fff8665abfc6cc572296b976808ec152f66':
  SysUI: Sort status bar notification icons
 2014-09-05 17:08:52 +00:00
Jim Miller
451b93cbb0 am c5adf557: am 8007e4a6: Merge "Send USER_PRESENT broadcast after keyguard animation finishes" into lmp-dev 
* commit 'c5adf5570377e83892bf6f3575b8fe0a49fa02da':
  Send USER_PRESENT broadcast after keyguard animation finishes
 2014-09-05 17:08:47 +00:00
Svetoslav
53dcd394aa Update FrameStats API per api-council request. 
bug:17390382

Change-Id: I50518834569f4d0ec394709294537256f03530e0
 2014-09-05 10:07:02 -07:00
Svetoslav
c7d62f02b8 Addressing API council comments for UserManager. 
bug:17390424

Change-Id: I498d2541289915cb7db16e5c3249ccc7a7dc5ee6
 2014-09-05 10:07:02 -07:00
Tom O'Neill
2596b43ebe am 971e730a: Merge "Suppress location tile in QS on lock screen" into lmp-dev 
* commit '971e730a5d646719688a70a59d8b7c987945d4ef':
  Suppress location tile in QS on lock screen
 2014-09-05 16:41:51 +00:00
Tom O'Neill
08e76661bc Merge "Suppress location tile in QS on lock screen" into lmp-dev 2014-09-05 16:37:44 +00:00
Jorim Jaggi
5f6a4726d1 am 0e2b27df: Merge "Don\'t update notification layer when collapsing the panel" into lmp-dev 
* commit '0e2b27df7d672c0b765fd37b2a0d96ba6266a0d5':
  Don't update notification layer when collapsing the panel
 2014-09-05 16:31:19 +00:00
Jorim Jaggi
89b39b2b07 Merge "Don't update notification layer when collapsing the panel" into lmp-dev 2014-09-05 16:22:25 +00:00
Jorim Jaggi
8fbe98981e am 3dadb79a: Merge "Remove "forgot pattern" in pattern view" into lmp-dev 
* commit '3dadb79a7fe90a727568aa76744f0d0c5ea44782':
  Remove "forgot pattern" in pattern view
 2014-09-05 16:20:49 +00:00
Jorim Jaggi
1210912600 Merge "Remove "forgot pattern" in pattern view" into lmp-dev 2014-09-05 16:12:04 +00:00
Christoph Studer
61c4a11dc7 am d6036d35: Merge "SysUI: Sort status bar notification icons" into lmp-dev 
* commit 'd6036d35627f0ac3e03343b1e31108616b687eea':
  SysUI: Sort status bar notification icons
 2014-09-05 16:05:00 +00:00
Jim Miller
83aaad4c9b am 8007e4a6: Merge "Send USER_PRESENT broadcast after keyguard animation finishes" into lmp-dev 
* commit '8007e4a65c2839de43b48199df9f8f3004e82c7f':
  Send USER_PRESENT broadcast after keyguard animation finishes
 2014-09-05 16:04:56 +00:00
Christoph Studer
8e2128ba4f Merge "SysUI: Sort status bar notification icons" into lmp-dev 2014-09-05 15:59:41 +00:00
Jim Miller
a8ecf45398 Merge "Send USER_PRESENT broadcast after keyguard animation finishes" into lmp-dev 2014-09-05 15:57:16 +00:00