Commit Graph

25672 Commits

Author SHA1 Message Date
Jason Monk
3dfc3e340f Fix home search am: 9ee80cd148
am: edefa00b1d

* commit 'edefa00b1dfc2ddc72f7001fc49b08f899f00f59':
  Fix home search
2016-03-03 16:29:54 +00:00
Jason Monk
edefa00b1d Fix home search
am: 9ee80cd148

* commit '9ee80cd14806f48163c387f695a2bebd56daadff':
  Fix home search
2016-03-03 16:27:46 +00:00
Jason Monk
9ee80cd148 Fix home search
- Remove old home from search
 - Fix weird threading problem on new home search indexing

Bug: 27249674
Change-Id: I3cfdde7dd3595f5161b5f8c861041c40e800c7bd
2016-03-03 11:21:42 -05:00
Jason Monk
0610993b60 Fix notification setting summary am: a2d47fcf59
am: bcbb33254c

* commit 'bcbb33254c1c8e333c2603f26d84dccb14162d4f':
  Fix notification setting summary
2016-03-03 16:13:46 +00:00
Jason Monk
bcbb33254c Fix notification setting summary
am: a2d47fcf59

* commit 'a2d47fcf59f03d091edaf5895fd3b651e1f499e1':
  Fix notification setting summary
2016-03-03 16:12:01 +00:00
Jason Monk
a2d47fcf59 Fix notification setting summary
Bug: 25926406
Change-Id: I503f2d2def095e37f6b16ca345112fe81ef73e29
2016-03-03 10:49:44 -05:00
Jason Monk
a4a2f2a1df Merge "Actually listen to data saver state" into nyc-dev am: c96fac5cf4
am: 1916ed444d

* commit '1916ed444d64aa5360c80180e7a80818854b4666':
  Actually listen to data saver state
2016-03-02 22:53:19 +00:00
Jason Monk
1916ed444d Merge "Actually listen to data saver state" into nyc-dev
am: c96fac5cf4

* commit 'c96fac5cf47b1dd9b98b5f56290d1fd9bc5d1a06':
  Actually listen to data saver state
2016-03-02 21:48:37 +00:00
Julia Reynolds
0bba767396 Merge "Allow notifications be to hidden from the lockscreen by app." into nyc-dev am: 5b513faa31
am: 6c8e0a0be9

* commit '6c8e0a0be95e27cde6c047cdff02a61be1c4263e':
  Allow notifications be to hidden from the lockscreen by app.
2016-03-02 21:35:39 +00:00
Jason Monk
7109b7c7ae Merge "SummaryLoader: Make sure all messages are proccessed on release" into nyc-dev am: 225cc0f910
am: f3beb74177

* commit 'f3beb74177f0cf8d0f3475c894930c4c78bf6fcc':
  SummaryLoader: Make sure all messages are proccessed on release
2016-03-02 21:35:17 +00:00
Jason Monk
c96fac5cf4 Merge "Actually listen to data saver state" into nyc-dev 2016-03-02 20:45:46 +00:00
Jason Monk
1636fedebe Actually listen to data saver state
Bug: 27445032
Change-Id: Idb9646af9cd82e19b3d4a6add52d349be8015caa
2016-03-02 15:42:36 -05:00
Julia Reynolds
6c8e0a0be9 Merge "Allow notifications be to hidden from the lockscreen by app." into nyc-dev
am: 5b513faa31

* commit '5b513faa316400d9ea3b6f85ebc8ac0aadb41b29':
  Allow notifications be to hidden from the lockscreen by app.
2016-03-02 20:39:11 +00:00
Jason Monk
f3beb74177 Merge "SummaryLoader: Make sure all messages are proccessed on release" into nyc-dev
am: 225cc0f910

* commit '225cc0f91087c9a4081a44714a5cbde9031b58a1':
  SummaryLoader: Make sure all messages are proccessed on release
2016-03-02 20:38:58 +00:00
Clara Bayarri
4285fae9bf Merge "Fix crash in ConfigureNotificationSettings" into nyc-dev am: 4ad57ab159
am: 58552b1034

* commit '58552b10348f4815a48419a624f63d8d7853e83a':
  Fix crash in ConfigureNotificationSettings
2016-03-02 20:18:21 +00:00
Noah Wang
e480371ffc Merge "Remove spammy debug logging from MessageBubbleBackground." into nyc-dev am: d53c483e61
am: c5a62b4c54

* commit 'c5a62b4c54d2d6bbfc5dc29bd88c42195ae71d39':
  Remove spammy debug logging from MessageBubbleBackground.
2016-03-02 20:17:44 +00:00
Julia Reynolds
5b513faa31 Merge "Allow notifications be to hidden from the lockscreen by app." into nyc-dev 2016-03-02 20:16:07 +00:00
Jason Monk
225cc0f910 Merge "SummaryLoader: Make sure all messages are proccessed on release" into nyc-dev 2016-03-02 20:12:11 +00:00
Jason Monk
816959889e SummaryLoader: Make sure all messages are proccessed on release
Otherwise the receivers don't get unregistered, which causes a warning,
immediately followed by them actually getting unregistered, which
causes a crash.

Bug: 26027137
Change-Id: Ib55edb4490de960d10036c35d98b8a8e31e13ae1
2016-03-02 15:08:41 -05:00
Clara Bayarri
58552b1034 Merge "Fix crash in ConfigureNotificationSettings" into nyc-dev
am: 4ad57ab159

* commit '4ad57ab15915526908a32e6b2747d05c5dc2cb10':
  Fix crash in ConfigureNotificationSettings
2016-03-02 19:44:25 +00:00
Clara Bayarri
4ad57ab159 Merge "Fix crash in ConfigureNotificationSettings" into nyc-dev 2016-03-02 19:36:17 +00:00
Julia Reynolds
60e90ac07c Allow notifications be to hidden from the lockscreen by app.
Bug: 26642033
Change-Id: I932defebe00c566c0a930a0cabc118238c349272
2016-03-02 14:20:57 -05:00
Noah Wang
c5a62b4c54 Merge "Remove spammy debug logging from MessageBubbleBackground." into nyc-dev
am: d53c483e61

* commit 'd53c483e61c54977fa9150bb4f2b080172bfe575':
  Remove spammy debug logging from MessageBubbleBackground.
2016-03-02 18:37:31 +00:00
Noah Wang
d53c483e61 Merge "Remove spammy debug logging from MessageBubbleBackground." into nyc-dev 2016-03-02 18:30:20 +00:00
Geoff Mendal
7c37b0c6e2 Import translations. DO NOT MERGE am: 5601cd43e8 -s ours
am: 74341dd8e8  -s ours

* commit '74341dd8e8c864cbde0dfe4648b25e0b056b1709':
  Import translations. DO NOT MERGE
2016-03-02 17:22:35 +00:00
Clara Bayarri
bb91a99a80 Fix crash in ConfigureNotificationSettings
Bug: 27445698
Change-Id: I1d0f99731b0b5abe1b34c7dfab4daeecf236e889
2016-03-02 09:21:41 -08:00
Geoff Mendal
74341dd8e8 Import translations. DO NOT MERGE
am: 5601cd43e8  -s ours

* commit '5601cd43e8a8daf9147682fc15e0e1921d715d2c':
  Import translations. DO NOT MERGE
2016-03-02 16:55:48 +00:00
Geoff Mendal
5601cd43e8 Import translations. DO NOT MERGE
Change-Id: I7fc9058af79321a65e11880ace9e808312799994
Auto-generated-cl: translation import
2016-03-02 07:37:57 -08:00
Geoff Mendal
2243bab839 Import translations. DO NOT MERGE
Change-Id: I70b3a73e267745f30b39b99f8628f1e26a4dc6c0
Auto-generated-cl: translation import
2016-03-02 06:33:19 -08:00
Fyodor Kupolov
8129f02e6a Merge "Do not allow removing current user if it\'s in a call" into nyc-dev am: 664f94e07b
am: 4aa47a6426

* commit '4aa47a6426def58692e323df2d295edbafe53829':
  Do not allow removing current user if it's in a call
2016-03-02 04:55:42 +00:00
Clara Bayarri
1d24d930d2 Merge "Add Work Challenge Notifications Setting" into nyc-dev am: fe3ac82dde
am: dd7efce298

* commit 'dd7efce298544f3b48939554dbb819030193de94':
  Add Work Challenge Notifications Setting
2016-03-02 04:54:18 +00:00
Jason Monk
642d44d1c3 Merge "Wifi p2p fix?" into nyc-dev am: 770cb0069e
am: 208523d342

* commit '208523d3427158b9b1812591a087e817c89826bc':
  Wifi p2p fix?
2016-03-02 04:52:57 +00:00
Clara Bayarri
c17fdaca54 Merge "Fixes for Work Challenge Fingerprint" into nyc-dev am: 2753f88723
am: b888d3c9ae

* commit 'b888d3c9ae2cad1ed17b412eaf6f1ec9f7efc5fd':
  Fixes for Work Challenge Fingerprint
2016-03-02 04:51:30 +00:00
Clara Bayarri
8de9c36b84 Merge "When un-unifying the personal and work locks, launch lock setup" into nyc-dev am: 00fb7a5598
am: b78f20354e

* commit 'b78f20354ef22f949b145e9213dc2490a97b0857':
  When un-unifying the personal and work locks, launch lock setup
2016-03-02 04:50:12 +00:00
Noah Wang
984c073454 Remove spammy debug logging from MessageBubbleBackground.
Bug: 27363534
Change-Id: If8ff8bf0540f4e031a9092026adce8296ef4b6e1
2016-03-01 15:53:30 -08:00
Fyodor Kupolov
4aa47a6426 Merge "Do not allow removing current user if it\'s in a call" into nyc-dev
am: 664f94e07b

* commit '664f94e07bf5a91f5d4da29af5948a7e247779bd':
  Do not allow removing current user if it's in a call
2016-03-01 23:30:39 +00:00
Clara Bayarri
dd7efce298 Merge "Add Work Challenge Notifications Setting" into nyc-dev
am: fe3ac82dde

* commit 'fe3ac82dde461cac7e3cd6f76474639bf368b647':
  Add Work Challenge Notifications Setting
2016-03-01 23:30:18 +00:00
Jason Monk
208523d342 Merge "Wifi p2p fix?" into nyc-dev
am: 770cb0069e

* commit '770cb0069e2fd1a8a556c8df495fd5b1b7d0236b':
  Wifi p2p fix?
2016-03-01 23:29:58 +00:00
Clara Bayarri
b888d3c9ae Merge "Fixes for Work Challenge Fingerprint" into nyc-dev
am: 2753f88723

* commit '2753f88723bc9213c4df9763dddc27609c54e181':
  Fixes for Work Challenge Fingerprint
2016-03-01 23:29:41 +00:00
Clara Bayarri
b78f20354e Merge "When un-unifying the personal and work locks, launch lock setup" into nyc-dev
am: 00fb7a5598

* commit '00fb7a559815f73f15f8e1ddd697f6ceca5ade1b':
  When un-unifying the personal and work locks, launch lock setup
2016-03-01 23:29:24 +00:00
Fyodor Kupolov
664f94e07b Merge "Do not allow removing current user if it's in a call" into nyc-dev 2016-03-01 23:21:27 +00:00
Clara Bayarri
fe3ac82dde Merge "Add Work Challenge Notifications Setting" into nyc-dev 2016-03-01 23:11:59 +00:00
Jason Monk
770cb0069e Merge "Wifi p2p fix?" into nyc-dev 2016-03-01 20:43:58 +00:00
Jason Monk
6af0b9db4c Wifi p2p fix?
Bug: 27431029
Change-Id: Ic9661dbb75d633d4b6e778cde796785aa33c04e0
2016-03-01 15:27:38 -05:00
Clara Bayarri
2753f88723 Merge "Fixes for Work Challenge Fingerprint" into nyc-dev 2016-03-01 18:22:55 +00:00
Clara Bayarri
462cce1a4c Add Work Challenge Notifications Setting
Bug: 26844582
Change-Id: Ib1eb28cfebcc0c8d23ec8669f2777ccb822d7bf3
2016-03-01 10:22:05 -08:00
Clara Bayarri
eb8962d273 Fixes for Work Challenge Fingerprint
When enrolling fingerprints on both personal and work and then setting
the lock to none or swipe, the fingerprints for that user were not being
correctly removed due to wrong userIds being passed in.

Also fix the wipe dialog message as it was always querying whether the
main user has fingerprints instead of the user the dialog applies to.

Bug: 27263452, 27199237
Change-Id: I8d170e36f31b5595bc0bb41168a87db9f57eda2f
2016-03-01 10:22:05 -08:00
Clara Bayarri
00fb7a5598 Merge "When un-unifying the personal and work locks, launch lock setup" into nyc-dev 2016-03-01 18:07:41 +00:00
Dan Sandler
29e6a81605 Merge "Fix CharSequence nonsense in NotificationStation." into nyc-dev am: c9a8abb538
am: 0f13792953

* commit '0f13792953dd361ffb3ef563d073b8d62d544755':
  Fix CharSequence nonsense in NotificationStation.
2016-03-01 16:23:27 +00:00
Dan Sandler
0f13792953 Merge "Fix CharSequence nonsense in NotificationStation." into nyc-dev
am: c9a8abb538

* commit 'c9a8abb5382fdda41876b25dd6ed0ebfb58dc0b2':
  Fix CharSequence nonsense in NotificationStation.
2016-03-01 16:20:41 +00:00