Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
261,999 Commits 3 Branches 0 Tags
d4e70720ef7ada2d5e040dcadd2ba47b87fdead4
Commit Graph

16408 Commits

Author SHA1 Message Date
Mady Mellor
29abe8b728 Merge "Ensure background is shown behind gear when notifications overlap" into nyc-dev am: 048cabdbcb am: 573c36a484 
am: f0b665f6e1

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

Change-Id: I98764977db122c57080f918939e8b2e6c913d8f9
 2016-05-18 16:57:35 +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
2a1851793b Merge "PIP: Fix NPE when enters Recents with PIP" into nyc-dev am: 4e08800a7e am: e659fac4c2 
am: c1093b1dca

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

Change-Id: Ic74513e1eb7c743e249fadfe6513e782c4afbd59
 2016-05-18 15:56:09 +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
0b3d3f277b resolve merge conflicts of 43153f1 to master 
Change-Id: I1d1957abf5c97565d2a1c52c5f50c6a25b711bd7
 2016-05-18 10:49:02 -04: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
Clara Bayarri
382c59edb2 Fix Backslash not showing with paired keyboard 
Our current label retrieving flow is

1. Special cased drawables (e.g. backspace)
2. Special cased names (e.g. F2)
3. Device KeyCharacterMap getLabel

For single character keys such as '\', we reach the end of 3. with
no result if the main device doesn't have the key. This change uses
the virtual keyboard map as a backup to retrieve labels for these
last resort cases.

Bug: 28830189
Change-Id: I69cc82a11e7b803db7f60ea07d34c59f6000149e
 2016-05-18 15:02:10 +01:00
Nicolas Prevot
470810f26a Merge "Refactor how StatusBarPolicy knows if keyguard is visible." into nyc-dev am: bbd26bc023 am: d1d0c558b7 
am: 7b95a64c04

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

Change-Id: Icdd79ce0cab85bc031c2e1ab9c9205cdfb377c26
 2016-05-18 11:39:57 +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
af15c8bcae Merge "Move LocaleList to avoid layering violation." into nyc-dev am: 31884efd13 am: ddaf3f4681 
am: bf4c8f730b

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

Change-Id: I78fee5269f7428e34b196573575784fc15cb1372
 2016-05-18 02:25:10 +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
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
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
Jiaquan He
074ae46960 Change some members in QSTileBaseView and QSTileView. 
Bug: 28531806

Change-Id: I06ff3189f413ce7877d66e4f583cae05869e1ae5
 2016-05-17 21:23:05 +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
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
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
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
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