Commit Graph

10432 Commits

Author SHA1 Message Date
Jiaquan He
8cd8cf45ea Merge "Change some members in QSTileBaseView and QSTileView." 2016-05-17 23:35:32 +00:00
Selim Cinek
6498d80103 Merge "Merge "Fixed a screen flickering on tablets" into nyc-dev am: ce80acd73a am: be80263275" into nyc-mr1-dev-plus-aosp
am: 4713c4079d

* commit '4713c4079dee103c72307c7c879f03a326215b00':
  Fixed a screen flickering on tablets

Change-Id: I011e1eb678824590d6314810dcfc55a70ce821e2
2016-05-17 22:37:04 +00:00
Selim Cinek
08aa6b47eb Merge "Merge "Fixed a bug with auto cancelling" into nyc-dev am: a35d9b3ee0 am: d61b5b655e" into nyc-mr1-dev-plus-aosp
am: 03e3a1f308

* commit '03e3a1f308bf18ff3f96053c772d2e91929346d6':
  Fixed a bug with auto cancelling

Change-Id: I93c2eac94085aae363562159a15beb730df96302
2016-05-17 22:36:55 +00:00
Selim Cinek
a0a542d0f0 Merge "Fixed a screen flickering on tablets" into nyc-dev am: ce80acd73a
am: be80263275

* commit 'be80263275ca977b9f3047b596afb5c08eec8d9b':
  Fixed a screen flickering on tablets

Change-Id: Iae540c51ef8e28d493dfe4fca4dcb5c86947918a
2016-05-17 22:27:08 +00:00
Selim Cinek
c0dca174e7 Merge "Fixed a bug with auto cancelling" into nyc-dev am: a35d9b3ee0
am: d61b5b655e

* commit 'd61b5b655eb7b76d7539eb8118d3317e97e008c9':
  Fixed a bug with auto cancelling

Change-Id: I4c934cf6b2da6fe4859f390bf05da8642accbe02
2016-05-17 22:26:51 +00:00
Selim Cinek
be80263275 Merge "Fixed a screen flickering on tablets" into nyc-dev
am: ce80acd73a

* commit 'ce80acd73a5a34d15531d8377fa5b16d0ec5deb7':
  Fixed a screen flickering on tablets

Change-Id: I5829b4044df7605bbeecb0545d2d600384132181
2016-05-17 22:21:37 +00:00
Selim Cinek
d61b5b655e Merge "Fixed a bug with auto cancelling" into nyc-dev
am: a35d9b3ee0

* commit 'a35d9b3ee055d591249a30c58285fe2be5a45c43':
  Fixed a bug with auto cancelling

Change-Id: I46be6f420c4ad89ffc7cd88f621aed173ba130d1
2016-05-17 22:21:32 +00:00
Selim Cinek
ce80acd73a Merge "Fixed a screen flickering on tablets" into nyc-dev 2016-05-17 22:05:54 +00:00
Selim Cinek
a35d9b3ee0 Merge "Fixed a bug with auto cancelling" into nyc-dev 2016-05-17 22:05:39 +00:00
Jiaquan He
074ae46960 Change some members in QSTileBaseView and QSTileView.
Bug: 28531806

Change-Id: I06ff3189f413ce7877d66e4f583cae05869e1ae5
2016-05-17 21:23:05 +00:00
Julia Reynolds
dc5dca334a Merge "Title is a CharSequence." into nyc-dev am: 94789b4ddf am: 6003616501
am: 073ebc776c

* commit '073ebc776c0b1c20781ddaa79036c4220448b201':
  Title is a CharSequence.

Change-Id: I1361835ceeb3b8c5faff61c37ae7c6aea37e91e7
2016-05-17 20:04:51 +00:00
Julia Reynolds
073ebc776c Merge "Title is a CharSequence." into nyc-dev am: 94789b4ddf
am: 6003616501

* commit '6003616501688d8ed0ac10e75a017349c86dd375':
  Title is a CharSequence.

Change-Id: I921be25c7bb076966bf8d5c1c940c99f47272871
2016-05-17 19:59:41 +00:00
Julia Reynolds
6003616501 Merge "Title is a CharSequence." into nyc-dev
am: 94789b4ddf

* commit '94789b4ddff239760adf91896bd6ea86b62d0137':
  Title is a CharSequence.

Change-Id: I7eedd41ca91201469ad2d8a9ad16e69843d7b8d6
2016-05-17 19:55:33 +00:00
Julia Reynolds
94789b4ddf Merge "Title is a CharSequence." into nyc-dev 2016-05-17 19:48:33 +00:00
Julia Reynolds
7f9ce782a0 Title is a CharSequence.
Change-Id: Ib464d422ca1cf6d7c0547a02847ecb7085682ae9
Fixes: 28680336
2016-05-17 15:34:34 -04:00
Felipe Leme
b206fa10e7 Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 2c6a450fa2 am: 3b91df7ccf
am: 8b297e554d

* commit '8b297e554df11ee874e01e4bfaa2b64d9af2bc11':
  Added a onRestrictBackgroundBlacklistChanged() callback.

Change-Id: Ieb58dda8f4749ccf5218be5913beb488fd3247cf
2016-05-17 19:07:18 +00:00
Felipe Leme
8b297e554d Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 2c6a450fa2
am: 3b91df7ccf

* commit '3b91df7ccf7ee4adf9914ffcdcbf220eb9f9fd08':
  Added a onRestrictBackgroundBlacklistChanged() callback.

Change-Id: Idb223f33d6c5b1d4054bd41f4b9b9672c507986c
2016-05-17 18:47:41 +00:00
Jorim Jaggi
5306ab9cdf Fix janky multi-window entry animation am: c5887ea7a0 am: 791b7979e9
am: a7b4fb4883

* commit 'a7b4fb4883d45f1e4a66b4a819b3ab896e18a322':
  Fix janky multi-window entry animation

Change-Id: I23961cfb36b6b23fdc7356e86665a390dd267ab8
2016-05-17 18:44:43 +00:00
Jorim Jaggi
a7b4fb4883 Fix janky multi-window entry animation am: c5887ea7a0
am: 791b7979e9

* commit '791b7979e9a4bfca7e6e8e6c1cfedda47738ac1c':
  Fix janky multi-window entry animation

Change-Id: I2a6ec9fc49bbba9b4a09d5cbfab16a8fb58d6e19
2016-05-17 18:39:35 +00:00
Felipe Leme
3b91df7ccf Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev
am: 2c6a450fa2

* commit '2c6a450fa23b97e6082e2daa1aa9c7f07a4def8f':
  Added a onRestrictBackgroundBlacklistChanged() callback.

Change-Id: Id9cb27070e1e72b12c5ade60b637e63319021f90
2016-05-17 18:39:02 +00:00
Jorim Jaggi
c3701426c0 Fix janky multi-window entry animation
am: c5887ea7a0

* commit 'c5887ea7a0b82cc5909743ce14cbda1dcf1dfc82':
  Fix janky multi-window entry animation

Change-Id: I50b123fe6b571009fddbe8bcd39cb876ced87f42
2016-05-17 18:38:18 +00:00
TreeHugger Robot
2c6a450fa2 Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev 2016-05-17 18:28:22 +00:00
Jorim Jaggi
791b7979e9 Fix janky multi-window entry animation
am: c5887ea7a0

* commit 'c5887ea7a0b82cc5909743ce14cbda1dcf1dfc82':
  Fix janky multi-window entry animation

Change-Id: Ia9a2f19a4c03978c9d05e1628cb0607e1e267401
2016-05-17 18:20:55 +00:00
Jorim Jaggi
c5887ea7a0 Fix janky multi-window entry animation
- Add tracing when drawing ImageWallpaper.
- Don't force a redraw in onSurfaceRedrawNeeded. This only adds
another unnecessary draw and doesn't do anything useful.
onSurfaceRedrawNeeded is only here so the client can block.
- Delay entrance animation by one frame so wallpaper can be drawn
before the transition is starting.
- Add some delay for animating the tasks up in recents to match that
delay (it wasn't matched before at all).
- Fix an issue where launchedFromHome was wrong while docking.

Bug: 28769940
Change-Id: I2b763ed40078541328a1e04ffecf5b0a520fe019
2016-05-17 18:10:31 +00:00
Sid Soundararajan
5df6c745c4 Merge "Move onStart update of recents tasks to onResume" into nyc-dev am: 1aae32b44a am: 81505b48e5
am: 815fe51501

* commit '815fe5150187a069990601b77d7164b4dca898f1':
  Move onStart update of recents tasks to onResume

Change-Id: I73b4920e9bc4aa4e44d3f5e8122e3e9bf6c261a6
2016-05-17 18:00:19 +00:00
Sid Soundararajan
66f1a54d4f Merge "Add an extra to HOME intent to indicate it comes form recents." into nyc-dev am: ea98d35d62 am: a41fcf5449
am: 115bcb270c

* commit '115bcb270c7651f4d9d8376d2240fedd98be3853':
  Add an extra to HOME intent to indicate it comes form recents.

Change-Id: I4178eaf339f44366387a5d1ad68077a3b0080a89
2016-05-17 18:00:13 +00:00
Sid Soundararajan
815fe51501 Merge "Move onStart update of recents tasks to onResume" into nyc-dev am: 1aae32b44a
am: 81505b48e5

* commit '81505b48e5c00e067d684b39de73b93aeaffefb2':
  Move onStart update of recents tasks to onResume

Change-Id: I39af26412ea8184803c226b285b11857619ab74b
2016-05-17 17:55:11 +00:00
Sid Soundararajan
115bcb270c Merge "Add an extra to HOME intent to indicate it comes form recents." into nyc-dev am: ea98d35d62
am: a41fcf5449

* commit 'a41fcf54499272e185733f5ee23ef3f51cb4fda5':
  Add an extra to HOME intent to indicate it comes form recents.

Change-Id: I46cef20f7d8aa8b4b2af875c1eb609a347efac04
2016-05-17 17:55:06 +00:00
Sid Soundararajan
4b19273c81 Merge "Move onStart update of recents tasks to onResume" into nyc-dev
am: 1aae32b44a

* commit '1aae32b44abd189c905c4ac799422829ce24b186':
  Move onStart update of recents tasks to onResume

Change-Id: I69d1a4d72796f7940a0993560f78fa0e6c667f78
2016-05-17 17:49:53 +00:00
Sid Soundararajan
1f07c85fa8 Merge "Add an extra to HOME intent to indicate it comes form recents." into nyc-dev
am: ea98d35d62

* commit 'ea98d35d62ec9e8273e5e632feec167c24a90a15':
  Add an extra to HOME intent to indicate it comes form recents.

Change-Id: I441ff96ed9c5e84aee38e68b5a153c3a39f3d63b
2016-05-17 17:49:50 +00:00
Sid Soundararajan
81505b48e5 Merge "Move onStart update of recents tasks to onResume" into nyc-dev
am: 1aae32b44a

* commit '1aae32b44abd189c905c4ac799422829ce24b186':
  Move onStart update of recents tasks to onResume

Change-Id: Ifb377d9da719f2994aa34bb9bf990db9464adf4f
2016-05-17 17:39:19 +00:00
Sid Soundararajan
a41fcf5449 Merge "Add an extra to HOME intent to indicate it comes form recents." into nyc-dev
am: ea98d35d62

* commit 'ea98d35d62ec9e8273e5e632feec167c24a90a15':
  Add an extra to HOME intent to indicate it comes form recents.

Change-Id: I683f2f9307271e6179b91097204314815aac4a8e
2016-05-17 17:39:17 +00:00
Sid Soundararajan
1aae32b44a Merge "Move onStart update of recents tasks to onResume" into nyc-dev 2016-05-17 17:36:50 +00:00
Sid Soundararajan
ea98d35d62 Merge "Add an extra to HOME intent to indicate it comes form recents." into nyc-dev 2016-05-17 17:36:42 +00:00
Wale Ogunwale
fde6b69095 Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev am: b406dd20ee am: 33cffe3717
am: f5a87d86bf

* commit 'f5a87d86bf08b564d2db00bf626092721e348e61':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: Ie5cf7842a219fedd849bc161899df113f383c944
2016-05-17 01:10:44 +00:00
Wale Ogunwale
f5a87d86bf Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev am: b406dd20ee
am: 33cffe3717

* commit '33cffe371778d21452fa5706d73f6dded29fb8de':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: I314fdf74d69462ff021473697921a3b52f67d83e
2016-05-17 01:05:00 +00:00
Wale Ogunwale
273d6e8f56 Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev
am: b406dd20ee

* commit 'b406dd20eee28eedb8e9f330a0459d630c026515':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: I81250af945c186fbb687bc15ec03a85a019bd6e3
2016-05-17 00:59:36 +00:00
Wale Ogunwale
33cffe3717 Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev
am: b406dd20ee

* commit 'b406dd20eee28eedb8e9f330a0459d630c026515':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: I9e3bc8825d837abe61d31dea27249f7bce6e7f9d
2016-05-17 00:57:25 +00:00
TreeHugger Robot
b406dd20ee Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev 2016-05-17 00:51:41 +00:00
Wale Ogunwale
3b23239d6e Fixed bugs with starting windows when displayng forcedResized activity
- Added ActivityOption to mark a starting activity as a taskOverlay
activity. That is the activity will always be the top activity of the
task and doesn't cause the task to be moved to the front when it is added.
- Only set the starting window state of the ActivityRecord to shown if
window manager actually showed the starting window for the activity.
Avoids incorrectly trying to remove starting window for an activity that
didn't show any.
- When starting additional activity in a task, transfer the starting
window from the top most activity with a starting window. It is possible
the top most window does have a starting window like in the case of the
forcedResized activity.
- Only ensure visiblity of an activity we are starting in a task whose top
activity is a task overlay. They need to start in the visible-paused state
and not the resumed state which just causes extra churn in the system.
- Always add additional starting activities in a task with an overlay
activity below the overlay activity.

Bug: 28751186
Change-Id: I3624a4313ae9c406d42c67a3537f67ad685791af
2016-05-16 16:27:01 -07:00
Jaewan Kim
22ac7ed38d Merge "Workaround that Recents is shown again after an activity is PIPed" into nyc-dev am: 174aa3346c am: 8bae438cde
am: cef7a0c03e

* commit 'cef7a0c03eeb3900f949bfdac487a2989013d02b':
  Workaround that Recents is shown again after an activity is PIPed

Change-Id: Ia0401634c0a1bf4c900fb8b7182c09898a39066a
2016-05-16 22:56:50 +00:00
Jaewan Kim
cef7a0c03e Merge "Workaround that Recents is shown again after an activity is PIPed" into nyc-dev am: 174aa3346c
am: 8bae438cde

* commit '8bae438cde036c1ebc59fa95cc0ff47f44d3057d':
  Workaround that Recents is shown again after an activity is PIPed

Change-Id: I449afcc2f5622e015be8a89bf829459dc7ae00cc
2016-05-16 22:50:02 +00:00
Selim Cinek
01e4019830 Fixed a screen flickering on tablets
The background bounds were not correctly applied
when an animation was running, leading to flickers
of the scrim. Left and right should always be applied
immediately.

Change-Id: Iff9979d6e1c472a1dec20e76436a19a44c170cad
Fixed: 28000150
2016-05-16 15:44:05 -07:00
Jaewan Kim
8bae438cde Merge "Workaround that Recents is shown again after an activity is PIPed" into nyc-dev
am: 174aa3346c

* commit '174aa3346c06341d13f287c72ccd9ec47fce5987':
  Workaround that Recents is shown again after an activity is PIPed

Change-Id: I14eb70dc0584bba8583618a92378a9fd9c14b1fd
2016-05-16 22:43:09 +00:00
Jaewan Kim
3f41684de5 Merge "Workaround that Recents is shown again after an activity is PIPed" into nyc-dev
am: 174aa3346c

* commit '174aa3346c06341d13f287c72ccd9ec47fce5987':
  Workaround that Recents is shown again after an activity is PIPed

Change-Id: I8a2a7daeebeb37817a36d12e52db86912dce2186
2016-05-16 22:43:01 +00:00
Selim Cinek
36b02233fa Fixed a bug with auto cancelling
When clicking on a suppressed child and the child is autocancelled
we need to cancel the summary as well for them if it also has
the flag to auto cancel.

Change-Id: I25bfa7ad79afd406cc647ad6683d0b49c949f909
Fixes: 28642637
2016-05-16 15:42:52 -07:00
Jaewan Kim
174aa3346c Merge "Workaround that Recents is shown again after an activity is PIPed" into nyc-dev 2016-05-16 22:38:23 +00:00
Jorim Jaggi
5b4fad5157 Don\'t throw away wallpaper bitmap just because we are hidden. am: ed0e1a68a4 am: 840165f0bf
am: 0808da6835

* commit '0808da6835130b73d2057fca3a34829cde596e29':
  Don't throw away wallpaper bitmap just because we are hidden.

Change-Id: Ic305fff516794eea7020039a9ba685b6d28d6dbd
2016-05-16 22:04:30 +00:00
Sid Soundararajan
165410d445 Add an extra to HOME intent to indicate it comes form recents.
This allows the launcher to know how to handle HOME press properly
when a video is playing in the background. Without this, the Launcher
dismisses it's UI.

Launcher CL: https://googleplex-android-review.git.corp.google.com/#/c/1043435/

BUG: 28173127
Change-Id: Iab0c5013fc41f79a6fd45f49904edd0d0f9c17ff
2016-05-16 14:59:53 -07:00
Jorim Jaggi
0808da6835 Don\'t throw away wallpaper bitmap just because we are hidden. am: ed0e1a68a4
am: 840165f0bf

* commit '840165f0bfcaaa8dafa3145830488e252a81b675':
  Don't throw away wallpaper bitmap just because we are hidden.

Change-Id: I078065f041ea02f0d1d93dd22201a9d1c7dd9487
2016-05-16 21:58:05 +00:00