Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,273 Commits 3 Branches 0 Tags
6343cb5acd6b375cd4e2129e5709ee765e421f48
Commit Graph

16862 Commits

Author SHA1 Message Date
TreeHugger Robot
91b43d50fd Merge "sysui: refactor for extensibility." 2016-06-02 20:49:08 +00:00
Jorim Jaggi
199fec8a34 Merge "Also update setMinLines" into nyc-dev am: 79c0b2bcbb am: 8524697351 
am: 6379e87d06

* commit '6379e87d06ccf741b0328bed57b67b1b52fa66cc':
  Also update setMinLines

Change-Id: Ibe15ee4c83b5e51a71e49179d4428f28e2e89725
 2016-06-02 19:58:51 +00:00
Julia Reynolds
72735de3db Merge "Fix leak on density change." into nyc-dev am: a31ac7ddfb am: f584b1d96d 
am: 98d4456187

* commit '98d44561879bdc0c92ea03ce71a358217e43e377':
  Fix leak on density change.

Change-Id: Ic727a3c28d6e965bb0a79e667a6487f40aafc28f
 2016-06-02 19:52:43 +00:00
Julia Reynolds
555069f5ef Merge "Hide alarm condition if there\'s no alarm." into nyc-dev am: 62716a9197 am: 9548013287 
am: 30721fb490

* commit '30721fb4905a5743896134274ee83766c2dcc363':
  Hide alarm condition if there's no alarm.

Change-Id: Ib5584c9bdc2648ea69917511b7cdc4b9e455f7da
 2016-06-02 19:52:23 +00:00
Jorim Jaggi
6379e87d06 Merge "Also update setMinLines" into nyc-dev am: 79c0b2bcbb 
am: 8524697351

* commit '8524697351bb034c56bce99b6503225ca121fc71':
  Also update setMinLines

Change-Id: I0dff24ca60c040bc003ccae9b0111a1e437ce255
 2016-06-02 19:52:09 +00:00
Jorim Jaggi
8524697351 Merge "Also update setMinLines" into nyc-dev 
am: 79c0b2bcbb

* commit '79c0b2bcbbf2677de9a05c4baaa07c6796ea1583':
  Also update setMinLines

Change-Id: I34792f349b421e20849ad1db2a28d2751c994189
 2016-06-02 19:45:09 +00:00
Jason Monk
7de67877cd Merge "QS: Only put visible tiles in listening state" 2016-06-02 19:44:18 +00:00
Julia Reynolds
98d4456187 Merge "Fix leak on density change." into nyc-dev am: a31ac7ddfb 
am: f584b1d96d

* commit 'f584b1d96d2d114d57f5c87e9c517b7929854d53':
  Fix leak on density change.

Change-Id: I268a0c2d4096ad7d28c31964c560da88be43b44a
 2016-06-02 19:39:14 +00:00
Julia Reynolds
30721fb490 Merge "Hide alarm condition if there\'s no alarm." into nyc-dev am: 62716a9197 
am: 9548013287

* commit '9548013287f8345177e106cb79bc8c6d621457bd':
  Hide alarm condition if there's no alarm.

Change-Id: Ied3c40add25a0ffa8e766a820e64498e189a7df5
 2016-06-02 19:38:59 +00:00
Jorim Jaggi
79c0b2bcbb Merge "Also update setMinLines" into nyc-dev 2016-06-02 19:34:57 +00:00
Julia Reynolds
f584b1d96d Merge "Fix leak on density change." into nyc-dev 
am: a31ac7ddfb

* commit 'a31ac7ddfbccdb602aebb05686fcdb582ba74752':
  Fix leak on density change.

Change-Id: I8c474e29100543668a2348baca5f34b868cf8893
 2016-06-02 19:31:11 +00:00
Julia Reynolds
9548013287 Merge "Hide alarm condition if there\'s no alarm." into nyc-dev 
am: 62716a9197

* commit '62716a9197ba77b349d74770e6cd3b114e5f5de7':
  Hide alarm condition if there's no alarm.

Change-Id: Ib6c339aa3d00639fcad3bc15791787a52010a84f
 2016-06-02 19:30:52 +00:00
TreeHugger Robot
a31ac7ddfb Merge "Fix leak on density change." into nyc-dev 2016-06-02 19:24:16 +00:00
Muyuan Li
84b4561f1c sysui: refactor for extensibility. 
Refactor the test whether touch point is inside
QsContainer into a separate method.
Make mScrollingEnabled protected.

Bug: 28942125
Change-Id: I21a620bbad12c25fedfa5a1139221bd4cb2e95fe
(cherry picked from commit cc10182c291d3e559382ddd181b69c1e89e5ec8e)
 2016-06-02 19:12:44 +00:00
Amith Yamasani
0e29599ffc Merge "Setup user restrictions for demo user" into nyc-mr1-dev am: a28576cb72 
am: 64fc84e9c7

* commit '64fc84e9c78e143e79a0e5b2dddf97f02d1f40d9':
  Setup user restrictions for demo user

Change-Id: I414145f63da75daa63f25879dc2ef8ee167cef10
 2016-06-02 18:07:13 +00:00
Julia Reynolds
c3960f66be Hide alarm condition if there's no alarm. 
Change-Id: Iba8c9eb2bd3033683c25c5cf145fc52f9ac0f0d2
Fixes: 27698976
 2016-06-02 18:06:01 +00:00
Amith Yamasani
64fc84e9c7 Merge "Setup user restrictions for demo user" into nyc-mr1-dev 
am: a28576cb72

* commit 'a28576cb7201b468908346b4807892706870df92':
  Setup user restrictions for demo user

Change-Id: I4121f9745f8d582c0c85240a35b6ed442e8f2850
 2016-06-02 18:00:40 +00:00
Jason Monk
1bec6af01a QS: Only put visible tiles in listening state 
- Make it so the QSPanel doesn't listen until expansion starts
 - Push listening state through the TileLayout
 - Make PagedTileLayout only listen for visible pages
 - Push setListening onto background thread

Change-Id: Id7c008c9447f9a5dac69469fef72bc580f423b0c
Fixes: 28962155
 2016-06-02 13:59:07 -04:00
Amith Yamasani
a28576cb72 Merge "Setup user restrictions for demo user" into nyc-mr1-dev 2016-06-02 17:51:53 +00:00
Mady Mellor
b06c8adf8d Merge "Parent notifications should always be normal notification color" into nyc-dev am: 09ca7e73c0 am: 0e6207ef40 
am: 9982d86abc

* commit '9982d86abcaa7102511364ddf6bf36a140041709':
  Parent notifications should always be normal notification color

Change-Id: Icdda6486af4cccaacfc48dd30d8b97f0aaffa0a5
 2016-06-02 16:57:30 +00:00
Selim Cinek
e25eadbd67 Merge "Fixed a crash with notification groups" into nyc-dev am: c152dacc37 am: 5432938bf6 
am: f96c5fd462

* commit 'f96c5fd46280754f7122637e2e90055105610030':
  Fixed a crash with notification groups

Change-Id: If68dd896bbc9ae65941782589391d53f3063ea3d
 2016-06-02 16:57:15 +00:00
Mady Mellor
9982d86abc Merge "Parent notifications should always be normal notification color" into nyc-dev am: 09ca7e73c0 
am: 0e6207ef40

* commit '0e6207ef406d1fad389a9831e6c8816b274ad2b5':
  Parent notifications should always be normal notification color

Change-Id: I73542bc4adf5240ec130bac09ef788248f929a9b
 2016-06-02 16:48:36 +00:00
Selim Cinek
f96c5fd462 Merge "Fixed a crash with notification groups" into nyc-dev am: c152dacc37 
am: 5432938bf6

* commit '5432938bf6838c934cd4e28e094b9d78eca18777':
  Fixed a crash with notification groups

Change-Id: Id90f5d886d1019871172f0f7262f818e9fb2c36a
 2016-06-02 16:48:23 +00:00
Mady Mellor
0e6207ef40 Merge "Parent notifications should always be normal notification color" into nyc-dev 
am: 09ca7e73c0

* commit '09ca7e73c0e3384a57e4e4fc7c25fd52ca540d98':
  Parent notifications should always be normal notification color

Change-Id: I81160e649188e21d4c763abd8d222fa83608322d
 2016-06-02 16:41:09 +00:00
Selim Cinek
5432938bf6 Merge "Fixed a crash with notification groups" into nyc-dev 
am: c152dacc37

* commit 'c152dacc37bd850b06a37e18fba77308e8c9f939':
  Fixed a crash with notification groups

Change-Id: I6f36c1dae68de0e4741ee74910696869c21b86ec
 2016-06-02 16:41:00 +00:00
Mady Mellor
ece7cd7120 Merge "Parent notifications should always be normal notification color" into nyc-dev 
am: 09ca7e73c0

* commit '09ca7e73c0e3384a57e4e4fc7c25fd52ca540d98':
  Parent notifications should always be normal notification color

Change-Id: I581aed7e42200d5b78a5e7ac396c76eed883450c
 2016-06-02 16:14:53 +00:00
Mady Mellor
09ca7e73c0 Merge "Parent notifications should always be normal notification color" into nyc-dev 2016-06-02 16:09:16 +00:00
Selim Cinek
bf11142c36 Merge "Fixed a crash with notification groups" into nyc-dev 
am: c152dacc37

* commit 'c152dacc37bd850b06a37e18fba77308e8c9f939':
  Fixed a crash with notification groups

Change-Id: I6b76008e357e6459abc2775f992d95bd6a706e68
 2016-06-02 15:47:41 +00:00
TreeHugger Robot
c152dacc37 Merge "Fixed a crash with notification groups" into nyc-dev 2016-06-02 15:41:10 +00:00
Ricky Wai
64d66427bb Merge "Do not use cached tile specs value in QSTileHost.addTile()" into nyc-dev am: 390a0ca025 am: 140fe982df 
am: 4886275b94

* commit '4886275b948660f3b3cb7bfa8bdbd57b6eb80cf5':
  Do not use cached tile specs value in QSTileHost.addTile()

Change-Id: Ifa36b6e5f7fa11a3b17db4f722d7fabe8af058f7
 2016-06-02 15:20:37 +00:00
Ricky Wai
4886275b94 Merge "Do not use cached tile specs value in QSTileHost.addTile()" into nyc-dev am: 390a0ca025 
am: 140fe982df

* commit '140fe982df7c78e104b93f79d2bbe395e23259ec':
  Do not use cached tile specs value in QSTileHost.addTile()

Change-Id: If46d5f353b7ca93177eeb455c09922414bc80fab
 2016-06-02 15:13:36 +00:00
Clara Bayarri
43ee92589a DO NOT MERGE Fix Keyboard Shortcut Helper requires pressing META+/ twice 
am: 9fe1077b05

* commit '9fe1077b0506f7b425ae3ca355dbc4c62df16aad':
  DO NOT MERGE Fix Keyboard Shortcut Helper requires pressing META+/ twice

Change-Id: I6cdb2a8206baa3334542f2bdbaa2001d38890b98
 2016-06-02 15:09:34 +00:00
Ricky Wai
140fe982df Merge "Do not use cached tile specs value in QSTileHost.addTile()" into nyc-dev 
am: 390a0ca025

* commit '390a0ca025ce9b0849150a0c87641c33b292cc35':
  Do not use cached tile specs value in QSTileHost.addTile()

Change-Id: I5933bba5ef093cb9593673d708030de275797539
 2016-06-02 15:08:03 +00:00
Ricky Wai
0a4127c583 Merge "Do not use cached tile specs value in QSTileHost.addTile()" into nyc-dev 
am: 390a0ca025

* commit '390a0ca025ce9b0849150a0c87641c33b292cc35':
  Do not use cached tile specs value in QSTileHost.addTile()

Change-Id: I0363a9c64960b82b3b74a79de3e4998d0a03b550
 2016-06-02 15:06:18 +00:00
Clara Bayarri
9fe1077b05 DO NOT MERGE Fix Keyboard Shortcut Helper requires pressing META+/ twice 
By using a local boolean we were missing out on when the system dismisses
the window with the back key.

Bug: 28910518
Change-Id: I87b21c11830eaf81e3fd9586be6e3a7bb59c8a1f
(cherry picked from commit 3ac0ae076e)
 2016-06-02 15:04:02 +00:00
Julia Reynolds
f4d803d463 Fix leak on density change. 
Bug: 29064258
Change-Id: I9d579cc17fe4554a6a4aa57c409cef72bdee74bd
 2016-06-02 10:57:02 -04:00
Ricky Wai
390a0ca025 Merge "Do not use cached tile specs value in QSTileHost.addTile()" into nyc-dev 2016-06-02 14:56:51 +00:00
Clara Bayarri
a3c2c6cb97 Merge "Fix Keyboard Shortcut Helper requires pressing META+/ twice" 2016-06-02 14:05:23 +00:00
Ricky Wai
b96c1eacaf Do not use cached tile specs value in QSTileHost.addTile() 
As addTile() can be run multiple times before listener receives
the update, addTile() should always use the latest updated value
from settings but not from the cache value.

Bug: 28185436
Change-Id: I8c840343b797b00373a6f40cc5ea125efe68a6e1
 2016-06-02 11:42:16 +01:00
Jorim Jaggi
b6650bf02d Also update setMinLines 
If we switch to single-line, the min lines property gets overriden
so we need to manually call setMinLines to reset the state to the
initial state.

Change-Id: I1b47a093981045c2c0d176c831e37f8e9431ae1c
Fixes: 29056442
 2016-06-02 01:52:02 +00:00
Annie Chin
41ec20fa5e Merge "Merge "Add createAssistManager() method to SystemUIFactory" into nyc-mr1-dev am: a48f9cb72f" into nyc-mr1-dev-plus-aosp 
am: 40ac62d0fa

* commit '40ac62d0fa3b4882c62c129b394d162bd06d300d':
  Add createAssistManager() method to SystemUIFactory

Change-Id: Ia5a76d69a6081ed084b658f867142bf87515df0d
 2016-06-02 00:54:20 +00:00
Annie Chin
a4b8a2dd89 Merge "Merge "Introduce ButtonInterface and getHomeId()" into nyc-mr1-dev am: 54c3213304" into nyc-mr1-dev-plus-aosp 
am: 94d9bdb86d

* commit '94d9bdb86d375605f699d1d8f9784ab256db3a1b':
  Introduce ButtonInterface and getHomeId()

Change-Id: Id5b35fafb461100e02754d5901a555331c15f75a
 2016-06-02 00:23:45 +00:00
Adrian Roos
6f83f46aaa Merge "Merge "Fix DirectReply bug when reapply fails" into nyc-dev am: 6510bdeada am: 053ffa6d7c" into nyc-mr1-dev-plus-aosp 
am: b07aac4e95

* commit 'b07aac4e95b192b880ce3c5406dbfbf06b1f000f':
  Fix DirectReply bug when reapply fails

Change-Id: I127a782f9ef492f0bd309433733df4a49b893879
 2016-06-02 00:20:21 +00:00
Selim Cinek
d24fad96ed Merge "Fixes a few bugs on the keyguard with font density changes" into nyc-dev am: 42621023cf am: 7b7b17ab80 
am: d1c8257832

* commit 'd1c8257832adec3c7dffd3d7e981b93cb4975bed':
  Fixes a few bugs on the keyguard with font density changes

Change-Id: I31fa4753a23bf950abc29063ba493c9819dddaef
 2016-06-02 00:16:03 +00:00
Amith Yamasani
52c21e3453 Setup user restrictions for demo user 
Prevent certain actions by demo user
Also eliminate immersive mode confirmation when device is
in demo mode.

Bug: 27280140
Change-Id: I6955b7bb5c1ae13e1df36cef822b6fd39cb51e46
 2016-06-01 17:12:44 -07:00
Julia Reynolds
4ae8b76993 Merge "Radio buttons belong in a radio group." into nyc-dev am: d05a7b5972 am: 88470b5ba2 
am: cdfba342b0

* commit 'cdfba342b0b1ab00ccba9c6c1058a9ce925300b1':
  Radio buttons belong in a radio group.

Change-Id: Iee1829ccb90a43a2e4f3fa60d0d23c1efea46308
 2016-06-01 23:44:35 +00:00
Jason Monk
5dbe4afebe Merge "QS: Fix single expanded frame from layout" into nyc-dev am: 4215ae0100 am: 023b338111 
am: e5b5c11743

* commit 'e5b5c11743f53d70dda78d7fd4f8a728a3c1bc3c':
  QS: Fix single expanded frame from layout

Change-Id: If4e5828a662d2d326e447f31f36ecea5a6280a19
 2016-06-01 23:43:51 +00:00
Annie Chin
f11218183c Merge "Add createAssistManager() method to SystemUIFactory" into nyc-mr1-dev 
am: a48f9cb72f

* commit 'a48f9cb72f062ede5ed5d9ceb6fa345f5b194d1b':
  Add createAssistManager() method to SystemUIFactory

Change-Id: I9551ceff98c3e238c72c158e4ab23a6bc65559c4
 2016-06-01 23:40:30 +00:00
Jason Monk
9882301826 Merge "QS: Followup to scroll fixes" into nyc-dev am: 1ceef7c0fa am: 947ef9a717 
am: 1487a07ad4

* commit '1487a07ad4f0bbd1e08c63089f7337eb1e0892b4':
  QS: Followup to scroll fixes

Change-Id: I7612dcd819e5a3c250d5f10b4af85cfce860fbef
 2016-06-01 23:39:53 +00:00
Android Build Merger (Role)
94d9bdb86d Merge "Merge "Introduce ButtonInterface and getHomeId()" into nyc-mr1-dev am: 54c3213304" into nyc-mr1-dev-plus-aosp 2016-06-01 23:14:33 +00:00