Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
235,058 Commits 3 Branches 0 Tags
1e4e9850cf0d9bbf52ebdda1c3de4ea00a1f2bcf
Commit Graph

13601 Commits

Author SHA1 Message Date
Youngsang Cho
3d1265bda7 Merge "PIP: Rename closeInternal to closePipInternal" into nyc-dev am: ffd4c73a29 
am: ad5dccf123

* commit 'ad5dccf123d20ad56c40641fe71a49e322db90f6':
  PIP: Rename closeInternal to closePipInternal
 2016-02-22 21:08:54 +00:00
Youngsang Cho
ad5dccf123 Merge "PIP: Rename closeInternal to closePipInternal" into nyc-dev 
am: ffd4c73a29

* commit 'ffd4c73a293ebac22efa644db99ba907f9776604':
  PIP: Rename closeInternal to closePipInternal
 2016-02-22 20:07:47 +00:00
Youngsang Cho
8730d4a9f8 Merge "Close PIP when PIP activity is finished" into nyc-dev am: d78bf970ca 
am: ab4848ccf5

* commit 'ab4848ccf5074709ba41ea1da3c69ee9d83a9266':
  Close PIP when PIP activity is finished
 2016-02-22 19:51:49 +00:00
Mady Mellor
1bae382eae Merge "Fix crash when clearing all notifications" into nyc-dev am: e03688068f 
am: 70a43269b3

* commit '70a43269b30f6e0ce8ec92ab99d63ef46a4d5a02':
  Fix crash when clearing all notifications
 2016-02-22 19:48:47 +00:00
Youngsang Cho
ab4848ccf5 Merge "Close PIP when PIP activity is finished" into nyc-dev 
am: d78bf970ca

* commit 'd78bf970ca8b7a48bf26651016c034b5e319456c':
  Close PIP when PIP activity is finished
 2016-02-22 19:40:29 +00:00
Mady Mellor
70a43269b3 Merge "Fix crash when clearing all notifications" into nyc-dev 
am: e03688068f

* commit 'e03688068f320d0401ba2dc5e10c85fc6d2affaa':
  Fix crash when clearing all notifications
 2016-02-22 19:36:40 +00:00
Youngsang Cho
ffd4c73a29 Merge "PIP: Rename closeInternal to closePipInternal" into nyc-dev 2016-02-22 19:22:32 +00:00
Youngsang Cho
336007ba71 PIP: Rename closeInternal to closePipInternal 
Change-Id: I6e1e98a1a75728d057a7dee3edbd2f2a6f32112d
 2016-02-22 11:17:29 -08:00
Youngsang Cho
d78bf970ca Merge "Close PIP when PIP activity is finished" into nyc-dev 2016-02-22 19:04:29 +00:00
Youngsang Cho
23df699451 Close PIP when PIP activity is finished 
Bug: 26717072
Change-Id: I5dd431b0ee64ca152bd49013bb6bbb3e8d9fba71
 2016-02-22 11:03:00 -08:00
Mady Mellor
e03688068f Merge "Fix crash when clearing all notifications" into nyc-dev 2016-02-22 18:54:40 +00:00
Mady Mellor
3cb40246f1 Fix crash when clearing all notifications 
Bug: 27284789
 2016-02-22 10:43:35 -08:00
Xiaohui Chen
f89c495c2c Merge "sysui: refactor for extensibility" into nyc-dev am: de1eaab7f7 
am: 1c0f53e874

* commit '1c0f53e874fc66c8f96152b2cd8e5a1377fb9034':
  sysui: refactor for extensibility
 2016-02-22 18:30:03 +00:00
Xiaohui Chen
1c0f53e874 Merge "sysui: refactor for extensibility" into nyc-dev 
am: de1eaab7f7

* commit 'de1eaab7f71a7bafd46e67fad2d591743061b5b8':
  sysui: refactor for extensibility
 2016-02-22 18:22:45 +00:00
Xiaohui Chen
5da713599f sysui: refactor for extensibility 
Bug: 27098035
Change-Id: I9ce480a5995f354ad45b6f13112cfa1ab49934cd
 2016-02-22 18:07:42 +00:00
Geoff Mendal
687ccbbf71 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-02-22 15:29:59 +00:00
Geoff Mendal
bf0dabe274 Import translations. DO NOT MERGE 
Change-Id: Ibf2edd0cc4c1d2d8f11d5ee489e6e9729d2d2b5e
Auto-generated-cl: translation import
 2016-02-22 07:28:16 -08:00
Jason Monk
60da854e46 Merge "Move background data notif to data saver status icon" into nyc-dev am: c6b5dd4897 
am: 487ed88b63

* commit '487ed88b634d3e43f8eccd2647b0aea54052c661':
  Move background data notif to data saver status icon
 2016-02-22 15:12:30 +00:00
Jason Monk
487ed88b63 Merge "Move background data notif to data saver status icon" into nyc-dev 
am: c6b5dd4897

* commit 'c6b5dd4897bf95967b27b36cb517f0f209290be2':
  Move background data notif to data saver status icon
 2016-02-22 15:06:43 +00:00
Jason Monk
f23aa99270 Move background data notif to data saver status icon 
Bug: 26796370
Change-Id: Ibf53c3affa63100b603e362b58ca6d2958791321
 2016-02-22 14:56:05 +00:00
Geoff Mendal
9daee8298b Import translations. DO NOT MERGE 
Change-Id: I84d35f9d88f70093a3bb48f54ea4df5a1b7e7cce
Auto-generated-cl: translation import
 2016-02-22 06:03:43 -08:00
Jason Monk
7cdea0389f Fix edit/page indicator area layout am: 855d408e17 
am: 353c8ceb04

* commit '353c8ceb042c1b8024fd1177311462c920ea0270':
  Fix edit/page indicator area layout
 2016-02-21 16:12:06 +00:00
Jason Monk
353c8ceb04 Fix edit/page indicator area layout 
am: 855d408e17

* commit '855d408e17612beadfc637496f50b03a7149515a':
  Fix edit/page indicator area layout
 2016-02-21 16:05:41 +00:00
Jason Monk
855d408e17 Fix edit/page indicator area layout 
Bug: 27201532
Change-Id: Ie03e6aeeb9d607f1fba370a4f1bd23a2ffb9b485
 2016-02-21 11:00:49 -05:00
Jason Monk
278dafc535 Don\'t set the text on QS Tiles unless we need to am: 7435155432 
am: b619efd771

* commit 'b619efd771bdf3525bc75ab6518af081f2d0a625':
  Don't set the text on QS Tiles unless we need to
 2016-02-20 18:42:09 +00:00
Jason Monk
4317ecb8f0 Merge changes Icb8e2097,I9a2a16f9 into nyc-dev am: 865a4ee0cd 
am: 4472d715c7

* commit '4472d715c7307149e40e30370e57c3ca68beac5e':
  Optimization for TouchAnimator
  QS Animations - first pass, still not spec
 2016-02-20 18:41:03 +00:00
Jason Monk
b619efd771 Don\'t set the text on QS Tiles unless we need to 
am: 7435155432

* commit '74351554328e56fdd02eb09d93a98aaf97ccce04':
  Don't set the text on QS Tiles unless we need to
 2016-02-20 18:37:12 +00:00
Jason Monk
4472d715c7 Merge changes Icb8e2097,I9a2a16f9 into nyc-dev 
am: 865a4ee0cd

* commit '865a4ee0cddedc8ef11f8370390e197e9ae95067':
  Optimization for TouchAnimator
  QS Animations - first pass, still not spec
 2016-02-20 18:36:05 +00:00
Jason Monk
7435155432 Don't set the text on QS Tiles unless we need to 
Avoid causing layout passes.

Bug: 27278616
Change-Id: I5104a756b44154f6b66f2c74aee17caf29acf628
 2016-02-20 16:56:07 +00:00
Jason Monk
865a4ee0cd Merge changes Icb8e2097,I9a2a16f9 into nyc-dev 
* changes:
  Optimization for TouchAnimator
  QS Animations - first pass, still not spec
 2016-02-20 16:53:04 +00:00
Jason Monk
8d1253e944 Optimization for TouchAnimator 
Bug: 27278616
Change-Id: Icb8e20977a0f8cdbc6ace25707e8f95e34efc356
 2016-02-20 16:51:41 +00:00
Jason Monk
162011ebe8 QS Animations - first pass, still not spec 
Bug: 27201532

Change-Id: I9a2a16f9d769db1f40ae733ad55a07ede4780698
 2016-02-20 08:36:40 -05:00
Jorim Jaggi
4c1ceaf163 Merge "Cancel fling animation when starting to drag" into nyc-dev am: f0c548645f 
am: d088074eb4

* commit 'd088074eb4a4a84ce1fb04d4691f6c99b10f16c8':
  Cancel fling animation when starting to drag
 2016-02-20 08:17:46 +00:00
Jason Monk
f84df878f3 Merge "Fix QS Open on single finger scroll" into nyc-dev am: 11c4fd411a 
am: aa5a2dbfb3

* commit 'aa5a2dbfb39de25fb8ed05ad8c801aaf0c2b264c':
  Fix QS Open on single finger scroll
 2016-02-20 07:23:13 +00:00
Jorim Jaggi
d088074eb4 Merge "Cancel fling animation when starting to drag" into nyc-dev 
am: f0c548645f

* commit 'f0c548645fde12d26f379610e046d3b800fad38d':
  Cancel fling animation when starting to drag
 2016-02-20 02:32:32 +00:00
Jorim Jaggi
0c790411c3 Cancel fling animation when starting to drag 
Makes sure we don't end up in a weird state because
at the end of the fling animation, mDockSide gets
reset.

Bug: 27269044
Change-Id: I779b8ee9be9a35553c7f822421d1f02ca802111c
 2016-02-20 02:23:37 +00:00
Jason Monk
aa5a2dbfb3 Merge "Fix QS Open on single finger scroll" into nyc-dev 
am: 11c4fd411a

* commit '11c4fd411a20100b57a678bf3abcde2f2e2eb199':
  Fix QS Open on single finger scroll
 2016-02-20 01:33:35 +00:00
Jason Monk
11c4fd411a Merge "Fix QS Open on single finger scroll" into nyc-dev 2016-02-20 01:07:35 +00:00
Jason Monk
83e431fc51 Fix QS Open on single finger scroll 
The QSPanel had 0 height when shade was collapsed which messed up
the immediate expand logic.

Bug: 27197894
Change-Id: I623eb5d3b945a83b3410fa5dc52c4f96dd6700cb
 2016-02-19 19:32:13 -05:00
Selim Cinek
db7df8c918 Merge "Fixed a clicking bug on the lockscreen" into nyc-dev am: e961f32b0f 
am: 4e0b58be83

* commit '4e0b58be83fa9bfcf9bd29d9ac4488bb8043c0db':
  Fixed a clicking bug on the lockscreen
 2016-02-19 23:43:55 +00:00
Selim Cinek
0d9b9bdcb4 Merge "Cleaned up the logic for the picture end margin" into nyc-dev am: 54c857cda6 
am: 9867f9ae34

* commit '9867f9ae3425fb355b21dd818737e290444cdc2a':
  Cleaned up the logic for the picture end margin
 2016-02-19 23:40:46 +00:00
Selim Cinek
bb2fecda85 Merge "Adapted the measuring of notification content view" into nyc-dev am: 79fa406933 
am: 10a16df62d

* commit '10a16df62d08be7eec4b04fb1cfcb0e9cb98c7f9':
  Adapted the measuring of notification content view
 2016-02-19 23:37:04 +00:00
Selim Cinek
4e0b58be83 Merge "Fixed a clicking bug on the lockscreen" into nyc-dev 
am: e961f32b0f

* commit 'e961f32b0f96902276c69f25a35e89aa8cc34ea0':
  Fixed a clicking bug on the lockscreen
 2016-02-19 23:20:46 +00:00
Selim Cinek
9867f9ae34 Merge "Cleaned up the logic for the picture end margin" into nyc-dev 
am: 54c857cda6

* commit '54c857cda62fbd3a86f5a74924fcea23b89bb1f5':
  Cleaned up the logic for the picture end margin
 2016-02-19 23:17:45 +00:00
Selim Cinek
10a16df62d Merge "Adapted the measuring of notification content view" into nyc-dev 
am: 79fa406933

* commit '79fa406933c5ec65e2d48279dc9e0011809512b3':
  Adapted the measuring of notification content view
 2016-02-19 23:11:28 +00:00
Selim Cinek
e961f32b0f Merge "Fixed a clicking bug on the lockscreen" into nyc-dev 2016-02-19 23:04:55 +00:00
Selim Cinek
54c857cda6 Merge "Cleaned up the logic for the picture end margin" into nyc-dev 2016-02-19 23:04:26 +00:00
Selim Cinek
79fa406933 Merge "Adapted the measuring of notification content view" into nyc-dev 2016-02-19 23:03:59 +00:00
Toni Barzic
aa401afb4c Properly handle non split system user when showing bouncer 
For system user, there should be no atempt to dismiss keyguard,
but only if system user is split (i.e. not a meat user).

Change-Id: Ia2c1e7a3e197c5be72446f21b3883e853485ff26
 2016-02-19 14:51:16 -08:00
Toni Barzic
1865bd614e Merge "Try to dismiss Keyguard bypassing bouncer only for active users" 2016-02-19 22:49:59 +00:00