Commit Graph

13842 Commits

Author SHA1 Message Date
Jorim Jaggi
d31546c9e8 Merge "Don\'t dock tasks that are non-dockable" into nyc-dev
am: f2d7b28115

* commit 'f2d7b28115773b324a27173ef31c3e58ce3487a7':
  Don't dock tasks that are non-dockable
2016-03-08 15:34:30 +00:00
Jorim Jaggi
aa6c574411 Don't dock tasks that are non-dockable
Bug: 27200491
Change-Id: I4578441b37734b85ea03b3bb67e57abed8b21182
2016-03-08 16:20:54 +01:00
Selim Cinek
0a0d840ec4 Merge changes I6e5dc836,Ia0c663f0,I97eb6e79,I8a4a0213,I87798da9, ... into nyc-dev
am: f7f4537f4f

* commit 'f7f4537f4f8f7433f80f5c9eae8a62462ec612ea':
  Removed the group expand button
  Removed the bundle number from the header
  Fixed a crash with notification children
  Fixed a bug where the media header wasn't indented
  Fixed fading and dozemode for custom notifications
  Fixed a group bug with a single expanded child
  Fixed a bug where the top child notification wasn't expandable
  Fixed a bug where heads up where not expandable by touch
  Fixed a bug where the wallpaper was shining through the background
2016-03-07 23:51:30 +00:00
Selim Cinek
f7f4537f4f Merge changes I6e5dc836,Ia0c663f0,I97eb6e79,I8a4a0213,I87798da9, ... into nyc-dev
* changes:
  Removed the group expand button
  Removed the bundle number from the header
  Fixed a crash with notification children
  Fixed a bug where the media header wasn't indented
  Fixed fading and dozemode for custom notifications
  Fixed a group bug with a single expanded child
  Fixed a bug where the top child notification wasn't expandable
  Fixed a bug where heads up where not expandable by touch
  Fixed a bug where the wallpaper was shining through the background
2016-03-07 23:43:58 +00:00
Winson
bbe2f4aa7c Merge "Preventing users from over scrolling too far." into nyc-dev
am: fbc32f158b

* commit 'fbc32f158b7bff7aa5872af5acd8d161a59f20e1':
  Preventing users from over scrolling too far.
2016-03-07 23:14:39 +00:00
Selim Cinek
6db575803e Removed the group expand button
It's now a normal group expand button.

Bug: 27431551
Change-Id: I6e5dc83613533ef8590b0a8180d8c4be8322aa21
2016-03-07 15:11:56 -08:00
Selim Cinek
3b050317bf Removed the bundle number from the header
Bug: 27431551
Change-Id: Ia0c663f0bab875abba4b35d565f3ac4ed2306079
2016-03-07 15:11:55 -08:00
Selim Cinek
2b542424f7 Fixed a crash with notification children
Notification children would animate when removed even
though they were just transferring to a different parent
or to the root.

Bug: 27476798
Change-Id: I97eb6e795d7762fb150b63f49eec9bb6092339be
2016-03-07 15:11:55 -08:00
Winson Chung
fbc32f158b Merge "Preventing users from over scrolling too far." into nyc-dev 2016-03-07 23:10:04 +00:00
Winson
12cb920eba Preventing users from over scrolling too far.
- Also tweaking the second part of the unfocused curve to make it more 
  linear to touch.

Bug: 27478701
Bug: 27376567

Change-Id: If187ea333579221ef24986d8d37d0606e50ab7bc
2016-03-07 15:06:43 -08:00
Winson
4d2b51078d Fixing screenshot regression from ag/879131.
am: 4333694d8a

* commit '4333694d8a7024a141ffb12cd59b0b56a362baa5':
  Fixing screenshot regression from ag/879131.
2016-03-07 22:59:03 +00:00
Winson
4333694d8a Fixing screenshot regression from ag/879131.
- We were not poking existing TaskViews from updating after their tasks
  have been updated (ie. with a new screenshot)

Change-Id: I33916aecf004afdb88a2462e69437ad1d9e8017d
2016-03-07 22:54:37 +00:00
Jason Monk
0799669182 Merge "Move QS Edit into QSContainer" into nyc-dev
am: c8bc4713d0

* commit 'c8bc4713d08cb8edba87d80e902c0fdbe73bfea1':
  Move QS Edit into QSContainer
2016-03-07 17:17:18 +00:00
Geoff Mendal
0726c8aec5 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-07 15:31:24 +00:00
Geoff Mendal
3da14578db Import translations. DO NOT MERGE
Change-Id: I8cf0013b48f45c76a22bf6235bed8f50a05235e0
Auto-generated-cl: translation import
2016-03-07 07:30:19 -08:00
Jason Monk
8b9d67fb63 Move QS Edit into QSContainer
This will let it play nicely with heads up.

 - Move to QS Container.
 - QS Edit is always full height (some layout hacks to do this)
 - Always draw QS customizer on top when animating
 - Block all panel scrolling while QS edit is open (all touches
   go to editing)
 - Instantaneously change the height of the QS container at
   start/end of animation as needed

Bug: 26969293
Change-Id: Iedc6f5aaf659dcc6750972eae5f69cc0cd2df844
2016-03-07 09:55:27 -05:00
Jaewan Kim
1555fb31b0 Merge "PIP: Apply the latest UI spec for overlay text" into nyc-dev
am: 39c0921b45

* commit '39c0921b455721ab0678a5e49e9ceed2776010ad':
  PIP: Apply the latest UI spec for overlay text
2016-03-07 01:27:57 +00:00
Jaewan Kim
39c0921b45 Merge "PIP: Apply the latest UI spec for overlay text" into nyc-dev 2016-03-07 01:22:56 +00:00
Jeff Sharkey
12e2778307 Merge "Ask RingtonePlayer to open data for caching." into nyc-dev
am: b94f2df289

* commit 'b94f2df289f4289f1eca7206f3d1bcdd737e69a6':
  Ask RingtonePlayer to open data for caching.
2016-03-06 00:32:25 +00:00
Jeff Sharkey
b94f2df289 Merge "Ask RingtonePlayer to open data for caching." into nyc-dev 2016-03-06 00:29:01 +00:00
Jeff Sharkey
783ee0ca87 Ask RingtonePlayer to open data for caching.
When setting default ringtones, RingtoneManager now caches the
selected media for playback before the device is unlocked.  However,
this API hasn't historically required the caller to hold storage
permissions.

To keep this working, we attempt to delegate ringtone access over
through RingtonePlayer, which is what we do for playback.  However,
because we're caching the real ringtone bits now, we need to be much
more careful about the PFDs we're willing to return.  This change
requires that they be in external storage, and that they have the
ringtone/alarm/notification bit set.

Bug: 27366059
Change-Id: I59c2adc1d1250a3eac281f190f35a7cb3119967b
2016-03-05 17:23:32 -07:00
Winson
6879dfa0cb Merge changes I5c414d67,I83d74c94 into nyc-dev
am: 6195e8af1e

* commit '6195e8af1ef057dd1b8114bb560f0d620fe2a148':
  Just return the task to the pool if it is not in the current stack.
  Refactoring to update stack in onResume.
2016-03-05 01:25:21 +00:00
Selim Cinek
c317933a91 Fixed fading and dozemode for custom notifications
The custom notifications were fading really ugly when they
had a dark background like media notifications, because
it was fading from dark to dark.
Now this background is shared for both custom views which also
reduces overdraw for them.

In addition does the doze mode now work much nicer because we're
only fading them to greyscale instead of inverting.
This also fixed an issue where legacy custom notifications with
a dark background were colorful during doze.

Bug: 19437552
Change-Id: I87798da9ac11b9abfe4470b6ca53b555da3aa629
2016-03-04 17:03:34 -08:00
Selim Cinek
e81b82ba25 Fixed a group bug with a single expanded child
On the lockscreen the child wasn't expanded visually
when expanding the group.

Bug: 27419554
Change-Id: I5f191216d8736657099aa1a40ccc4a331b317d67
2016-03-04 17:03:33 -08:00
Selim Cinek
43d30f03f4 Fixed a bug where the top child notification wasn't expandable
Because we also applied the hack to the expand helper to dismiss
the whole group instead of the child.

Bug: 27420342
Change-Id: I6179d3b99150c8005d0c45b6efdabb2de4dbe941
2016-03-04 17:03:28 -08:00
Winson
1d5ff7e71e Just return the task to the pool if it is not in the current stack.
Bug: 27467025
Change-Id: I5c414d674fb0db152b77c2025b4885d340e81880
2016-03-04 16:55:49 -08:00
Winson
8873754f66 Refactoring to update stack in onResume.
This CL fixes a long-standing issue in which Recents is not updated
correctly if it is not completely hidden and shown.  In particular, it
would cause animation issues when launching into a non-fullscreen
activity or if the user quickly toggles between recent tasks.  It
contains several fixes:

- The visual state in Recents is no longer reset until the activity is 
  fully hidden (onStop() is called), and the task stack state is saved 
  allowing us to return to the same initial state.  When restarting the 
  activity, we propagate whether the activity was hidden down the view 
  hierarchy, so that each task can decide whether to reset itself.
- When the recents activity is started, we now merge the new stack with
  the current stack instead of replacing it completely.  This unifies
  the logic when dismissing multi-window while Recents is open, and this
  CL fixes an issue with the merging where onStackTaskAdded() was called
  before the stack was updated with the new task.  As a result of this
  change, we can just rebind the task views without having to return and
  pick them up from the view pool.
- This CL also fixes an issue with flashing when the screen turns off.  
  The activity onStop() can be called before the activity is fully 
  hidden, which would trigger a reset(), which would return all views to
  the pool.

Bug: 23815609
Bug: 25411120
Bug: 27186407
Change-Id: I83d74c947f9b47766d6778b7f5c421bb6df833e9
2016-03-04 16:55:25 -08:00
Winson
895ceea504 Merge "Use the non-override task progress for calculating the z." into nyc-dev
am: e27a4376ab

* commit 'e27a4376aba021f72771d28daf656307a32e8ce3':
  Use the non-override task progress for calculating the z.
2016-03-04 22:36:32 +00:00
Winson Chung
e27a4376ab Merge "Use the non-override task progress for calculating the z." into nyc-dev 2016-03-04 22:31:01 +00:00
Julia Reynolds
2a6646acdc Merge "Redlines for inline settings." into nyc-dev
am: da52422a83

* commit 'da52422a83536825dcc6ed9cb2255ae56ef3bfc2':
  Redlines for inline settings.
2016-03-04 21:55:08 +00:00
Julia Reynolds
aebacc94c0 Redlines for inline settings.
Change-Id: I535f84f70444caf376b671352da8da94b764b1eb
2016-03-04 14:37:45 -05:00
Winson
8f97c83b2e Use the non-override task progress for calculating the z.
- This guarantees that they won’t collide, where as the override task
  progresses will as tasks animate while dragging to dismiss.

Change-Id: I25eded22c13b38428d849062c6d95893f3fff5c5
2016-03-04 19:33:50 +00:00
Yorke Lee
54d87384a8 Merge "Make isPanelFullyCollapsed public" into nyc-dev
am: e5ccccd3be

* commit 'e5ccccd3beadcc989ba25dc57292724e8f38b574':
  Make isPanelFullyCollapsed public
2016-03-04 17:40:19 +00:00
Yorke Lee
e5ccccd3be Merge "Make isPanelFullyCollapsed public" into nyc-dev 2016-03-04 17:36:50 +00:00
Jason Monk
7c6632e870 Merge "Make QS do simpler anim on lock screen" into nyc-dev
am: 84606d704a

* commit '84606d704a5b51da270ad36285f5b16aa7674568':
  Make QS do simpler anim on lock screen
2016-03-04 15:59:27 +00:00
Jason Monk
84606d704a Merge "Make QS do simpler anim on lock screen" into nyc-dev 2016-03-04 15:52:47 +00:00
Jaewan Kim
ff296f98ae Merge "PIP: Apply the comment from the previous commit" into nyc-dev
am: 26f7ec69de

* commit '26f7ec69de2a8ad30092058629f337ba297c2f6c':
  PIP: Apply the comment from the previous commit
2016-03-04 06:32:29 +00:00
Jaewan Kim
88baef6bfc PIP: Apply the comment from the previous commit
This applies the comment from the following CL
32686b6 PIP: Fix move to full screen

Change-Id: Iece46ee85f6e5c3040c9c1431236319e0dbd4105
2016-03-04 15:08:41 +09:00
Jaewan Kim
236950e5b3 PIP: Apply the latest UI spec for overlay text
Bug: 27273290
Change-Id: Ie3ff425555c6629c8676f5071ea6ddc2a761b87c
2016-03-04 14:51:47 +09:00
Selim Cinek
166f7c4a50 Fixed a bug where heads up where not expandable by touch
Because they were heads upped, some notifications could not be
expanded in the shade. We're now using the pinned flag to detect
this.

Bug: 27455837
Change-Id: Ifb9b401b0ca1bea98051ee681468b1c9db3ca92a
2016-03-03 16:21:37 -08:00
Jason Monk
65792a6412 Merge "Fix night mode availability" into nyc-dev
am: 4a6688371f

* commit '4a6688371fd8992c0ac9e97015bcb1128efece50':
  Fix night mode availability
2016-03-03 23:50:19 +00:00
Sid Soundararajan
e5c321f10c Merge "Add Launch Task Animation, re-do values for red-lines." into nyc-dev
am: d27dafeade

* commit 'd27dafeadeb38d451826122d0505702abf58bd1d':
  Add Launch Task Animation, re-do values for red-lines.
2016-03-03 23:45:40 +00:00
Jason Monk
4a6688371f Merge "Fix night mode availability" into nyc-dev 2016-03-03 23:41:42 +00:00
Sid Soundararajan
d27dafeade Merge "Add Launch Task Animation, re-do values for red-lines." into nyc-dev 2016-03-03 23:37:15 +00:00
Selim Cinek
2550325918 Fixed a bug where the wallpaper was shining through the background
The wallpaper was shining through the background of notifications
when music was playing even though it shouldn't have.

Bug: 27478285
Change-Id: I419fa47ef34ace72ec911fcb780919f4a7ce786b
2016-03-03 15:31:43 -08:00
Jason Monk
1b0afebf37 Fix night mode availability
Night mode tile is getting auto-added.  Do the safe thing for now
and fix the checks around the tile availability to make sure it
isn't shown when it shouldn't be, then fix the auto-add logic later.

Bug: 27480924
Change-Id: I3d032038cbc77bf478e3c769c6796be289a8d993
2016-03-03 18:25:54 -05:00
Yorke Lee
e4ea6ab1e7 Make isPanelFullyCollapsed public
Change-Id: I3341e5e56a71b0b6cb0c642e8b9f9d13828b898d
2016-03-03 14:51:49 -08:00
Selim Cinek
e8bfd22172 Merge "Fixed a bug where the notification content could become empty" into nyc-dev
am: 602afa8e89

* commit '602afa8e893a253bf91f3fcd3264cd909ec62a5d':
  Fixed a bug where the notification content could become empty
2016-03-03 22:36:52 +00:00
Winson
e42469986b Merge "Disabling timer" into nyc-dev
am: a24019f1e5

* commit 'a24019f1e58ec4e58682175b585e5287befff2ea':
  Disabling timer
2016-03-03 22:34:27 +00:00
Selim Cinek
602afa8e89 Merge "Fixed a bug where the notification content could become empty" into nyc-dev 2016-03-03 22:32:08 +00:00