Julia Reynolds
0bba767396
Merge "Allow notifications be to hidden from the lockscreen by app." into nyc-dev am: 5b513faa31
...
am: 6c8e0a0be9
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
2016-03-02 21:35:17 +00:00
Julia Reynolds
6c8e0a0be9
Merge "Allow notifications be to hidden from the lockscreen by app." into nyc-dev
...
am: 5b513faa31
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
2016-03-02 20:38:58 +00:00
Clara Bayarri
4285fae9bf
Merge "Fix crash in ConfigureNotificationSettings" into nyc-dev am: 4ad57ab159
...
am: 58552b1034
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
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
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
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
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
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
2016-03-02 04:55:42 +00:00
Clara Bayarri
1d24d930d2
Merge "Add Work Challenge Notifications Setting" into nyc-dev am: fe3ac82dde
...
am: dd7efce298
2016-03-02 04:54:18 +00:00
Jason Monk
642d44d1c3
Merge "Wifi p2p fix?" into nyc-dev am: 770cb0069e
...
am: 208523d342
2016-03-02 04:52:57 +00:00
Clara Bayarri
c17fdaca54
Merge "Fixes for Work Challenge Fingerprint" into nyc-dev am: 2753f88723
...
am: b888d3c9ae
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
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
2016-03-01 23:30:39 +00:00
Clara Bayarri
dd7efce298
Merge "Add Work Challenge Notifications Setting" into nyc-dev
...
am: fe3ac82dde
2016-03-01 23:30:18 +00:00
Jason Monk
208523d342
Merge "Wifi p2p fix?" into nyc-dev
...
am: 770cb0069e
2016-03-01 23:29:58 +00:00
Clara Bayarri
b888d3c9ae
Merge "Fixes for Work Challenge Fingerprint" into nyc-dev
...
am: 2753f88723
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
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
2016-03-01 16:23:27 +00:00
Dan Sandler
0f13792953
Merge "Fix CharSequence nonsense in NotificationStation." into nyc-dev
...
am: c9a8abb538
2016-03-01 16:20:41 +00:00
Daniel Sandler
c9a8abb538
Merge "Fix CharSequence nonsense in NotificationStation." into nyc-dev
2016-03-01 16:19:25 +00:00
Jason Monk
a96c872f67
Merge "Data saver fixes" into nyc-dev am: 542f5d3e67
...
am: 02b652eba9
2016-03-01 16:01:02 +00:00
Jason Monk
02b652eba9
Merge "Data saver fixes" into nyc-dev
...
am: 542f5d3e67
2016-03-01 15:58:20 +00:00
Jason Monk
542f5d3e67
Merge "Data saver fixes" into nyc-dev
2016-03-01 15:55:11 +00:00
Jason Monk
a8b0366a02
Data saver fixes
...
- Correct summary for number of apps with unrestricted
- Show system option on unrestricted access page
- general betterness
Bug: 26796370
Bug: 27378294
Bug: 27122309
Change-Id: Ia57b56a25175182cb1a5a1231c20dc3c71cc3427
2016-03-01 10:44:16 -05:00
Julia Reynolds
fe9c0ebcb1
Hide notification asst setting. am: 602e133e79
...
am: b755b16598
2016-03-01 15:40:31 +00:00
Julia Reynolds
b755b16598
Hide notification asst setting.
...
am: 602e133e79
2016-03-01 15:38:45 +00:00
Julia Reynolds
602e133e79
Hide notification asst setting.
...
Bug: 22960980
Change-Id: If9f28e3944d6a3a450d2607448be9ec25fdcdb85
2016-03-01 10:20:36 -05:00
Julia Reynolds
3adcc09b06
Merge "Api review: AutomaticZenRule" into nyc-dev am: a20dff1ebf
...
am: fb366d9f34
2016-03-01 15:12:09 +00:00
Julia Reynolds
fb366d9f34
Merge "Api review: AutomaticZenRule" into nyc-dev
...
am: a20dff1ebf
2016-03-01 15:08:55 +00:00
