10404 Commits

Author SHA1 Message Date
Amith Yamasani
7ebb8a6526 am 081ba853: Merge "Use correct API for badging" into lmp-dev
* commit '081ba8539011ed84abf6c5e9f7de02b26d86fbdf':
  Use correct API for badging
2014-09-07 23:05:45 +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
4547f48a8d 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:16:06 +00:00
Winson Chung
4590c3b30c 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:16:01 +00:00
Winson Chung
18e5ec2a51 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:57 +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
bbb3b4cf6c 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:38 +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
acc90bd72a 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:50 +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
0eeac755df am 8a52744d: Merge "Camera2: Final API revisions" into lmp-dev
* commit '8a52744d343dee6cc4958d0cc59484c036f3bf9f':
  Camera2: Final API revisions
2014-09-05 20:52:48 +00:00
Eino-Ville Talvala
71aa8ab5d7 Merge "Camera2: Final API revisions" into lmp-dev 2014-09-05 20:43:52 +00:00
RoboErik
ad65c13916 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:38 +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
5e1a04dcb7 am f1a858c7: Fix broken aidl
* commit 'f1a858c7887ba8af0cf991fd6fa8a1f72e069ff1':
  Fix broken aidl
2014-09-05 17:30:07 +00:00
Svetoslav
d0c362de1c Fix broken aidl
Change-Id: I2187abd75b4f60e790b747a492ad610592f2ef53
2014-09-05 10:19:39 -07:00
Svetoslav
ba2957829e 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:12:44 +00:00
Svetoslav
59c1be6684 am 6f0cf112: Merge "Addressing API council comments for UserManager." into lmp-dev
* commit '6f0cf112a712cd1a9e77a9b2b66e5f771d4e061e':
  Addressing API council comments for UserManager.
2014-09-05 17:12:40 +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
e5dbe7db79 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:17 +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
6ec5f17b64 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:27 +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
de9818a839 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:01 +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
ffaca61360 am d6036d35: Merge "SysUI: Sort status bar notification icons" into lmp-dev
* commit 'd6036d35627f0ac3e03343b1e31108616b687eea':
  SysUI: Sort status bar notification icons
2014-09-05 16:04:30 +00:00
Jim Miller
653bd3331f 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:27 +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
Jorim Jaggi
5709ae20f0 am 6f52cfa8: Merge "Remove the scrimming of notifications" into lmp-dev
* commit '6f52cfa8f52559fcc3c5c17348da18d18eed5655':
  Remove the scrimming of notifications
2014-09-05 15:30:34 +00:00
Adrian Roos
14f779c42f am 8ab59227: Merge "Reorder brightness slider mirror in front of album art" into lmp-dev
* commit '8ab5922758bf29d1b7de82214e9b7e6c3eb7c0ee':
  Reorder brightness slider mirror in front of album art
2014-09-05 15:30:31 +00:00
Jorim Jaggi
70d56cf4dc am 4ec48cb7: Merge "Hide notifications when occluded and disabled on keyguard" into lmp-dev
* commit '4ec48cb7b428eef28e95ec4c6bf484d32196fa1a':
  Hide notifications when occluded and disabled on keyguard
2014-09-05 15:30:23 +00:00
Selim Cinek
efc953276d am 1f49d9b3: Merge "Fixed a bug where the notifications could overlap when reset" into lmp-dev
* commit '1f49d9b36609f9260bdf85ff3f5dc85f8af7229b':
  Fixed a bug where the notifications could overlap when reset
2014-09-05 15:30:20 +00:00
Winson Chung
aeab63fb1d am 927df1c2: Merge "Generalizing Recents widget category to Search box. (Bug 17334589)" into lmp-dev
* commit '927df1c290c65ae877b67e2383517494ee7afb68':
  Generalizing Recents widget category to Search box. (Bug 17334589)
2014-09-05 15:30:12 +00:00
Adrian Roos
620f0374c5 am c5126d91: Merge changes Ibb63814e,I0322b1e6 into lmp-dev
* commit 'c5126d91e9d772f3f1ed64404746f8fe7af580a7':
  Prevent full shade guesture from doing the wrong thing
  Add current user announce to MultiUserSwitch
2014-09-05 15:29:57 +00:00
Christoph Studer
1452ced2cd am 8dd353c8: Merge "SysUI: Upsort PRIORITY_MAX system notifications" into lmp-dev
* commit '8dd353c86c38f181032b5e0135bb91707ced9832':
  SysUI: Upsort PRIORITY_MAX system notifications
2014-09-05 15:29:46 +00:00
Winson Chung
5b55ae993c am 893fd9fc: Merge "Ensure that there is enough space for the tablet search widget. (Bug 17190069)" into lmp-dev
* commit '893fd9fc8320806a5bf14284775e2600c85f78d2':
  Ensure that there is enough space for the tablet search widget. (Bug 17190069)
2014-09-05 15:29:42 +00:00
Tom O'Neill
d528930380 Suppress location tile in QS on lock screen
- Work around bug in QS implementation

- Bug: 15916487

Change-Id: I623a4e31e8b4187d920c2724182c927328885b3b
2014-09-05 08:22:47 -07:00
Jorim Jaggi
12a6782d61 Don't update notification layer when collapsing the panel
This change makes sure that we don't update the hardware for the
notification layer when we collapse or expand the panel. It does so
by starting the fading when the panel is more collapsed.

Bug: 17287256
Change-Id: I35dc35494d71d816b7e6c5821b769847aaa183b0
2014-09-05 16:01:00 +02:00
Christoph Studer
668c8970ff SysUI: Sort status bar notification icons
Bug: 15761406
Change-Id: I64884319014d6fa3008c0db4060db7b9b066b6d7
2014-09-05 16:00:09 +02:00
Jorim Jaggi
f2f0a071c2 Merge "Remove the scrimming of notifications" into lmp-dev 2014-09-05 13:58:33 +00:00
Adrian Roos
c2c661fccc Merge "Reorder brightness slider mirror in front of album art" into lmp-dev 2014-09-05 13:58:33 +00:00
Jorim Jaggi
f9fb30f54b Merge "Hide notifications when occluded and disabled on keyguard" into lmp-dev 2014-09-05 13:51:37 +00:00
Adrian Roos
cc74113ac6 Reorder brightness slider mirror in front of album art
Fixes slider disappearing when album art is showing.

Bug: 17373958
Change-Id: Ifdb184a6a750f798bc94a9d1eeca9299b246a513
2014-09-05 15:50:53 +02:00