Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
254,861 Commits 3 Branches 0 Tags
e01e336efcd7d254e8441831981e9ecd20042e2a
Commit Graph

25997 Commits

Author SHA1 Message Date
Philip P. Moltmann
7c53832a8a Merge "Declare no print services if 0 print services are enabled." into nyc-dev am: b852d0138a 
am: 5365e7a194

* commit '5365e7a194cdcf8ec6ca82a649b24900b9dcb052':
  Declare no print services if 0 print services are enabled.

Change-Id: I9af64891aa666d3eacd50dbe12263ce900f7200c
 2016-05-18 19:53:43 +00:00
Philip P. Moltmann
5365e7a194 Merge "Declare no print services if 0 print services are enabled." into nyc-dev 
am: b852d0138a

* commit 'b852d0138ab84817b042791e0e204459d87038ce':
  Declare no print services if 0 print services are enabled.

Change-Id: I2b995a757a5f745c442cc813873edf3726cb0abb
 2016-05-18 19:50:29 +00:00
Philip P. Moltmann
b852d0138a Merge "Declare no print services if 0 print services are enabled." into nyc-dev 2016-05-18 19:45:05 +00:00
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
aebe22dbc3 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-18 18:56:45 +00:00
Baligh Uddin
576a32da20 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-18 17:57:26 +00:00
Baligh Uddin
cb6e5df633 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-18 17:57:19 +00:00
Baligh Uddin
e6ee2d7e11 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-18 17:54:34 +00:00
Tony Mak
d412dfc2a8 Should check isDeviceSecure in shouldConfirmCredentials am: ae13e18c55 
am: db9d529499

* commit 'db9d529499cc635c5ce3d0a4d5b44f2211afaef6':
  Update RestrictedLockUtils to use UM.getUserRestrictionSource.

Change-Id: I12805ef5c1a7039ccad07e31f84231cc703dd470
 2016-05-18 17:18:36 +00:00
Sudheer Shanka
db9d529499 Merge "Update RestrictedLockUtils to use UM.getUserRestrictionSource." into nyc-dev 
am: 0d902adbbc

* commit '0d902adbbc729f87f94fd70d9a6331e551108bc0':
  Update RestrictedLockUtils to use UM.getUserRestrictionSource.

Change-Id: Iaad04447c2fffd0f6b80c22bfea576e5d2b28856
 2016-05-18 17:14:29 +00:00
Sudheer Shanka
6c505ecdd6 Merge "Update RestrictedLockUtils to use UM.getUserRestrictionSource." into nyc-dev 
am: 0d902adbbc

* commit '0d902adbbc729f87f94fd70d9a6331e551108bc0':
  Update RestrictedLockUtils to use UM.getUserRestrictionSource.

Change-Id: I2a0a71595b2af94d9806386877ca510c0cee3271
 2016-05-18 17:14:25 +00:00
TreeHugger Robot
0d902adbbc Merge "Update RestrictedLockUtils to use UM.getUserRestrictionSource." into nyc-dev 2016-05-18 17:09:46 +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
689b8026ed 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: Idd2839db81350906ba36f1a17feebfc239d5d2c2
 2016-05-18 16:47:57 +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
7b1e4a02c3 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: I6e8172d0a5fe6d6f12474b188b1e1ca52b927bfd
 2016-05-18 15:50:59 +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
Philip P. Moltmann
8375604e96 Merge "Handle printers selected by SelectPrinter activity" into nyc-dev am: 746de4e9c8 
am: 0ba575e431

* commit '0ba575e4314b4a7cfc467ee08fa06f1011a44eb5':
  Handle printers selected by SelectPrinter activity

Change-Id: Ie1ed01f16eb0b7b04d7549839f1539f4a9793b0f
 2016-05-18 15:38:58 +00:00
Philip P. Moltmann
0ba575e431 Merge "Handle printers selected by SelectPrinter activity" into nyc-dev 
am: 746de4e9c8

* commit '746de4e9c87d3068643a97a3b0b5709ffdbb4ad6':
  Handle printers selected by SelectPrinter activity

Change-Id: I5060133e2dd3a87f99af3ecc3e1b378291befcc4
 2016-05-18 15:32:48 +00:00
Philip P. Moltmann
8e5c3a004a Merge "Handle printers selected by SelectPrinter activity" into nyc-dev 
am: 746de4e9c8

* commit '746de4e9c87d3068643a97a3b0b5709ffdbb4ad6':
  Handle printers selected by SelectPrinter activity

Change-Id: Ie22f3d5d2b483a8a6354cb9968e939a80b6b1855
 2016-05-18 15:32:15 +00:00
Philip P. Moltmann
e951a13916 Declare no print services if 0 print services are enabled. 
Fixes: 28833953
Change-Id: I94e77dc23107fab10d45f51169d71e4da574ee66
 2016-05-18 08:27:02 -07:00
Philip P. Moltmann
746de4e9c8 Merge "Handle printers selected by SelectPrinter activity" into nyc-dev 2016-05-18 15:24:21 +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
Toni Barzic
0ca33e84a1 Merge "Handle PhoneStatusBarPolicy user switch callbacks on main thread" into nyc-dev 
am: 5201a6246d

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

Change-Id: I561be9cf58d0a43abd43d98cf1ee717241f10ef1
 2016-05-18 14:16:01 +00: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 Prevot
05f2a86b3d 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: I782d354549ba3185d4779a2e8b3ac6d0724e22ec
 2016-05-18 11:31:28 +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
Yohei Yukawa
13fa6b7c48 Merge "Move LocaleList to avoid layering violation." into nyc-dev 
am: 31884efd13

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

Change-Id: I45e9b7e834d2c5e515eb6c60885296358e7d786e
 2016-05-18 02:18:29 +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
Jim Miller
40d4d6094c Merge "Don\'t always announce accessibility events when resetting password" into nyc-dev am: 2d1c424a0e 
am: 9e507bd737

* commit '9e507bd73702ae56da0439be0b9f27e05b06f558':
  Don't always announce accessibility events when resetting password

Change-Id: Id1fa56d69af2d7394fa2083511f68c6621d19a54
 2016-05-17 22:26:45 +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
Jim Miller
d79eaa220c Merge "Don\'t always announce accessibility events when resetting password" into nyc-dev 
am: 2d1c424a0e

* commit '2d1c424a0ee8e210c1cd3f71b78d5a11e94f4ff3':
  Don't always announce accessibility events when resetting password

Change-Id: I7e1e2b8982708490b9ff467f6dfc129b11269259
 2016-05-17 22:21:30 +00:00
Jim Miller
9e507bd737 Merge "Don\'t always announce accessibility events when resetting password" into nyc-dev 
am: 2d1c424a0e

* commit '2d1c424a0ee8e210c1cd3f71b78d5a11e94f4ff3':
  Don't always announce accessibility events when resetting password

Change-Id: I8ff47b7b9c340fbf5ef4dfde619a80264ca9c170
 2016-05-17 22:21:24 +00:00
Selim Cinek
ce80acd73a Merge "Fixed a screen flickering on tablets" into nyc-dev 2016-05-17 22:05:54 +00:00