Android Build Merger (Role)
a5b7b96500
Merge "Merge \"Print names of observers causing timeout\" into nyc-mr1-dev am: 38d7897690" into nyc-mr1-dev-plus-aosp
2016-06-23 21:59:21 +00:00
Min Yun
566ef84677
Merge \\"Fix guts are not bound properly.\\" into nyc-dev am: 9ea3916063
...
am: 09190840e0
2016-06-23 21:58:54 +00:00
Fyodor Kupolov
7ccd3241e0
Merge \"Print names of observers causing timeout\" into nyc-mr1-dev
...
am: 38d7897690
2016-06-23 21:58:36 +00:00
Min Yun
09190840e0
Merge \"Fix guts are not bound properly.\" into nyc-dev
...
am: 9ea3916063
2016-06-23 21:53:12 +00:00
Fyodor Kupolov
38d7897690
Merge "Print names of observers causing timeout" into nyc-mr1-dev
2016-06-23 21:49:05 +00:00
TreeHugger Robot
9ea3916063
Merge "Fix guts are not bound properly." into nyc-dev
2016-06-23 21:45:59 +00:00
Adrian Roos
2f3476de3e
Merge \\"HUN: Close RemoteInputView when Home is pressed\\" into nyc-dev am: cdd43d7270
...
am: 1a215e8f9b
2016-06-23 21:37:23 +00:00
Adrian Roos
86315e78ae
Merge \"HUN: Close RemoteInputView when Home is pressed\" into nyc-dev
...
am: cdd43d7270
2016-06-23 21:34:03 +00:00
Adrian Roos
1a215e8f9b
Merge \"HUN: Close RemoteInputView when Home is pressed\" into nyc-dev
...
am: cdd43d7270
2016-06-23 21:33:55 +00:00
TreeHugger Robot
cdd43d7270
Merge "HUN: Close RemoteInputView when Home is pressed" into nyc-dev
2016-06-23 21:26:34 +00:00
Jason Monk
1ae5fbb187
Merge \\"QS: Hacks to fix bigger problems in TileService binding\\" into nyc-dev am: 1427bb3dc0
...
am: 955de27827
2016-06-23 21:07:50 +00:00
Jason Monk
9981d94d54
Merge \"QS: Hacks to fix bigger problems in TileService binding\" into nyc-dev
...
am: 1427bb3dc0
2016-06-23 21:02:13 +00:00
Jason Monk
955de27827
Merge \"QS: Hacks to fix bigger problems in TileService binding\" into nyc-dev
...
am: 1427bb3dc0
2016-06-23 21:00:19 +00:00
Jason Monk
1427bb3dc0
Merge "QS: Hacks to fix bigger problems in TileService binding" into nyc-dev
2016-06-23 20:52:50 +00:00
Min Yun
175559a28b
Fix guts are not bound properly.
...
When binding importance to guts, applying findViewById
to ExpandableNotificationRow of group's parents could
cause to return the reference of child notications's guts
which also has the same id. As a result guts are
not bound properly, and show weird guts.
Fixes: 29452827
Change-Id: Iaf8ee74b988bf41680857e9c3c3ae9e3bd8e4e1b
2016-06-23 19:53:11 +00:00
Adrian Roos
07215350f9
HUN: Close RemoteInputView when Home is pressed
...
CLOSE_SYSTEM_DIALOGS usually dismisses the notification shade,
but that's not the case for HUNs because the shade is not actually
open. However, CLOSE_SYSTEM_DIALOGS will now close the Direct Reply
even with HUNs.
Change-Id: If8e5115e33f93db0f8b4e442331ea3d60fc0c63d
Fixes: 29583313
2016-06-23 12:51:38 -07:00
Jason Monk
005afe54c5
Merge \\"QS: Fix hotspot refreshing state\\" into nyc-dev am: b3ad74eb46
...
am: 05943a3247
2016-06-23 19:47:07 +00:00
Jason Monk
05943a3247
Merge \"QS: Fix hotspot refreshing state\" into nyc-dev
...
am: b3ad74eb46
2016-06-23 19:41:53 +00:00
Jason Monk
d69553b564
Merge \"QS: Fix hotspot refreshing state\" into nyc-dev
...
am: b3ad74eb46
2016-06-23 19:41:43 +00:00
Jason Monk
6edbefdd54
QS: Hacks to fix bigger problems in TileService binding
...
Bug: 29121793
Change-Id: I9cb8d8ee36ce5cc77ba3c11decb1b3a797fd7999
2016-06-23 14:59:22 -04:00
Ajay Nambi
bf9a513888
Merge \"Add support for LTE CarrierAgregation\" into nyc-mr1-dev
...
am: 37a56b2891
2016-06-23 18:53:08 +00:00
Andrew Sapperstein
1629a9de43
Merge \"Fix crash when tapping on cell icon in QS.\" into nyc-mr1-dev
...
am: a9db1aa382
2016-06-23 18:52:40 +00:00
Robert Greenwalt
37a56b2891
Merge "Add support for LTE CarrierAgregation" into nyc-mr1-dev
2016-06-23 18:47:40 +00:00
Andrew Sapperstein
d861ae9847
Merge \"Add colorSecondary theme attribute.\" into nyc-mr1-dev
...
am: ddb980de05
2016-06-23 18:44:57 +00:00
TreeHugger Robot
a9db1aa382
Merge "Fix crash when tapping on cell icon in QS." into nyc-mr1-dev
2016-06-23 18:43:43 +00:00
Andrew Sapperstein
ddb980de05
Merge "Add colorSecondary theme attribute." into nyc-mr1-dev
2016-06-23 18:37:42 +00:00
Ajay Nambi
7965fa41c3
Add support for LTE CarrierAgregation
...
Note this may be redesigned in O to better handle the
various bitrate/channel combinations in a sane way.
bug:27360321
Change-Id: If6ffbd02e3a7f170cc041747e32bb624234c3e09
2016-06-23 11:19:03 -07:00
Fyodor Kupolov
0b77ef9f51
Print names of observers causing timeout
...
Pass and store name in registerUserSwitchObserver and later print names of
observers causing timeout.
Bug: 29039588
Change-Id: I09c4bcc986168a07f5e20ad0f38667b783332288
2016-06-23 11:07:56 -07:00
Jason Monk
94f682edd0
QS: Fix hotspot refreshing state
...
Change-Id: I40e693d154d5481959f63d555191d2c88f3d1b97
Fixes: 29518006
2016-06-23 13:23:01 -04:00
Andrew Sapperstein
00ff604aa7
Fix crash when tapping on cell icon in QS.
...
During a refactoring, accidentally tried to use a color int
as a color resource int.
Change-Id: I4a96ffea9a997ad3cf19029b1101a283b7e88459
FIXES: 29575154
2016-06-23 10:09:27 -07:00
Daniel Nishi
2c0f1a8773
Merge \"On phones, don\'t show the avatar icon when it is the only user.\" into nyc-mr1-dev
...
am: 9ee8f8066c
2016-06-23 16:23:45 +00:00
Daniel Nishi
9ee8f8066c
Merge "On phones, don't show the avatar icon when it is the only user." into nyc-mr1-dev
2016-06-23 16:15:41 +00:00
Jim Miller
0a7efa1e47
Merge \"Enable fingerprint sensor navigation to invoke QuickSettings - rename \"FP_NAV\" to more generic \"SYSTEM_NAVIGATION\"\" into nyc-mr1-dev
...
am: 0520091641
2016-06-23 00:20:57 +00:00
Jim Miller
07e0384a4e
Enable fingerprint sensor navigation to invoke QuickSettings
...
- rename "FP_NAV" to more generic "SYSTEM_NAVIGATION"
Fixes bug 28869612
Change-Id: I321240ee54506633d63a29e987b8d8638c652391
2016-06-22 15:18:13 -07:00
Daniel Nishi
8ba446c9ba
On phones, don't show the avatar icon when it is the only user.
...
The keyguard user switcher isn't enabled for layouts under 600dp width.
For these thinner devices, we don't show the multi-user switch view when
there is only one user.
In order to update this visibility when user changes occur, we
re-calculate the visibilities when the keyguard status bar view is
made visible again.
Bug: 28795981
Change-Id: I980a4c400adc1d9a6c0ce3465854284997e86596
2016-06-22 14:36:54 -07:00
Mady Mellor
18f4e81a6a
Merge \\"Don\\'t show the shade background for heads up notifications\\" into nyc-dev am: 6b6bf9cd54
...
am: f56bcc7925
2016-06-22 17:10:40 +00:00
Jason Monk
8f21a99bfa
Merge \\"QS Tiles: Fix some problems with connecting through intent\\" into nyc-dev am: 126088536d
...
am: a5076ef7fa
2016-06-22 17:10:34 +00:00
Mady Mellor
f56bcc7925
Merge \"Don\'t show the shade background for heads up notifications\" into nyc-dev
...
am: 6b6bf9cd54
2016-06-22 16:54:08 +00:00
Jason Monk
a5076ef7fa
Merge \"QS Tiles: Fix some problems with connecting through intent\" into nyc-dev
...
am: 126088536d
2016-06-22 16:54:06 +00:00
Mady Mellor
4e39e9b159
Merge \"Don\'t show the shade background for heads up notifications\" into nyc-dev
...
am: 6b6bf9cd54
2016-06-22 16:54:02 +00:00
Jason Monk
d8aa42f3e2
Merge \"QS Tiles: Fix some problems with connecting through intent\" into nyc-dev
...
am: 126088536d
2016-06-22 16:53:58 +00:00
Mady Mellor
6b6bf9cd54
Merge "Don't show the shade background for heads up notifications" into nyc-dev
2016-06-22 16:49:42 +00:00
TreeHugger Robot
126088536d
Merge "QS Tiles: Fix some problems with connecting through intent" into nyc-dev
2016-06-22 16:47:33 +00:00
Jason Monk
4342d0bf82
Merge \\"QS: Fix default icon handling for services\\" into nyc-dev am: 94a20367b5
...
am: 726aee885a
2016-06-22 15:57:56 +00:00
Sid Soundararajan
0d33cd26ac
Merge \\"Blacklist ATV Remote Service to never appear on Recents\\" into nyc-dev am: 8f41c074c7
...
am: 542762f99d
2016-06-22 15:57:52 +00:00
Jason Monk
726aee885a
Merge \"QS: Fix default icon handling for services\" into nyc-dev
...
am: 94a20367b5
2016-06-22 15:44:07 +00:00
Jason Monk
be7b7690e5
Merge \"QS: Fix default icon handling for services\" into nyc-dev
...
am: 94a20367b5
2016-06-22 15:44:06 +00:00
Sid Soundararajan
542762f99d
Merge \"Blacklist ATV Remote Service to never appear on Recents\" into nyc-dev
...
am: 8f41c074c7
2016-06-22 15:44:04 +00:00
Sid Soundararajan
295322d954
Merge \"Blacklist ATV Remote Service to never appear on Recents\" into nyc-dev
...
am: 8f41c074c7
2016-06-22 15:44:02 +00:00
Jason Monk
94a20367b5
Merge "QS: Fix default icon handling for services" into nyc-dev
2016-06-22 15:39:32 +00:00
