Commit Graph

25523 Commits

Author SHA1 Message Date
Fyodor Kupolov
7aa11e4a06 Merge "Use the right userId when setting restrictions" into nyc-dev
am: 39b900bd0c

* commit '39b900bd0c0b5752deab1ae87c82bf97e807c00d':
  Use the right userId when setting restrictions
2016-03-04 02:30:57 +00:00
Fyodor Kupolov
39b900bd0c Merge "Use the right userId when setting restrictions" into nyc-dev 2016-03-04 02:20:49 +00:00
Fyodor Kupolov
779e47a5eb Use the right userId when setting restrictions
Bug: 27457164
Change-Id: I9528b637cb0bc3f737458e078725f73666bd0d7d
2016-03-03 18:14:50 -08:00
Adrian Roos
4671784cd0 Merge "Add remote input setting to redaction interstitial" into nyc-dev
am: a792664794

* commit 'a792664794df256385a4eafafa0c5991d6823887':
  Add remote input setting to redaction interstitial
2016-03-03 22:00:13 +00:00
Anna Galusza
60c20f3e40 Send Accessibility Events when Fragments change. Bug: 27326723
am: 5db0a10344

* commit '5db0a10344d1238b534c39dffe3b682f550625f3':
  Send Accessibility Events when Fragments change. Bug: 27326723
2016-03-03 21:59:59 +00:00
Adrian Roos
b5ea88236d Merge "Fix NotificationLockscreenPreference" into nyc-dev
am: e37d209029

* commit 'e37d20902909b5fb6a11e743cc4c5b3cf630aa24':
  Fix NotificationLockscreenPreference
2016-03-03 21:59:44 +00:00
Adrian Roos
a792664794 Merge "Add remote input setting to redaction interstitial" into nyc-dev 2016-03-03 21:43:59 +00:00
Anna Galusza
5db0a10344 Send Accessibility Events when Fragments change.
Bug: 27326723

Change-Id: Ia7684f7e27cdb69ad8302c9d5c37ccae6333fc92
2016-03-03 13:00:25 -08:00
Adrian Roos
e37d209029 Merge "Fix NotificationLockscreenPreference" into nyc-dev 2016-03-03 20:48:36 +00:00
Anna Galusza
b29f659c15 Merge "Change nav bar style. Bug: 27226956" into nyc-dev
am: 9566ceb122

* commit '9566ceb12233c5e9ce156ecba3715a45e9fd5301':
  Change nav bar style. Bug: 27226956
2016-03-03 19:12:50 +00:00
Anna Galusza
9566ceb122 Merge "Change nav bar style. Bug: 27226956" into nyc-dev 2016-03-03 19:05:16 +00:00
Sudheer Shanka
8765cc78d0 Merge "Update the restricted icon usage." into nyc-dev
am: ca069a91c4

* commit 'ca069a91c4d153ad06df1a5c515e881588054d12':
  Update the restricted icon usage.
2016-03-03 18:36:51 +00:00
Sudheer Shanka
1d2b69a3c4 Merge "Update custom widget layouts to have a restricted icon." into nyc-dev
am: a714a7346d

* commit 'a714a7346d7e7f8a2686dbb164d08ca4c413a721':
  Update custom widget layouts to have a restricted icon.
2016-03-03 18:32:18 +00:00
Sudheer Shanka
ca069a91c4 Merge "Update the restricted icon usage." into nyc-dev 2016-03-03 18:31:50 +00:00
Sudheer Shanka
a714a7346d Merge "Update custom widget layouts to have a restricted icon." into nyc-dev 2016-03-03 18:26:44 +00:00
Julia Reynolds
8df99d5440 Merge "Notification filter changes." into nyc-dev
am: cc52409625

* commit 'cc5240962546545969dcf72e2ae4cb68df937642':
  Notification filter changes.
2016-03-03 16:47:46 +00:00
Julia Reynolds
cc52409625 Merge "Notification filter changes." into nyc-dev 2016-03-03 16:43:58 +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
bcbb33254c Fix notification setting summary
am: a2d47fcf59

* commit 'a2d47fcf59f03d091edaf5895fd3b651e1f499e1':
  Fix notification setting summary
2016-03-03 16:12:01 +00:00
Julia Reynolds
beb5e5210b Notification filter changes.
Bug: 27403688
Change-Id: I560ab6fc4a46673c0be4244b24f90e7c937b0006
2016-03-03 11:06:36 -05:00
Jason Monk
a2d47fcf59 Fix notification setting summary
Bug: 25926406
Change-Id: I503f2d2def095e37f6b16ca345112fe81ef73e29
2016-03-03 10:49:44 -05:00
Sudheer Shanka
729a237cd9 Update the restricted icon usage.
Bug: 25603665
Bug: 27263775
Change-Id: I72b824d01b462fa5f9f8c15eaaf0108441560f65
2016-03-02 19:09:00 -08:00
Adrian Roos
6f4edf822f Add remote input setting to redaction interstitial
Bug: 26440855
Change-Id: I8cd16074c63778defab767096261bcc99956b8fc
2016-03-02 15:37:52 -08: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
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
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
Adrian Roos
20f53b7cbb Fix NotificationLockscreenPreference
Show remote input on lockscreen checkbox
when showing all notification content.

Bug: 26440855
Change-Id: I90475d4c39797858b2dc8cdefab5bca6bb63daef
2016-03-02 11:55:49 -08: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
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
Sudheer Shanka
a59635100f Update custom widget layouts to have a restricted icon.
Bug: 25603665
Bug: 27263775
Change-Id: Ic80377229de977b6f7c5f653974e8f926fb8ac1d
2016-03-01 17:28:57 -08:00
Noah Wang
984c073454 Remove spammy debug logging from MessageBubbleBackground.
Bug: 27363534
Change-Id: If8ff8bf0540f4e031a9092026adce8296ef4b6e1
2016-03-01 15:53:30 -08:00
Anna Galusza
ec7b6a4e98 Change nav bar style.
Bug: 27226956

Change-Id: I16e2234e44bf1d22f8b41de9d28c35226152d0ee
2016-03-01 15:36:47 -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