[Merge] lp:~michael-sheldon/ubuntu-keyboard/fix-1358224 into lp:ubuntu-keyboard

[Michael Sheldon]

Michael Sheldon has proposed merging lp:~michael-sheldon/ubuntu-keyboard/fix-1358224 into lp:ubuntu-keyboard.

Commit message:
Hide the settings option in the keyboard's language menu when the phone is locked.

Requested reviews:
  Ubuntu Phablet Team (phablet-team)
Related bugs:
  Bug #1358224 in ubuntu-keyboard: "Don't display 'Settings' in OSK's menu when the device is locked"
  https://bugs.launchpad.net/ubuntu-keyboard/+bug/1358224

For more details, see:
https://code.launchpad.net/~michael-sheldon/ubuntu-keyboard/fix-1358224/+merge/234661

Hide the settings option in the keyboard's language menu when the phone is locked.
-- 
https://code.launchpad.net/~michael-sheldon/ubuntu-keyboard/fix-1358224/+merge/234661
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~michael-sheldon/ubuntu-keyboard/fix-1358224 into lp:ubuntu-keyboard.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 6807 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20140915/bfc04a69/attachment.diff>