OSDN Git Service
Sanket Padawe [Wed, 9 Mar 2016 19:31:52 +0000 (19:31 +0000)]
Merge "Support material design for Radio band menu" into nyc-dev am:
0792e2f4ad
am:
80654814cc
* commit '
80654814ccdaa4cb9c193e88d543bfab6b30faa1':
Support material design for Radio band menu
Sanket Padawe [Wed, 9 Mar 2016 19:28:27 +0000 (19:28 +0000)]
Merge "Support material design for Radio band menu" into nyc-dev
am:
0792e2f4ad
* commit '
0792e2f4adeb0950932041520ffe173d54982991':
Support material design for Radio band menu
Sanket Padawe [Wed, 9 Mar 2016 19:19:58 +0000 (19:19 +0000)]
Merge "Support material design for Radio band menu" into nyc-dev
Sanket Padawe [Wed, 9 Mar 2016 19:16:23 +0000 (11:16 -0800)]
Support material design for Radio band menu
Bug:
24892294
Change-Id: I56c8c29165ce88cef2791d89e20ac0cc3249bbb2
shwetachahar [Wed, 9 Mar 2016 19:00:08 +0000 (19:00 +0000)]
Merge "Add a pitch seekbar for TTS speech output." into nyc-dev am:
7acf807617
am:
ad4e32590e
* commit '
ad4e32590ed71130961dae2325d2f4f9ef57db3d':
Add a pitch seekbar for TTS speech output.
shwetachahar [Wed, 9 Mar 2016 18:57:41 +0000 (18:57 +0000)]
Merge "Add a pitch seekbar for TTS speech output." into nyc-dev
am:
7acf807617
* commit '
7acf8076179028f5ca97f0f1aa9ba12f0ea2b91a':
Add a pitch seekbar for TTS speech output.
Shweta Chahar [Wed, 9 Mar 2016 18:46:31 +0000 (18:46 +0000)]
Merge "Add a pitch seekbar for TTS speech output." into nyc-dev
shwetachahar [Tue, 23 Feb 2016 14:37:06 +0000 (14:37 +0000)]
Add a pitch seekbar for TTS speech output.
Bug:
27137452
Change-Id: I0992333822b4b1cd561dfa2501e47270ff4964b9
Sudheer Shanka [Wed, 9 Mar 2016 16:37:31 +0000 (16:37 +0000)]
Merge "Update the timeout list dialog in display and security settings." into nyc-dev am:
64d424a1c2
am:
1c6ce85cdc
* commit '
1c6ce85cdc49cfed55bbcee0fc351b22af916c07':
Update the timeout list dialog in display and security settings.
Jason Monk [Wed, 9 Mar 2016 16:37:31 +0000 (16:37 +0000)]
Merge "Make sure mWifiManager gets initialized" into nyc-dev am:
6dca89f741
am:
36317c9014
* commit '
36317c9014aacaa734703435e12890090a3ded5c':
Make sure mWifiManager gets initialized
Geoff Mendal [Wed, 9 Mar 2016 16:37:31 +0000 (16:37 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
c76c37ef6d -s ours
am:
ddbf785d63 -s ours
* commit '
ddbf785d63a61b25e6aa787db814bcc4938120d9':
Import translations. DO NOT MERGE
Jason Monk [Wed, 9 Mar 2016 16:37:31 +0000 (16:37 +0000)]
Update data usage graph to use new graph ui am:
9dc9a0ebb3
am:
c93a998a91
* commit '
c93a998a9176ef07ed650c14fbb9626a9629de72':
Update data usage graph to use new graph ui
Sudheer Shanka [Wed, 9 Mar 2016 16:33:41 +0000 (16:33 +0000)]
Merge "Update the timeout list dialog in display and security settings." into nyc-dev
am:
64d424a1c2
* commit '
64d424a1c2ce16a5c40afbdde5dc5c96e7f25121':
Update the timeout list dialog in display and security settings.
Jason Monk [Wed, 9 Mar 2016 16:33:41 +0000 (16:33 +0000)]
Merge "Make sure mWifiManager gets initialized" into nyc-dev
am:
6dca89f741
* commit '
6dca89f74176dd728d5bcdc92dc067078a6afe9e':
Make sure mWifiManager gets initialized
Geoff Mendal [Wed, 9 Mar 2016 16:33:41 +0000 (16:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
c76c37ef6d -s ours
* commit '
c76c37ef6dcc19ea956e6130c641017ff4b5eb6f':
Import translations. DO NOT MERGE
Jason Monk [Wed, 9 Mar 2016 16:33:41 +0000 (16:33 +0000)]
Update data usage graph to use new graph ui
am:
9dc9a0ebb3
* commit '
9dc9a0ebb383df0225c4d0f92cb837ccabe40021':
Update data usage graph to use new graph ui
Sudheer Shanka [Wed, 9 Mar 2016 16:24:55 +0000 (16:24 +0000)]
Merge "Update the timeout list dialog in display and security settings." into nyc-dev
Sudheer Shanka [Sat, 5 Mar 2016 00:58:34 +0000 (16:58 -0800)]
Update the timeout list dialog in display and security settings.
Currently, we add padlocks to all the timeout options which are
more than the timeout enforced by the admin. Instead of adding
the padlocks to the options, updated the timeout list dialog to
have a disabled by admin message as dialog footer.
Bug:
27564363
Change-Id: I66ce35e92c044ce1864d14e1fc0e83881f8f4ab0
Jason Monk [Wed, 9 Mar 2016 16:13:49 +0000 (16:13 +0000)]
Merge "Make sure mWifiManager gets initialized" into nyc-dev
Jason Monk [Wed, 9 Mar 2016 15:49:33 +0000 (10:49 -0500)]
Make sure mWifiManager gets initialized
To avoid crashing.
Bug:
27561590
Change-Id: I417b8382cb3d1b6c22fa33e05e9b4bf35e048e7e
Geoff Mendal [Wed, 9 Mar 2016 15:45:34 +0000 (15:45 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Jason Monk [Tue, 8 Mar 2016 17:59:03 +0000 (12:59 -0500)]
Update data usage graph to use new graph ui
Bug:
27278313
Change-Id: Ia9e8598dcb970540877f7dac7061cfc55ed99d4d
Geoff Mendal [Wed, 9 Mar 2016 15:39:42 +0000 (07:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id46ae01e6b35ba18f2e12c151acab4c156293976
Auto-generated-cl: translation import
Geoff Mendal [Wed, 9 Mar 2016 14:32:35 +0000 (14:32 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 9 Mar 2016 14:30:58 +0000 (06:30 -0800)]
Import translations. DO NOT MERGE
Change-Id: I24bd2bff7b3986a1b00841d36e9f316ce208163c
Auto-generated-cl: translation import
Jason Monk [Wed, 9 Mar 2016 14:08:44 +0000 (14:08 +0000)]
Merge "Move temporary metrics constants to proto" into nyc-dev am:
222be28d13
am:
5520276085
* commit '
5520276085af9bc340aca13c4abbbc12c1ae01f8':
Move temporary metrics constants to proto
Jason Monk [Wed, 9 Mar 2016 14:06:47 +0000 (14:06 +0000)]
Merge "Move temporary metrics constants to proto" into nyc-dev
am:
222be28d13
* commit '
222be28d13cf7aaddb9944855e8079a8e86617e8':
Move temporary metrics constants to proto
Jason Monk [Wed, 9 Mar 2016 14:03:33 +0000 (14:03 +0000)]
Merge "Move temporary metrics constants to proto" into nyc-dev
Mihai Nita [Wed, 9 Mar 2016 01:22:51 +0000 (01:22 +0000)]
Merge "Hide "Remove" menu & the drag handle when there\'s just one locale" into nyc-dev am:
70fd5d0ecc
am:
dd56043bac
* commit '
dd56043baca7159475ee2f9d7d1bcaf22c53a1ec':
Hide "Remove" menu & the drag handle when there's just one locale
Mihai Nita [Wed, 9 Mar 2016 01:20:59 +0000 (01:20 +0000)]
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
Mihai Niță [Wed, 9 Mar 2016 01:15:20 +0000 (01:15 +0000)]
Merge "Hide "Remove" menu & the drag handle when there's just one locale" into nyc-dev
Mihai Nita [Tue, 8 Mar 2016 18:53:24 +0000 (10:53 -0800)]
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
Julia Reynolds [Tue, 8 Mar 2016 21:55:32 +0000 (21:55 +0000)]
Merge "Don\'t reference framework strings." into nyc-dev am:
179a57b21f
am:
3fd9a62b39
* commit '
3fd9a62b397f7c37aef4c1d13db96615a3cb45f7':
Don't reference framework strings.
Julia Reynolds [Tue, 8 Mar 2016 21:44:35 +0000 (21:44 +0000)]
Merge "Don\'t reference framework strings." into nyc-dev
am:
179a57b21f
* commit '
179a57b21ff1053442b93e2cc943dc1feb65c952':
Don't reference framework strings.
Julia Reynolds [Tue, 8 Mar 2016 21:43:17 +0000 (21:43 +0000)]
Merge "Don\'t reference the notification led if it doesn\'t exist." into nyc-dev am:
d3c07da6e9
am:
f830adddb8
* commit '
f830adddb8a1144bd31fdb3a65b2c1ab8d07bbf6':
Don't reference the notification led if it doesn't exist.
Julia Reynolds [Tue, 8 Mar 2016 21:42:55 +0000 (21:42 +0000)]
Merge "Notification summary updates." into nyc-dev am:
5354f8a2d0
am:
1d91e0f910
* commit '
1d91e0f910729b1107653009489f696201a45f57':
Notification summary updates.
Julia Reynolds [Tue, 8 Mar 2016 21:41:59 +0000 (21:41 +0000)]
Merge "Don't reference framework strings." into nyc-dev
Julia Reynolds [Tue, 8 Mar 2016 21:37:32 +0000 (16:37 -0500)]
Don't reference framework strings.
Bug:
27513548
Change-Id: Ia459d540ebcb81c8a6d6b045e71141aef849d1f1
Julia Reynolds [Tue, 8 Mar 2016 21:32:24 +0000 (21:32 +0000)]
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.
Julia Reynolds [Tue, 8 Mar 2016 21:26:39 +0000 (21:26 +0000)]
Merge "Don't reference the notification led if it doesn't exist." into nyc-dev
Julia Reynolds [Tue, 8 Mar 2016 21:25:02 +0000 (21:25 +0000)]
Merge "Notification summary updates." into nyc-dev
am:
5354f8a2d0
* commit '
5354f8a2d097f6e67917e94dc019ac8ded8280db':
Notification summary updates.
Julia Reynolds [Tue, 8 Mar 2016 21:23:03 +0000 (16:23 -0500)]
Don't reference the notification led if it doesn't exist.
Bug:
27318491
Change-Id: Ic43f1e8c0c7cf376b19278ab6c2661abc1052ddb
Julia Reynolds [Tue, 8 Mar 2016 21:08:54 +0000 (21:08 +0000)]
Merge "Notification summary updates." into nyc-dev
Julia Reynolds [Tue, 8 Mar 2016 20:39:03 +0000 (15:39 -0500)]
Notification summary updates.
Change-Id: I6b824acf27743637ca661b38b51c639ecf099208
Anna Galusza [Tue, 8 Mar 2016 20:50:58 +0000 (20:50 +0000)]
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
am:
79bc5ece6e
* commit '
79bc5ece6e52a1399faf704fb5d3bed37ae82248':
Make sure Action Bar title does not revert to original title (Vision Settings) after Display Size or Text Size is changed. Bug:
27326637
Anna Galusza [Tue, 8 Mar 2016 20:46:00 +0000 (20:46 +0000)]
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
Anna Galusza [Tue, 8 Mar 2016 20:37:33 +0000 (20:37 +0000)]
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
Jason Monk [Tue, 8 Mar 2016 19:52:31 +0000 (19:52 +0000)]
Fix SummaryLoader lifecycle second and for all am:
9425839379
am:
4a93400a02
* commit '
4a93400a02e4abd5e3e99245cb31da0c6d0df50e':
Fix SummaryLoader lifecycle second and for all
Jason Monk [Tue, 8 Mar 2016 19:18:30 +0000 (14:18 -0500)]
Move temporary metrics constants to proto
Change-Id: I8fb3ac22df7bdc52039dd640f7696ebd32281f0b
Jason Monk [Tue, 8 Mar 2016 18:26:08 +0000 (18:26 +0000)]
Fix SummaryLoader lifecycle second and for all
am:
9425839379
* commit '
9425839379d862604d4b5a7b9161540f598f64f6':
Fix SummaryLoader lifecycle second and for all
Jason Monk [Tue, 8 Mar 2016 18:05:31 +0000 (13:05 -0500)]
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
Udam Saini [Tue, 8 Mar 2016 02:03:24 +0000 (02:03 +0000)]
Merge "Fixes a crash in setup wizard when adding a lock screen." into nyc-dev am:
4695fc7e48
am:
704ea2ddef
* commit '
704ea2ddeffe243136de770899ae21c297a49fc1':
Fixes a crash in setup wizard when adding a lock screen.
Udam Saini [Tue, 8 Mar 2016 02:01:27 +0000 (02:01 +0000)]
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.
Udam Saini [Tue, 8 Mar 2016 01:55:00 +0000 (01:55 +0000)]
Merge "Fixes a crash in setup wizard when adding a lock screen." into nyc-dev
Udam Saini [Tue, 8 Mar 2016 01:50:40 +0000 (17:50 -0800)]
Fixes a crash in setup wizard when adding a lock screen.
bug:
27528834
Change-Id: Idc06850740695669162e239f28c30a1ddad6d2df
Ruben Brunk [Tue, 8 Mar 2016 00:30:55 +0000 (00:30 +0000)]
Merge "Add settings VR listener service." into nyc-dev am:
31a3b770c7
am:
caab7e72cd
* commit '
caab7e72cd664bc3f55aaeef2b07f22ba4c43341':
Add settings VR listener service.
Ruben Brunk [Tue, 8 Mar 2016 00:26:36 +0000 (00:26 +0000)]
Merge "Add settings VR listener service." into nyc-dev
am:
31a3b770c7
* commit '
31a3b770c7f50f9e7038759f189b33761301281d':
Add settings VR listener service.
Ruben Brunk [Tue, 8 Mar 2016 00:14:55 +0000 (00:14 +0000)]
Merge "Add settings VR listener service." into nyc-dev
Philip P. Moltmann [Tue, 8 Mar 2016 00:03:27 +0000 (00:03 +0000)]
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.
Philip P. Moltmann [Mon, 7 Mar 2016 23:59:31 +0000 (23:59 +0000)]
Deal with the case that no print services are installed.
am:
7833d183e7
* commit '
7833d183e7ddeaf08938b9db6d8714185e11901f':
Deal with the case that no print services are installed.
Rebecca Silberstein [Mon, 7 Mar 2016 23:38:59 +0000 (23:38 +0000)]
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
Rebecca Silberstein [Mon, 7 Mar 2016 23:37:07 +0000 (23:37 +0000)]
Merge "Save WifiAp config changes when hotspot is enabled" into nyc-dev
am:
da9957780b
* commit '
da9957780b71a17b81e25213053f45be73564f03':
Save WifiAp config changes when hotspot is enabled
Philip P. Moltmann [Mon, 7 Mar 2016 23:28:25 +0000 (15:28 -0800)]
Deal with the case that no print services are installed.
Bug:
27530312
Change-Id: Idd709e66d72efcca4928b471f138f8be66e7ab00
Rebecca Silberstein [Mon, 7 Mar 2016 23:29:39 +0000 (23:29 +0000)]
Merge "Save WifiAp config changes when hotspot is enabled" into nyc-dev
Fyodor Kupolov [Mon, 7 Mar 2016 21:43:02 +0000 (21:43 +0000)]
Merge "First time populate user list in onCreate" into nyc-dev am:
f38d2b6d4c
am:
c2f50fc4f3
* commit '
c2f50fc4f3c2dc6fd040e167e49048736192b686':
First time populate user list in onCreate
Jim Miller [Mon, 7 Mar 2016 21:42:50 +0000 (21:42 +0000)]
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
Adrian Roos [Mon, 7 Mar 2016 21:42:37 +0000 (21:42 +0000)]
Merge "Fix SUW redaction interstitial crash" into nyc-dev am:
bd705413ba
am:
d24f3d9fa9
* commit '
d24f3d9fa9b83f1890e996f6ca6a054410bf59dd':
Fix SUW redaction interstitial crash
Ido Ofir [Mon, 7 Mar 2016 21:42:23 +0000 (21:42 +0000)]
Merge "mark categories as complete when disabled." into nyc-dev am:
b46cad2cb7
am:
67297db8f8
* commit '
67297db8f82b5c3474aa0848c1721602d789d21b':
mark categories as complete when disabled.
Fyodor Kupolov [Mon, 7 Mar 2016 21:40:59 +0000 (21:40 +0000)]
Merge "First time populate user list in onCreate" into nyc-dev
am:
f38d2b6d4c
* commit '
f38d2b6d4c96c42c7168545e6f4f4aecc67b092b':
First time populate user list in onCreate
Jim Miller [Mon, 7 Mar 2016 21:40:44 +0000 (21:40 +0000)]
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
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.
Fyodor Kupolov [Mon, 7 Mar 2016 21:20:18 +0000 (21:20 +0000)]
Merge "First time populate user list in onCreate" into nyc-dev
Fyodor Kupolov [Mon, 7 Mar 2016 19:49:35 +0000 (11:49 -0800)]
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
Jim Miller [Mon, 7 Mar 2016 20:55:38 +0000 (20:55 +0000)]
Merge "Fix crash in fingerprint enrollment due to async transaction" into nyc-dev
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:19:18 +0000 (19:19 +0000)]
Make Print Settings use the new PrintManager.getPrintServices loader am:
d9779db8c9
am:
00c3ed1a7a
* commit '
00c3ed1a7abdd49b0274f29968e4ce30b0e4c902':
Make Print Settings use the new PrintManager.getPrintServices loader
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
Rebecca Silberstein [Fri, 4 Mar 2016 23:47:43 +0000 (15:47 -0800)]
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
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:58:38 +0000 (16:58 +0000)]
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.
Geoff Mendal [Mon, 7 Mar 2016 16:58:21 +0000 (16:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
c654adf99c -s ours
am:
de12d181f6 -s ours
* commit '
de12d181f6ee6f776060d39dc575965f9b0df7f4':
Import translations. DO NOT MERGE
Jason Monk [Mon, 7 Mar 2016 16:58:05 +0000 (16:58 +0000)]
Fix add network alignment am:
ebfbe5cfe6
am:
86aa79b60f
* commit '
86aa79b60fa067a4520472334adb03f89cca95ae':
Fix add network alignment
Jason Monk [Mon, 7 Mar 2016 16:57:48 +0000 (16:57 +0000)]
Fix missing bluetooth settings items am:
15036eea99
am:
e92672eb1c
* commit '
e92672eb1ccdf7fc83009fa30be25ede712a5783':
Fix missing bluetooth settings items
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
Geoff Mendal [Mon, 7 Mar 2016 14:31:43 +0000 (06:31 -0800)]
Import translations. DO NOT MERGE
Change-Id: I07809f0d585e9727448bfd32c4ee81d67182e100
Auto-generated-cl: translation import
Jim Miller [Sat, 5 Mar 2016 00:57:18 +0000 (16:57 -0800)]
Fix crash in fingerprint enrollment due to async transaction
Fixes bug
27424654
Change-Id: I667374330fee00abc2f4ef7f881f8e98fd91567e
Clara Bayarri [Sat, 5 Mar 2016 02:09:57 +0000 (02:09 +0000)]
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
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
OSDN Git Service
