Commit Graph

15617 Commits

Author SHA1 Message Date
Jorim Jaggi
9b5ea09d57 Merge "Fix a few issues with ime adjust/minimized dock stack" into nyc-dev am: 96b2fe6a4e
am: e1770e70dc

* commit 'e1770e70dca6a91f1ed4af631aa9c819db55eefb':
  Fix a few issues with ime adjust/minimized dock stack

Change-Id: I14e49a2030d1e4d4ca62c43f33d0616212d3d456
2016-05-18 19:42:07 +00:00
Jorim Jaggi
e1770e70dc Merge "Fix a few issues with ime adjust/minimized dock stack" into nyc-dev
am: 96b2fe6a4e

* commit '96b2fe6a4eec82635f39c025ee9c57e99207a3df':
  Fix a few issues with ime adjust/minimized dock stack

Change-Id: I9f3f19c09a9f83b0a72bff4a26489b240af630a8
2016-05-18 19:34:23 +00:00
Jorim Jaggi
3070e77f91 Fix a few issues with ime adjust/minimized dock stack
- Do not override minimized state in SysUI when IME adjust change
comes in.
- Do not animate IME adjust if we are already animating for minimized.
This lead to problems that we animated the minimized state with the IME
adjust values.
- Make sure to update state after checking whether the IME adjust is
animating. This is to fix an issue where sometimes the IME adjust
animation didn't run because the old target was wrong.

Change-Id: Ie35e2f943a4cda99ffdc6f14663d892863759e46
Fixes: 28819201
2016-05-18 19:27:24 +00:00
Baligh Uddin
cb6e5df633 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-18 17:57:19 +00:00
Mady Mellor
f0b665f6e1 Merge "Ensure background is shown behind gear when notifications overlap" into nyc-dev am: 048cabdbcb
am: 573c36a484

* commit '573c36a484f77d2bb41aa851ddce29c5b73302e4':
  Ensure background is shown behind gear when notifications overlap

Change-Id: I88d26ac1012d63215f209ee79e644785f8603a1b
2016-05-18 16:53:52 +00:00
Mady Mellor
573c36a484 Merge "Ensure background is shown behind gear when notifications overlap" into nyc-dev
am: 048cabdbcb

* commit '048cabdbcbc262869a5b737a22ccddb5ef0d76f9':
  Ensure background is shown behind gear when notifications overlap

Change-Id: I37d030259db06ca3d1a0d60ecd34c7e51caf5415
2016-05-18 16:48:05 +00:00
Mady Mellor
048cabdbcb Merge "Ensure background is shown behind gear when notifications overlap" into nyc-dev 2016-05-18 16:43:12 +00:00
Jaewan Kim
c1093b1dca Merge "PIP: Fix NPE when enters Recents with PIP" into nyc-dev am: 4e08800a7e
am: e659fac4c2

* commit 'e659fac4c272a42eb575b9d66881f34a8ceeb66b':
  PIP: Fix NPE when enters Recents with PIP

Change-Id: I029f82f0f7c9673bbb7010daabe18017d889d83d
2016-05-18 15:53:32 +00:00
Jaewan Kim
e659fac4c2 Merge "PIP: Fix NPE when enters Recents with PIP" into nyc-dev
am: 4e08800a7e

* commit '4e08800a7e196cc94c1ed3fdcf6a492aa86055d2':
  PIP: Fix NPE when enters Recents with PIP

Change-Id: Ia0053731d074dec0e8438bcf654349dfd6e2c4a0
2016-05-18 15:50:51 +00:00
Jaewan Kim
4e08800a7e Merge "PIP: Fix NPE when enters Recents with PIP" into nyc-dev 2016-05-18 15:46:46 +00:00
Julia Reynolds
43153f18c5 resolve merge conflicts of 5201a62 to nyc-dev-plus-aosp
am: cc8c594a5c

* commit 'cc8c594a5c5cb255907cb2eaddb37ea1321fa104':
  Handle PhoneStatusBarPolicy user switch callbacks on main thread

Change-Id: I816905527f5061e7af2fe14b42f9c0397036bdb7
2016-05-18 14:31:03 +00:00
Julia Reynolds
cc8c594a5c resolve merge conflicts of 5201a62 to nyc-dev-plus-aosp
Change-Id: I411ed02c96997416dc5e5eb4f289d3c25932babd
2016-05-18 10:24:28 -04:00
Julia Reynolds
5201a6246d Merge "Handle PhoneStatusBarPolicy user switch callbacks on main thread" into nyc-dev 2016-05-18 14:09:50 +00:00
Nicolas Prévot
7b95a64c04 Merge "Refactor how StatusBarPolicy knows if keyguard is visible." into nyc-dev am: bbd26bc023
am: d1d0c558b7

* commit 'd1d0c558b78f3504919c77140ee45b71cadfbe38':
  Refactor how StatusBarPolicy knows if keyguard is visible.

Change-Id: Icc3aeb92780317c8fa4259434e96d17bf16448f3
2016-05-18 11:34:56 +00:00
Nicolas Prevot
d1d0c558b7 Merge "Refactor how StatusBarPolicy knows if keyguard is visible." into nyc-dev
am: bbd26bc023

* commit 'bbd26bc023992ee7bc6a0e682d4a343dfe3dc848':
  Refactor how StatusBarPolicy knows if keyguard is visible.

Change-Id: Ib230238ee0ecb727ef716d844592bda0a86ae56d
2016-05-18 11:31:35 +00:00
Nicolas Prévot
bbd26bc023 Merge "Refactor how StatusBarPolicy knows if keyguard is visible." into nyc-dev 2016-05-18 11:21:45 +00:00
Yohei Yukawa
bf4c8f730b Merge "Move LocaleList to avoid layering violation." into nyc-dev am: 31884efd13
am: ddaf3f4681

* commit 'ddaf3f468195e5aa47617317c08e9e2c35bcfeee':
  Move LocaleList to avoid layering violation.

Change-Id: I7dbe5c3d552a7350ab61c929f431e2a3cffdee5b
2016-05-18 02:22:07 +00:00
Yohei Yukawa
ddaf3f4681 Merge "Move LocaleList to avoid layering violation." into nyc-dev
am: 31884efd13

* commit '31884efd13b3ac60078edaa0b7e8a4b75d995538':
  Move LocaleList to avoid layering violation.

Change-Id: I9132fe456a8d79569c651dac0a0bce0153444767
2016-05-18 02:18:38 +00:00
Jaewan Kim
16c91bd47f PIP: Fix NPE when enters Recents with PIP
Bug: 28826021
Change-Id: Ic81f705dccbd4b334ed5a26345fdc5fee23f5a68
2016-05-18 10:02:45 +09:00
Yohei Yukawa
23cbe85610 Move LocaleList to avoid layering violation.
Since LocaleList needs to depend on android.os.Parcelable, we cannot let
that class belong to "android.util" package, which causes layering
violation.

Bug: 28819696
Change-Id: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18
2016-05-17 16:42:58 -07: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
ba0639ad01 Merge "Fixed a screen flickering on tablets" into nyc-dev
am: ce80acd73a

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

Change-Id: I933d1b9d4b93f4f621bce2f55b85d8462f5e994b
2016-05-17 22:21:40 +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
a6a27fb71f Merge "Fixed a bug with auto cancelling" into nyc-dev
am: a35d9b3ee0

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

Change-Id: Id6e2850c96274a406ea52095516bfbe39dd2d2c8
2016-05-17 22:21:36 +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
Toni Barzic
e97f923c18 Handle PhoneStatusBarPolicy user switch callbacks on main thread
Said callbacks poke around StatusBarIconController, which lives on
main thread and is not thread safe.

BUG=27047911
Bug:28613935

Change-Id: I880d79a237b03c06d72b5dff3db24bd60c7b8839
(cherry picked from commit 4f65092f5c95b89f48a48a916467b78d2a07ff89)
2016-05-17 20:32:37 +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
eac3096666 Merge "Title is a CharSequence." into nyc-dev
am: 94789b4ddf

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

Change-Id: I62839dc7fd216454bd8b43b9905a241bed31948b
2016-05-17 19:55:49 +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
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
Felipe Leme
f45186e311 Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev
am: 2c6a450fa2

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

Change-Id: I4e19dd2828b8b67fc7b2d2173d77a82d67d53d19
2016-05-17 18:43: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
Nicolas Prevot
1dbbe7d664 Refactor how StatusBarPolicy knows if keyguard is visible.
In the case where the keyguard has never been shown and thus
never been dismissed: StatusBarPolicy thought the keyguard was
still visible.

Instead of StatusBarPolicy keeping its own internal variable
for wether the keyguard is visible, directly use
StatusBarKeyguardViewManager.isShowing()

BUG:28755086
Change-Id: I1b30c0e6985aa7ff35eea41444ab5504c00ff130
2016-05-17 19:36:44 +01: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
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