Commit Graph

26180 Commits

Author SHA1 Message Date
Ruben Brunk
caab7e72cd Merge "Add settings VR listener service." into nyc-dev
am: 31a3b770c7

* commit '31a3b770c7f50f9e7038759f189b33761301281d':
  Add settings VR listener service.
2016-03-08 00:26:36 +00:00
Ruben Brunk
31a3b770c7 Merge "Add settings VR listener service." into nyc-dev 2016-03-08 00:14:56 +00:00
Philip P. Moltmann
75c52e2442 Deal with the case that no print services are installed. am: 7833d183e7
am: d7b46f9763

* commit 'd7b46f9763ae872a9a534b64d4551eb00a95c6e6':
  Deal with the case that no print services are installed.
2016-03-08 00:03:27 +00:00
Philip P. Moltmann
d7b46f9763 Deal with the case that no print services are installed.
am: 7833d183e7

* commit '7833d183e7ddeaf08938b9db6d8714185e11901f':
  Deal with the case that no print services are installed.
2016-03-07 23:59:31 +00:00
Rebecca Silberstein
d78524e055 Merge "Save WifiAp config changes when hotspot is enabled" into nyc-dev am: da9957780b
am: c17425bfb0

* commit 'c17425bfb0e311319287cd8f8e605ccfa04843d7':
  Save WifiAp config changes when hotspot is enabled
2016-03-07 23:38:59 +00:00
Rebecca Silberstein
c17425bfb0 Merge "Save WifiAp config changes when hotspot is enabled" into nyc-dev
am: da9957780b

* commit 'da9957780b71a17b81e25213053f45be73564f03':
  Save WifiAp config changes when hotspot is enabled
2016-03-07 23:37:07 +00:00
Philip P. Moltmann
7833d183e7 Deal with the case that no print services are installed.
Bug: 27530312
Change-Id: Idd709e66d72efcca4928b471f138f8be66e7ab00
2016-03-07 15:32:28 -08:00
Rebecca Silberstein
da9957780b Merge "Save WifiAp config changes when hotspot is enabled" into nyc-dev 2016-03-07 23:29:39 +00:00
Fyodor Kupolov
ab0a3706db Merge "First time populate user list in onCreate" into nyc-dev am: f38d2b6d4c
am: c2f50fc4f3

* commit 'c2f50fc4f3c2dc6fd040e167e49048736192b686':
  First time populate user list in onCreate
2016-03-07 21:43:02 +00:00
Jim Miller
4441b872dd Merge "Fix crash in fingerprint enrollment due to async transaction" into nyc-dev am: fb51827247
am: 76f9181061

* commit '76f9181061f550dc5de51ec9bed9c9d1ce9375b0':
  Fix crash in fingerprint enrollment due to async transaction
2016-03-07 21:42:50 +00:00
Adrian Roos
b426b627eb Merge "Fix SUW redaction interstitial crash" into nyc-dev am: bd705413ba
am: d24f3d9fa9

* commit 'd24f3d9fa9b83f1890e996f6ca6a054410bf59dd':
  Fix SUW redaction interstitial crash
2016-03-07 21:42:37 +00:00
Ido Ofir
7882b5aaf6 Merge "mark categories as complete when disabled." into nyc-dev am: b46cad2cb7
am: 67297db8f8

* commit '67297db8f82b5c3474aa0848c1721602d789d21b':
  mark categories as complete when disabled.
2016-03-07 21:42:23 +00:00
Fyodor Kupolov
c2f50fc4f3 Merge "First time populate user list in onCreate" into nyc-dev
am: f38d2b6d4c

* commit 'f38d2b6d4c96c42c7168545e6f4f4aecc67b092b':
  First time populate user list in onCreate
2016-03-07 21:40:59 +00:00
Jim Miller
76f9181061 Merge "Fix crash in fingerprint enrollment due to async transaction" into nyc-dev
am: fb51827247

* commit 'fb51827247de116c184e7fef31978f4f8541194f':
  Fix crash in fingerprint enrollment due to async transaction
2016-03-07 21:40:44 +00:00
Adrian Roos
d24f3d9fa9 Merge "Fix SUW redaction interstitial crash" into nyc-dev
am: bd705413ba

* commit 'bd705413babe94c3382598217757d4b95d2dcc6a':
  Fix SUW redaction interstitial crash
2016-03-07 21:40:29 +00:00
Ido Ofir
67297db8f8 Merge "mark categories as complete when disabled." into nyc-dev
am: b46cad2cb7

* commit 'b46cad2cb7dfdb283ac8c118723c8bc4f2c4633c':
  mark categories as complete when disabled.
2016-03-07 21:40:13 +00:00
Fyodor Kupolov
f38d2b6d4c Merge "First time populate user list in onCreate" into nyc-dev 2016-03-07 21:20:18 +00:00
Fyodor Kupolov
8c9120b9cc First time populate user list in onCreate
Call updateUserList from onCreate instead of onResume during initialization.
This will suppress unnecessary animations.

Bug: 27527929

Change-Id: Ia420f41894b2033fb7f02de01168ccd2c6331588
2016-03-07 13:08:49 -08:00
Jim Miller
fb51827247 Merge "Fix crash in fingerprint enrollment due to async transaction" into nyc-dev 2016-03-07 20:55:38 +00:00
Adrian Roos
bd705413ba Merge "Fix SUW redaction interstitial crash" into nyc-dev 2016-03-07 20:50:05 +00:00
Adrian Roos
0128d6d28b Fix SUW redaction interstitial crash
Bug: 27518157
Change-Id: Id0c2eae88db41080e35200ee8f94ee74ea0a9a1f
2016-03-07 12:49:25 -08:00
Ido Ofir
b46cad2cb7 Merge "mark categories as complete when disabled." into nyc-dev 2016-03-07 20:05:25 +00:00
Philip P. Moltmann
486f9c6117 Make Print Settings use the new PrintManager.getPrintServices loader am: d9779db8c9
am: 00c3ed1a7a

* commit '00c3ed1a7abdd49b0274f29968e4ce30b0e4c902':
  Make Print Settings use the new PrintManager.getPrintServices loader
2016-03-07 19:19:18 +00:00
Philip P. Moltmann
00c3ed1a7a Make Print Settings use the new PrintManager.getPrintServices loader
am: d9779db8c9

* commit 'd9779db8c966347734c5791cf63b7dc2e466a0f4':
  Make Print Settings use the new PrintManager.getPrintServices loader
2016-03-07 19:17:31 +00:00
Rebecca Silberstein
ffb4fbb1a7 Save WifiAp config changes when hotspot is enabled
We need to properly handle asynchronous events when WifiAp for hotspot
is enabled and the user changes the config.  This CL changes the
behavior to:
1 - mark local boolean indicating a restart is needed
2 - trigger the WifiAp to stop
3 - save the new config
4 - when the stop is complete (and the boolean is set), restart the
WifiAp.

Also fix a few style issues in the file.

BUG:27460194
Change-Id: I7e49ab9c49e125017cf83866a396701e440bf383
2016-03-07 09:49:52 -08:00
Philip P. Moltmann
d9779db8c9 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
2016-03-07 09:32:55 -08:00
Oleksandr Peletskyi
61cf59927c Merge "Block "Screen lock" menu if password is managed." into nyc-dev am: 52fdd6a058
am: 062ca07e7c

* commit '062ca07e7c78afb52e9d50f9eced507f03b944f2':
  Block "Screen lock" menu if password is managed.
2016-03-07 16:58:38 +00:00
Geoff Mendal
ae2b0a0ff7 Merge "Import translations. DO NOT MERGE" into nyc-dev am: c654adf99c -s ours
am: de12d181f6  -s ours

* commit 'de12d181f6ee6f776060d39dc575965f9b0df7f4':
  Import translations. DO NOT MERGE
2016-03-07 16:58:21 +00:00
Jason Monk
008fdcf656 Fix add network alignment am: ebfbe5cfe6
am: 86aa79b60f

* commit '86aa79b60fa067a4520472334adb03f89cca95ae':
  Fix add network alignment
2016-03-07 16:58:05 +00:00
Jason Monk
3d612644be Fix missing bluetooth settings items am: 15036eea99
am: e92672eb1c

* commit 'e92672eb1ccdf7fc83009fa30be25ede712a5783':
  Fix missing bluetooth settings items
2016-03-07 16:57:48 +00:00
Oleksandr Peletskyi
062ca07e7c Merge "Block "Screen lock" menu if password is managed." into nyc-dev
am: 52fdd6a058

* commit '52fdd6a058808b5d71a8e7cbdc80c7460c459304':
  Block "Screen lock" menu if password is managed.
2016-03-07 16:56:36 +00:00
Geoff Mendal
de12d181f6 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: c654adf99c  -s ours

* commit 'c654adf99cdac74beccb657dfb0f132adc6088a3':
  Import translations. DO NOT MERGE
2016-03-07 16:56:19 +00:00
Jason Monk
86aa79b60f Fix add network alignment
am: ebfbe5cfe6

* commit 'ebfbe5cfe64c0ac46a6812652c9139e674fc3056':
  Fix add network alignment
2016-03-07 16:55:59 +00:00
Jason Monk
e92672eb1c Fix missing bluetooth settings items
am: 15036eea99

* commit '15036eea997f645651c5cce0059bf96fb176f016':
  Fix missing bluetooth settings items
2016-03-07 16:55:40 +00:00
Oleksandr Peletskyi
52fdd6a058 Merge "Block "Screen lock" menu if password is managed." into nyc-dev 2016-03-07 16:43:38 +00:00
Geoff Mendal
c654adf99c Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-07 15:39:40 +00:00
Geoff Mendal
8158dcb06d Import translations. DO NOT MERGE
Change-Id: I066af915c57a99077bb8c2eba2193707154f0b90
Auto-generated-cl: translation import
2016-03-07 07:37:10 -08:00
Jason Monk
ebfbe5cfe6 Fix add network alignment
Bug: 26759951
Change-Id: I5ba657b5a4099d9f2f1ecf2f27a6a25908bc4a86
2016-03-07 10:19:47 -05:00
Jason Monk
15036eea99 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
2016-03-07 10:02:35 -05:00
Geoff Mendal
fc32604dea Import translations. DO NOT MERGE
Change-Id: I07809f0d585e9727448bfd32c4ee81d67182e100
Auto-generated-cl: translation import
2016-03-07 06:31:43 -08:00
Jim Miller
a9a8a18ac9 Fix crash in fingerprint enrollment due to async transaction
Fixes bug 27424654

Change-Id: I667374330fee00abc2f4ef7f881f8e98fd91567e
2016-03-04 18:22:00 -08:00
Clara Bayarri
9885b9ff43 Merge "Fix issue with unlock attempts for the Work Challenge" into nyc-dev am: 04af275b6e
am: 715daa78a6

* commit '715daa78a6f56f8dd4f860a72ebc45bd3693c9eb':
  Fix issue with unlock attempts for the Work Challenge
2016-03-05 02:09:57 +00:00
Clara Bayarri
715daa78a6 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
2016-03-05 02:07:57 +00:00
Clara Bayarri
04af275b6e Merge "Fix issue with unlock attempts for the Work Challenge" into nyc-dev 2016-03-05 02:01:58 +00:00
Clara Bayarri
15fa7bf634 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
2016-03-04 17:55:43 -08:00
Anna Galusza
dca49196a6 Make sure Action Bar title does not revert to original title (Vision Settings)
after Display Size or Text Size is changed.
Bug: 27326637

Change-Id: I1d6d5a9dc4a6ab1c57772753b543483fec84cad8
2016-03-04 17:29:20 -08:00
Ruben Brunk
e1c98ca821 Add settings VR listener service.
Bug: 22855417
Bug: 26724891

- Adds a settings panel allowing users to toggle the
  enabled/disabled state of each VrListenerService
  component installed.
- If disabled, a VrListenerService will not be bound
  from the framework, even when requested by a VR
  application.

Change-Id: I606eb712c011d160b9fbdd3c0e8fd744c653ef07
2016-03-04 16:07:09 -08:00
Sudheer Shanka
08c7d960c3 Merge "Avoid checking the restricted items in the list." into nyc-dev am: 6e2b469651
am: 7f33709e85

* commit '7f33709e85a51172fb049597b0d6ef11a7c81718':
  Avoid checking the restricted items in the list.
2016-03-04 22:32:39 +00:00
Sudheer Shanka
7f33709e85 Merge "Avoid checking the restricted items in the list." into nyc-dev
am: 6e2b469651

* commit '6e2b469651da700114014e6987cd307a3daddaa1':
  Avoid checking the restricted items in the list.
2016-03-04 22:30:41 +00:00
Sudheer Shanka
6e2b469651 Merge "Avoid checking the restricted items in the list." into nyc-dev 2016-03-04 22:27:44 +00:00