OSDN Git Service
Adrian Roos [Mon, 7 Mar 2016 21:40:29 +0000 (21:40 +0000)]
Merge "Fix SUW redaction interstitial crash" into nyc-dev
am:
bd705413ba
* commit '
bd705413babe94c3382598217757d4b95d2dcc6a':
Fix SUW redaction interstitial crash
Ido Ofir [Mon, 7 Mar 2016 21:40:13 +0000 (21:40 +0000)]
Merge "mark categories as complete when disabled." into nyc-dev
am:
b46cad2cb7
* commit '
b46cad2cb7dfdb283ac8c118723c8bc4f2c4633c':
mark categories as complete when disabled.
Adrian Roos [Mon, 7 Mar 2016 20:50:05 +0000 (20:50 +0000)]
Merge "Fix SUW redaction interstitial crash" into nyc-dev
Adrian Roos [Mon, 7 Mar 2016 19:14:16 +0000 (11:14 -0800)]
Fix SUW redaction interstitial crash
Bug:
27518157
Change-Id: Id0c2eae88db41080e35200ee8f94ee74ea0a9a1f
Ido Ofir [Mon, 7 Mar 2016 20:05:24 +0000 (20:05 +0000)]
Merge "mark categories as complete when disabled." into nyc-dev
Philip P. Moltmann [Mon, 7 Mar 2016 19:17:31 +0000 (19:17 +0000)]
Make Print Settings use the new PrintManager.getPrintServices loader
am:
d9779db8c9
* commit '
d9779db8c966347734c5791cf63b7dc2e466a0f4':
Make Print Settings use the new PrintManager.getPrintServices loader
Philip P. Moltmann [Wed, 24 Feb 2016 20:11:05 +0000 (12:11 -0800)]
Make Print Settings use the new PrintManager.getPrintServices loader
This makes sure that all data always stays up to date.
printer_dropdown_item.xml:
- Reduce the amount of overriden properties
PrintServiceSettingsFragment:
- Instead receiving most data from PrintSettingsFragment have own loader
and keep data up to date
- Also the updating of the print service state now has a dedicated
PrintManager call instead of relying of the Settings-ContentObserver
to transport this information. No more race-conditions, whohoo!
DynamicIndexableContentMonitor:
- To not rewrite too much code the update logic has to live here but the
reading of the actual data is in PrintSettingsFragment.
Change-Id: I60715cda8952565d7f68cb24fb7da61a37085887
Oleksandr Peletskyi [Mon, 7 Mar 2016 16:56:36 +0000 (16:56 +0000)]
Merge "Block "Screen lock" menu if password is managed." into nyc-dev
am:
52fdd6a058
* commit '
52fdd6a058808b5d71a8e7cbdc80c7460c459304':
Block "Screen lock" menu if password is managed.
Geoff Mendal [Mon, 7 Mar 2016 16:56:19 +0000 (16:56 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
c654adf99c -s ours
* commit '
c654adf99cdac74beccb657dfb0f132adc6088a3':
Import translations. DO NOT MERGE
Jason Monk [Mon, 7 Mar 2016 16:55:59 +0000 (16:55 +0000)]
Fix add network alignment
am:
ebfbe5cfe6
* commit '
ebfbe5cfe64c0ac46a6812652c9139e674fc3056':
Fix add network alignment
Jason Monk [Mon, 7 Mar 2016 16:55:40 +0000 (16:55 +0000)]
Fix missing bluetooth settings items
am:
15036eea99
* commit '
15036eea997f645651c5cce0059bf96fb176f016':
Fix missing bluetooth settings items
Oleksandr Peletskyi [Mon, 7 Mar 2016 16:43:38 +0000 (16:43 +0000)]
Merge "Block "Screen lock" menu if password is managed." into nyc-dev
Geoff Mendal [Mon, 7 Mar 2016 15:39:40 +0000 (15:39 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 7 Mar 2016 15:37:10 +0000 (07:37 -0800)]
Import translations. DO NOT MERGE
Change-Id: I066af915c57a99077bb8c2eba2193707154f0b90
Auto-generated-cl: translation import
Jason Monk [Mon, 7 Mar 2016 15:19:47 +0000 (10:19 -0500)]
Fix add network alignment
Bug:
26759951
Change-Id: I5ba657b5a4099d9f2f1ecf2f27a6a25908bc4a86
Jason Monk [Mon, 7 Mar 2016 15:02:35 +0000 (10:02 -0500)]
Fix missing bluetooth settings items
In the off/turning on state all items were being removed, but never
re-added to the preference screen.
Bug:
27347029
Change-Id: I8f47ee79f428fc8555a0dc6574244c81aa85c6c8
Clara Bayarri [Sat, 5 Mar 2016 02:07:57 +0000 (02:07 +0000)]
Merge "Fix issue with unlock attempts for the Work Challenge" into nyc-dev
am:
04af275b6e
* commit '
04af275b6e4ab3eb67abacac7b0569eefb2c1e72':
Fix issue with unlock attempts for the Work Challenge
Clara Bayarri [Sat, 5 Mar 2016 02:01:57 +0000 (02:01 +0000)]
Merge "Fix issue with unlock attempts for the Work Challenge" into nyc-dev
Clara Bayarri [Sat, 5 Mar 2016 01:55:43 +0000 (17:55 -0800)]
Fix issue with unlock attempts for the Work Challenge
The failed attempts to unlock were not being reported due to a small
bug.
Bug:
26677759
Change-Id: Ie03593ba38ba118e1c030135037e15400e7af8a2
Sudheer Shanka [Fri, 4 Mar 2016 22:30:41 +0000 (22:30 +0000)]
Merge "Avoid checking the restricted items in the list." into nyc-dev
am:
6e2b469651
* commit '
6e2b469651da700114014e6987cd307a3daddaa1':
Avoid checking the restricted items in the list.
Sudheer Shanka [Fri, 4 Mar 2016 22:27:44 +0000 (22:27 +0000)]
Merge "Avoid checking the restricted items in the list." into nyc-dev
Sudheer Shanka [Fri, 4 Mar 2016 21:53:24 +0000 (13:53 -0800)]
Avoid checking the restricted items in the list.
Since we are not auto-closing the dialog any more, need to
make sure the restricted item in not checked when selected by user.
Change-Id: I7c02844d3071ae62222cdbdbda96780bd5d922de
Udam Saini [Fri, 4 Mar 2016 19:32:30 +0000 (19:32 +0000)]
Merge "Use the layout for calculating IME inset." into nyc-dev
am:
24711aa63e
* commit '
24711aa63e75be666cda4958ec31da60c1282801':
Use the layout for calculating IME inset.
Udam Saini [Fri, 4 Mar 2016 19:19:49 +0000 (19:19 +0000)]
Merge "Use the layout for calculating IME inset." into nyc-dev
Noah Wang [Fri, 4 Mar 2016 19:01:01 +0000 (19:01 +0000)]
Merge "Make preview pager and pager indicator screenreader-enabled" into nyc-dev
am:
f465eb3bf2
* commit '
f465eb3bf2572bf67c2b245b8342760a482361ed':
Make preview pager and pager indicator screenreader-enabled
Noah Wang [Fri, 4 Mar 2016 18:52:49 +0000 (18:52 +0000)]
Merge "Make preview pager and pager indicator screenreader-enabled" into nyc-dev
Mahaver Chopra [Fri, 4 Mar 2016 18:11:05 +0000 (18:11 +0000)]
Merge "Fix: \'Make profile pattern visible\'" into nyc-dev
am:
0f20f969b8
* commit '
0f20f969b8b231f8d376b87e4484013d73104084':
Fix: 'Make profile pattern visible'
Mahaver Chopra [Fri, 4 Mar 2016 18:01:07 +0000 (18:01 +0000)]
Merge "Fix: 'Make profile pattern visible'" into nyc-dev
Mahaver Chopra [Fri, 4 Mar 2016 17:17:59 +0000 (17:17 +0000)]
Fix: 'Make profile pattern visible'
'Make profile pattern visible' turns itself back on.
Bug:
27331363
Change-Id: I0c9520c89b5f56e78fc51ac9b42320b66cc9df38
Andres Morales [Fri, 4 Mar 2016 16:27:51 +0000 (16:27 +0000)]
Merge "Use getFlashLockState API to check lock state" into nyc-dev
am:
abd0ff950b
* commit '
abd0ff950b50e4cbf133ff2a2473408c3a5077f8':
Use getFlashLockState API to check lock state
Andres Morales [Fri, 4 Mar 2016 16:23:09 +0000 (16:23 +0000)]
Merge "Use getFlashLockState API to check lock state" into nyc-dev
Julia Reynolds [Fri, 4 Mar 2016 16:04:58 +0000 (16:04 +0000)]
Remove DND & Notification access screen links.
am:
d53f90d0d1
* commit '
d53f90d0d1ac677e52e8f4b9aa8324366e7566d5':
Remove DND & Notification access screen links.
Julia Reynolds [Fri, 4 Mar 2016 14:44:34 +0000 (09:44 -0500)]
Remove DND & Notification access screen links.
These should only be available from 'special access.'
Change-Id: I9e49be9263b3e880031906345422459a5ad23d7f
Michal Karpinski [Fri, 4 Mar 2016 10:11:31 +0000 (10:11 +0000)]
Merge "New activity for handling dialogs of remote bugreports" into nyc-dev
am:
e6be2411e4
* commit '
e6be2411e427523e64026090af6bea9e2b4a103b':
New activity for handling dialogs of remote bugreports
Michal Karpinski [Fri, 4 Mar 2016 10:04:48 +0000 (10:04 +0000)]
Merge "New activity for handling dialogs of remote bugreports" into nyc-dev
Noah Wang [Fri, 4 Mar 2016 04:05:14 +0000 (20:05 -0800)]
Make preview pager and pager indicator screenreader-enabled
Bug:
27127738
Change-Id: I11a8589f4d8e1f15e895831dc3bd0cb7472e0591
Fyodor Kupolov [Fri, 4 Mar 2016 02:30:57 +0000 (02:30 +0000)]
Merge "Use the right userId when setting restrictions" into nyc-dev
am:
39b900bd0c
* commit '
39b900bd0c0b5752deab1ae87c82bf97e807c00d':
Use the right userId when setting restrictions
Fyodor Kupolov [Fri, 4 Mar 2016 02:20:48 +0000 (02:20 +0000)]
Merge "Use the right userId when setting restrictions" into nyc-dev
Fyodor Kupolov [Fri, 4 Mar 2016 02:14:50 +0000 (18:14 -0800)]
Use the right userId when setting restrictions
Bug:
27457164
Change-Id: I9528b637cb0bc3f737458e078725f73666bd0d7d
Andres Morales [Thu, 3 Mar 2016 21:17:23 +0000 (13:17 -0800)]
Use getFlashLockState API to check lock state
Bug:
26039090
Change-Id: Ia90d6ece2dcdd5ed8549044900f79c0bf4902296
Udam Saini [Mon, 22 Feb 2016 22:51:44 +0000 (14:51 -0800)]
Use the layout for calculating IME inset.
We should calculate the offset for the entire layout rather than
just the scroll view. This allows us to not special case the navigation
bar inside SystemBarHelper.setImeInsetView, as the logic before always
assumed the scroll view was passed into setImeInsetView.
bug:
27063940
Change-Id: If3f09e1e07ea584097a050b987c1ab3985b4991c
Ido Ofir [Mon, 29 Feb 2016 22:24:37 +0000 (14:24 -0800)]
mark categories as complete when disabled.
Change-Id: I0a50adf254d28653c8740ad892507db29cd9b0a8
Adrian Roos [Thu, 3 Mar 2016 22:00:13 +0000 (22:00 +0000)]
Merge "Add remote input setting to redaction interstitial" into nyc-dev
am:
a792664794
* commit '
a792664794df256385a4eafafa0c5991d6823887':
Add remote input setting to redaction interstitial
Anna Galusza [Thu, 3 Mar 2016 21:59:59 +0000 (21:59 +0000)]
Send Accessibility Events when Fragments change. Bug:
27326723
am:
5db0a10344
* commit '
5db0a10344d1238b534c39dffe3b682f550625f3':
Send Accessibility Events when Fragments change. Bug:
27326723
Adrian Roos [Thu, 3 Mar 2016 21:59:44 +0000 (21:59 +0000)]
Merge "Fix NotificationLockscreenPreference" into nyc-dev
am:
e37d209029
* commit '
e37d20902909b5fb6a11e743cc4c5b3cf630aa24':
Fix NotificationLockscreenPreference
Adrian Roos [Thu, 3 Mar 2016 21:43:59 +0000 (21:43 +0000)]
Merge "Add remote input setting to redaction interstitial" into nyc-dev
Anna Galusza [Thu, 25 Feb 2016 23:50:59 +0000 (15:50 -0800)]
Send Accessibility Events when Fragments change.
Bug:
27326723
Change-Id: Ia7684f7e27cdb69ad8302c9d5c37ccae6333fc92
Adrian Roos [Thu, 3 Mar 2016 20:48:36 +0000 (20:48 +0000)]
Merge "Fix NotificationLockscreenPreference" into nyc-dev
Anna Galusza [Thu, 3 Mar 2016 19:12:50 +0000 (19:12 +0000)]
Merge "Change nav bar style. Bug:
27226956" into nyc-dev
am:
9566ceb122
* commit '
9566ceb12233c5e9ce156ecba3715a45e9fd5301':
Change nav bar style. Bug:
27226956
Anna Galusza [Thu, 3 Mar 2016 19:05:16 +0000 (19:05 +0000)]
Merge "Change nav bar style. Bug:
27226956" into nyc-dev
Sudheer Shanka [Thu, 3 Mar 2016 18:36:51 +0000 (18:36 +0000)]
Merge "Update the restricted icon usage." into nyc-dev
am:
ca069a91c4
* commit '
ca069a91c4d153ad06df1a5c515e881588054d12':
Update the restricted icon usage.
Sudheer Shanka [Thu, 3 Mar 2016 18:32:18 +0000 (18:32 +0000)]
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.
Sudheer Shanka [Thu, 3 Mar 2016 18:31:50 +0000 (18:31 +0000)]
Merge "Update the restricted icon usage." into nyc-dev
Sudheer Shanka [Thu, 3 Mar 2016 18:26:44 +0000 (18:26 +0000)]
Merge "Update custom widget layouts to have a restricted icon." into nyc-dev
Michal Karpinski [Thu, 25 Feb 2016 17:29:43 +0000 (17:29 +0000)]
New activity for handling dialogs of remote bugreports
Presents dialogs when commanded by DPM.
Bug:
26226230
Change-Id: Ia3301592f767ac95f1c073e9401718d717f50c83
Julia Reynolds [Thu, 3 Mar 2016 16:47:46 +0000 (16:47 +0000)]
Merge "Notification filter changes." into nyc-dev
am:
cc52409625
* commit '
cc5240962546545969dcf72e2ae4cb68df937642':
Notification filter changes.
Julia Reynolds [Thu, 3 Mar 2016 16:43:58 +0000 (16:43 +0000)]
Merge "Notification filter changes." into nyc-dev
Jason Monk [Thu, 3 Mar 2016 16:27:46 +0000 (16:27 +0000)]
Jason Monk [Thu, 3 Mar 2016 16:21:42 +0000 (11:21 -0500)]
Fix home search
- Remove old home from search
- Fix weird threading problem on new home search indexing
Bug:
27249674
Change-Id: I3cfdde7dd3595f5161b5f8c861041c40e800c7bd
Jason Monk [Thu, 3 Mar 2016 16:12:01 +0000 (16:12 +0000)]
Fix notification setting summary
am:
a2d47fcf59
* commit '
a2d47fcf59f03d091edaf5895fd3b651e1f499e1':
Fix notification setting summary
Julia Reynolds [Tue, 1 Mar 2016 16:07:24 +0000 (11:07 -0500)]
Notification filter changes.
Bug:
27403688
Change-Id: I560ab6fc4a46673c0be4244b24f90e7c937b0006
Jason Monk [Thu, 3 Mar 2016 15:49:44 +0000 (10:49 -0500)]
Fix notification setting summary
Bug:
25926406
Change-Id: I503f2d2def095e37f6b16ca345112fe81ef73e29
Sudheer Shanka [Tue, 23 Feb 2016 18:28:45 +0000 (18:28 +0000)]
Update the restricted icon usage.
Bug:
25603665
Bug:
27263775
Change-Id: I72b824d01b462fa5f9f8c15eaaf0108441560f65
Adrian Roos [Wed, 2 Mar 2016 23:37:52 +0000 (15:37 -0800)]
Add remote input setting to redaction interstitial
Bug:
26440855
Change-Id: I8cd16074c63778defab767096261bcc99956b8fc
Jason Monk [Wed, 2 Mar 2016 21:48:37 +0000 (21:48 +0000)]
Merge "Actually listen to data saver state" into nyc-dev
am:
c96fac5cf4
* commit '
c96fac5cf47b1dd9b98b5f56290d1fd9bc5d1a06':
Actually listen to data saver state
Jason Monk [Wed, 2 Mar 2016 20:45:46 +0000 (20:45 +0000)]
Merge "Actually listen to data saver state" into nyc-dev
Jason Monk [Wed, 2 Mar 2016 20:42:36 +0000 (15:42 -0500)]
Actually listen to data saver state
Bug:
27445032
Change-Id: Idb9646af9cd82e19b3d4a6add52d349be8015caa
Julia Reynolds [Wed, 2 Mar 2016 20:39:11 +0000 (20:39 +0000)]
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.
Jason Monk [Wed, 2 Mar 2016 20:38:58 +0000 (20:38 +0000)]
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
Julia Reynolds [Wed, 2 Mar 2016 20:16:07 +0000 (20:16 +0000)]
Merge "Allow notifications be to hidden from the lockscreen by app." into nyc-dev
Jason Monk [Wed, 2 Mar 2016 20:12:11 +0000 (20:12 +0000)]
Merge "SummaryLoader: Make sure all messages are proccessed on release" into nyc-dev
Jason Monk [Wed, 2 Mar 2016 20:08:41 +0000 (15:08 -0500)]
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
Adrian Roos [Wed, 2 Mar 2016 19:55:45 +0000 (11:55 -0800)]
Fix NotificationLockscreenPreference
Show remote input on lockscreen checkbox
when showing all notification content.
Bug:
26440855
Change-Id: I90475d4c39797858b2dc8cdefab5bca6bb63daef
Clara Bayarri [Wed, 2 Mar 2016 19:44:25 +0000 (19:44 +0000)]
Merge "Fix crash in ConfigureNotificationSettings" into nyc-dev
am:
4ad57ab159
* commit '
4ad57ab15915526908a32e6b2747d05c5dc2cb10':
Fix crash in ConfigureNotificationSettings
Clara Bayarri [Wed, 2 Mar 2016 19:36:16 +0000 (19:36 +0000)]
Merge "Fix crash in ConfigureNotificationSettings" into nyc-dev
Julia Reynolds [Wed, 2 Mar 2016 13:54:56 +0000 (08:54 -0500)]
Allow notifications be to hidden from the lockscreen by app.
Bug:
26642033
Change-Id: I932defebe00c566c0a930a0cabc118238c349272
Noah Wang [Wed, 2 Mar 2016 18:37:31 +0000 (18:37 +0000)]
Merge "Remove spammy debug logging from MessageBubbleBackground." into nyc-dev
am:
d53c483e61
* commit '
d53c483e61c54977fa9150bb4f2b080172bfe575':
Remove spammy debug logging from MessageBubbleBackground.
Noah Wang [Wed, 2 Mar 2016 18:30:20 +0000 (18:30 +0000)]
Merge "Remove spammy debug logging from MessageBubbleBackground." into nyc-dev
Clara Bayarri [Wed, 2 Mar 2016 17:21:41 +0000 (09:21 -0800)]
Fix crash in ConfigureNotificationSettings
Bug:
27445698
Change-Id: I1d0f99731b0b5abe1b34c7dfab4daeecf236e889
Oleksandr Peletskyi [Mon, 29 Feb 2016 15:12:04 +0000 (16:12 +0100)]
Block "Screen lock" menu if password is managed.
"Screen lock" menu item is completely disabled in case, if
PASSWORD_QUALITY_MANAGED is set.
BUG:
25549437
Change-Id: I1958157946d29c013465e995af2226e061d5c726
Geoff Mendal [Wed, 2 Mar 2016 16:55:48 +0000 (16:55 +0000)]
Import translations. DO NOT MERGE
am:
5601cd43e8 -s ours
* commit '
5601cd43e8a8daf9147682fc15e0e1921d715d2c':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 2 Mar 2016 15:37:57 +0000 (07:37 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7fc9058af79321a65e11880ace9e808312799994
Auto-generated-cl: translation import
Sudheer Shanka [Tue, 23 Feb 2016 17:25:53 +0000 (17:25 +0000)]
Update custom widget layouts to have a restricted icon.
Bug:
25603665
Bug:
27263775
Change-Id: Ic80377229de977b6f7c5f653974e8f926fb8ac1d
Noah Wang [Tue, 1 Mar 2016 23:42:53 +0000 (15:42 -0800)]
Remove spammy debug logging from MessageBubbleBackground.
Bug:
27363534
Change-Id: If8ff8bf0540f4e031a9092026adce8296ef4b6e1
Anna Galusza [Sat, 27 Feb 2016 00:06:54 +0000 (16:06 -0800)]
Change nav bar style.
Bug:
27226956
Change-Id: I16e2234e44bf1d22f8b41de9d28c35226152d0ee
Fyodor Kupolov [Tue, 1 Mar 2016 23:30:39 +0000 (23:30 +0000)]
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
Clara Bayarri [Tue, 1 Mar 2016 23:30:18 +0000 (23:30 +0000)]
Merge "Add Work Challenge Notifications Setting" into nyc-dev
am:
fe3ac82dde
* commit '
fe3ac82dde461cac7e3cd6f76474639bf368b647':
Add Work Challenge Notifications Setting
Jason Monk [Tue, 1 Mar 2016 23:29:58 +0000 (23:29 +0000)]
Merge "Wifi p2p fix?" into nyc-dev
am:
770cb0069e
* commit '
770cb0069e2fd1a8a556c8df495fd5b1b7d0236b':
Wifi p2p fix?
Clara Bayarri [Tue, 1 Mar 2016 23:29:41 +0000 (23:29 +0000)]
Merge "Fixes for Work Challenge Fingerprint" into nyc-dev
am:
2753f88723
* commit '
2753f88723bc9213c4df9763dddc27609c54e181':
Fixes for Work Challenge Fingerprint
Clara Bayarri [Tue, 1 Mar 2016 23:29:24 +0000 (23:29 +0000)]
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
Fyodor Kupolov [Tue, 1 Mar 2016 23:21:26 +0000 (23:21 +0000)]
Merge "Do not allow removing current user if it's in a call" into nyc-dev
Clara Bayarri [Tue, 1 Mar 2016 23:11:59 +0000 (23:11 +0000)]
Merge "Add Work Challenge Notifications Setting" into nyc-dev
Jason Monk [Tue, 1 Mar 2016 20:43:57 +0000 (20:43 +0000)]
Merge "Wifi p2p fix?" into nyc-dev
Jason Monk [Tue, 1 Mar 2016 20:27:38 +0000 (15:27 -0500)]
Wifi p2p fix?
Bug:
27431029
Change-Id: Ic9661dbb75d633d4b6e778cde796785aa33c04e0
Clara Bayarri [Tue, 1 Mar 2016 18:22:55 +0000 (18:22 +0000)]
Merge "Fixes for Work Challenge Fingerprint" into nyc-dev
Clara Bayarri [Thu, 18 Feb 2016 12:09:21 +0000 (12:09 +0000)]
Add Work Challenge Notifications Setting
Bug:
26844582
Change-Id: Ib1eb28cfebcc0c8d23ec8669f2777ccb822d7bf3
Clara Bayarri [Fri, 19 Feb 2016 17:24:28 +0000 (17:24 +0000)]
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
Clara Bayarri [Tue, 1 Mar 2016 18:07:41 +0000 (18:07 +0000)]
Merge "When un-unifying the personal and work locks, launch lock setup" into nyc-dev
Dan Sandler [Tue, 1 Mar 2016 16:20:41 +0000 (16:20 +0000)]
Merge "Fix CharSequence nonsense in NotificationStation." into nyc-dev
am:
c9a8abb538
* commit '
c9a8abb5382fdda41876b25dd6ed0ebfb58dc0b2':
Fix CharSequence nonsense in NotificationStation.
Daniel Sandler [Tue, 1 Mar 2016 16:19:25 +0000 (16:19 +0000)]
Merge "Fix CharSequence nonsense in NotificationStation." into nyc-dev
OSDN Git Service
