Geoff Mendal
ddbf785d63
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: c76c37ef6d -s ours
* commit 'c76c37ef6dcc19ea956e6130c641017ff4b5eb6f':
Import translations. DO NOT MERGE
2016-03-09 16:33:41 +00:00
Jason Monk
c93a998a91
Update data usage graph to use new graph ui
...
am: 9dc9a0ebb3
* commit '9dc9a0ebb383df0225c4d0f92cb837ccabe40021':
Update data usage graph to use new graph ui
2016-03-09 16:33:41 +00:00
Geoff Mendal
c76c37ef6d
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-03-09 15:45:34 +00:00
Jason Monk
9dc9a0ebb3
Update data usage graph to use new graph ui
...
Bug: 27278313
Change-Id: Ia9e8598dcb970540877f7dac7061cfc55ed99d4d
2016-03-09 10:39:57 -05:00
Geoff Mendal
f14efd9f97
Import translations. DO NOT MERGE
...
Change-Id: Id46ae01e6b35ba18f2e12c151acab4c156293976
Auto-generated-cl: translation import
2016-03-09 07:39:42 -08:00
Jason Monk
5520276085
Merge "Move temporary metrics constants to proto" into nyc-dev
...
am: 222be28d13
* commit '222be28d13cf7aaddb9944855e8079a8e86617e8':
Move temporary metrics constants to proto
2016-03-09 14:06:47 +00:00
Jason Monk
222be28d13
Merge "Move temporary metrics constants to proto" into nyc-dev
2016-03-09 14:03:34 +00:00
Mihai Nita
dd56043bac
Merge "Hide "Remove" menu & the drag handle when there\'s just one locale" into nyc-dev
...
am: 70fd5d0ecc
* commit '70fd5d0ecc29630ba79f25038234a0f6b56effd4':
Hide "Remove" menu & the drag handle when there's just one locale
2016-03-09 01:20:59 +00:00
Mihai Niță
70fd5d0ecc
Merge "Hide "Remove" menu & the drag handle when there's just one locale" into nyc-dev
2016-03-09 01:15:21 +00:00
Mihai Nita
7751358ab6
Hide "Remove" menu & the drag handle when there's just one locale
...
When there's just one locale, showing the "Remove" menu and the
drag handle is confusing to the user since nothing can happen if
they try to use them: the drag simply won't happen, and if they
go through the delete process, we give them an error.
Bug: 26730336
Change-Id: Ie219dd9b3d653272b325d7af01aba205a58cd472
2016-03-08 14:47:46 -08:00
Julia Reynolds
3fd9a62b39
Merge "Don\'t reference framework strings." into nyc-dev
...
am: 179a57b21f
* commit '179a57b21ff1053442b93e2cc943dc1feb65c952':
Don't reference framework strings.
2016-03-08 21:44:35 +00:00
Julia Reynolds
179a57b21f
Merge "Don't reference framework strings." into nyc-dev
2016-03-08 21:41:59 +00:00
Julia Reynolds
5f5d049e00
Don't reference framework strings.
...
Bug: 27513548
Change-Id: Ia459d540ebcb81c8a6d6b045e71141aef849d1f1
2016-03-08 16:37:32 -05:00
Julia Reynolds
f830adddb8
Merge "Don\'t reference the notification led if it doesn\'t exist." into nyc-dev
...
am: d3c07da6e9
* commit 'd3c07da6e916c128b20adee3c1ccfd845725cdee':
Don't reference the notification led if it doesn't exist.
2016-03-08 21:32:24 +00:00
Julia Reynolds
d3c07da6e9
Merge "Don't reference the notification led if it doesn't exist." into nyc-dev
2016-03-08 21:26:39 +00:00
Julia Reynolds
1d91e0f910
Merge "Notification summary updates." into nyc-dev
...
am: 5354f8a2d0
* commit '5354f8a2d097f6e67917e94dc019ac8ded8280db':
Notification summary updates.
2016-03-08 21:25:02 +00:00
Julia Reynolds
184da33bba
Don't reference the notification led if it doesn't exist.
...
Bug: 27318491
Change-Id: Ic43f1e8c0c7cf376b19278ab6c2661abc1052ddb
2016-03-08 16:23:03 -05:00
Julia Reynolds
5354f8a2d0
Merge "Notification summary updates." into nyc-dev
2016-03-08 21:08:55 +00:00
Julia Reynolds
3e912e7ea5
Notification summary updates.
...
Change-Id: I6b824acf27743637ca661b38b51c639ecf099208
2016-03-08 16:08:12 -05:00
Anna Galusza
79bc5ece6e
Merge "Make sure Action Bar title does not revert to original title (Vision Settings) after Display Size or Text Size is changed. Bug: 27326637" into nyc-dev
...
am: 0cb68d4dff
* commit '0cb68d4dff3a5a348a8e99dc9f808d7d584b1f10':
Make sure Action Bar title does not revert to original title (Vision Settings) after Display Size or Text Size is changed. Bug: 27326637
2016-03-08 20:46:00 +00:00
Anna Galusza
0cb68d4dff
Merge "Make sure Action Bar title does not revert to original title (Vision Settings) after Display Size or Text Size is changed. Bug: 27326637" into nyc-dev
2016-03-08 20:37:34 +00:00
Jason Monk
3e19fc5600
Move temporary metrics constants to proto
...
Change-Id: I8fb3ac22df7bdc52039dd640f7696ebd32281f0b
2016-03-08 14:18:30 -05:00
Jason Monk
4a93400a02
Fix SummaryLoader lifecycle second and for all
...
am: 9425839379
* commit '9425839379d862604d4b5a7b9161540f598f64f6':
Fix SummaryLoader lifecycle second and for all
2016-03-08 18:26:08 +00:00
Jason Monk
9425839379
Fix SummaryLoader lifecycle second and for all
...
Mostly hypothetical fix for weird circumstance where listening
lifecycle gets broken. To fix this, track the current state
of listening in the SummaryLoader and force it into the non-listening
state when released.
Bug: 26027137
Bug: 26731143
Change-Id: I7299749230924eafa3e6e7d5b0de6e48ff014a38
2016-03-08 13:14:27 -05:00
Udam Saini
704ea2ddef
Merge "Fixes a crash in setup wizard when adding a lock screen." into nyc-dev
...
am: 4695fc7e48
* commit '4695fc7e484bdc76ca9bd3d6b04a72f82a559f41':
Fixes a crash in setup wizard when adding a lock screen.
2016-03-08 02:01:27 +00:00
Udam Saini
4695fc7e48
Merge "Fixes a crash in setup wizard when adding a lock screen." into nyc-dev
2016-03-08 01:55:00 +00:00
Udam Saini
6d6e117720
Fixes a crash in setup wizard when adding a lock screen.
...
bug:27528834
Change-Id: Idc06850740695669162e239f28c30a1ddad6d2df
2016-03-07 17:50:40 -08:00
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
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
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
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
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
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