OSDN Git Service
Geoff Mendal [Tue, 2 Feb 2016 17:01:34 +0000 (17:01 +0000)]
Import translations. DO NOT MERGE am:
49a9587ade -s ours am:
1b2a3b18fc -s ours
am:
649bbf765d -s ours
* commit '
649bbf765d5bed3b0446b165aa01fa1b6500d229':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:58:34 +0000 (16:58 +0000)]
Import translations. DO NOT MERGE am:
0873f057db -s ours
am:
83f0595b6e -s ours
* commit '
83f0595b6ec645e033c9638e358bc9d4fe4b3010':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:56:24 +0000 (16:56 +0000)]
Import translations. DO NOT MERGE am:
49a9587ade -s ours
am:
1b2a3b18fc -s ours
* commit '
1b2a3b18fc871fddff6795c24802037c4fb4239a':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:52:59 +0000 (16:52 +0000)]
Import translations. DO NOT MERGE
am:
49a9587ade -s ours
* commit '
49a9587aded906c32cde763ad263e4166913c824':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:52:01 +0000 (16:52 +0000)]
Import translations. DO NOT MERGE
am:
0873f057db -s ours
* commit '
0873f057dbe38f79b499e9988d9db496a32a21f9':
Import translations. DO NOT MERGE
Abodunrinwa Toki [Tue, 2 Feb 2016 16:30:01 +0000 (16:30 +0000)]
Merge "Change the character limit for "Keyboard and input methods" string."
Geoff Mendal [Tue, 2 Feb 2016 16:28:24 +0000 (08:28 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5571d71b847f91111ebc937a387fc97a26546791
Auto-generated-cl: translation import
Abodunrinwa Toki [Tue, 2 Feb 2016 16:26:31 +0000 (16:26 +0000)]
Change the character limit for "Keyboard and input methods" string.
Bug:
26856894
Change-Id: Ic8c6daea79d7f4e19246a6cf00610e5caf138389
Geoff Mendal [Tue, 2 Feb 2016 16:18:55 +0000 (17:18 +0100)]
Import translations. DO NOT MERGE
Change-Id: I747f56476fb70029b7555708f2d9290bd7830021
Auto-generated-cl: translation import
Robin Lee [Fri, 29 Jan 2016 13:04:04 +0000 (13:04 +0000)]
Disable VPN prefs for restriction or lockdown case
Change-Id: I2fcf84876bf23b92cdcd00ce93514106914d0c29
Philip P. Moltmann [Mon, 1 Feb 2016 23:42:07 +0000 (23:42 +0000)]
Merge "Use same printer-list template as in the print spooler."
Ido Ofir [Mon, 1 Feb 2016 21:28:05 +0000 (21:28 +0000)]
Merge "Remove payments from settings suggestions."
Ido Ofir [Mon, 1 Feb 2016 21:17:40 +0000 (21:17 +0000)]
Merge "Adding hotword category to Settings suggested steps."
Jeff Sharkey [Mon, 1 Feb 2016 17:40:05 +0000 (10:40 -0700)]
System paths are okay now; no more special-casing.
Bug:
26895798
Change-Id: I41df87f1fe77c2c523272cf43b5db6a0a7395bed
Jason Monk [Mon, 1 Feb 2016 16:39:35 +0000 (16:39 +0000)]
Merge "Metrics more of the things"
Benjamin Franz [Mon, 1 Feb 2016 16:34:26 +0000 (16:34 +0000)]
Merge "Revert "Read default confirm credentials title from policy""
Benjamin Franz [Mon, 1 Feb 2016 16:27:16 +0000 (16:27 +0000)]
Revert "Read default confirm credentials title from policy"
This reverts commit
6e2821dc1ab96de168a057d25acc1ad87e50e606.
Bug:
26895493
Change-Id: I27e7199dc25d423219d966f9f2cbd671bbf094c7
Geoff Mendal [Mon, 1 Feb 2016 15:44:53 +0000 (15:44 +0000)]
Import translations. DO NOT MERGE am:
66382c5667 -s ours am:
5f050823b1 -s ours
am:
ec2416947d -s ours
* commit '
ec2416947dd45e54ef5c837a0af0b4e121a77dae':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Feb 2016 15:43:02 +0000 (15:43 +0000)]
Import translations. DO NOT MERGE am:
66382c5667 -s ours
am:
5f050823b1 -s ours
* commit '
5f050823b1ceb2f0f789e9d13cf009f323c70040':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Feb 2016 15:43:02 +0000 (15:43 +0000)]
Import translations. DO NOT MERGE am:
67603ccc01 -s ours
am:
ff50dbd224 -s ours
* commit '
ff50dbd22459e984f4aa17a79abf7f26c2936020':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Feb 2016 15:41:11 +0000 (15:41 +0000)]
Import translations. DO NOT MERGE
am:
67603ccc01 -s ours
* commit '
67603ccc0154a12e3bd08ea96bfda012098c024f':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Feb 2016 15:41:10 +0000 (15:41 +0000)]
Import translations. DO NOT MERGE
am:
66382c5667 -s ours
* commit '
66382c5667eec5411e0043b8668237f04b0e6f25':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Feb 2016 15:33:16 +0000 (07:33 -0800)]
Import translations. DO NOT MERGE
Change-Id: I807c37bd4191712a2408d46f35cf88caf72f1f75
Auto-generated-cl: translation import
Geoff Mendal [Mon, 1 Feb 2016 15:24:56 +0000 (07:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie7dce1455e8b29196b023509228f876c105f5705
Auto-generated-cl: translation import
Geoff Mendal [Mon, 1 Feb 2016 14:35:28 +0000 (14:35 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 1 Feb 2016 14:34:43 +0000 (06:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0e45cffaaf587a0fd84d06c592fc7e512d1915e0
Auto-generated-cl: translation import
Jason Monk [Mon, 1 Feb 2016 14:27:58 +0000 (14:27 +0000)]
Merge "Fix dream settings initial state."
Clara Bayarri [Mon, 1 Feb 2016 10:09:18 +0000 (10:09 +0000)]
Merge "Make Lockscreen Notification Content work for profiles"
Jason Monk [Sat, 30 Jan 2016 17:15:11 +0000 (12:15 -0500)]
Fix dream settings initial state.
The empty view wasn't being updated initially by the fragment
so it was being left in an empty state since no preferences are
added after the fact.
Bug:
25609200
Change-Id: Ib9aa02ba94bf7077d01892d96d79d39203047f4d
Jason Monk [Sat, 30 Jan 2016 16:57:30 +0000 (11:57 -0500)]
Fix storage preference animating away
Init it during the onCreate so it just doesn't appear.
Bug:
25606221
Change-Id: I899521590eae8d12c09938f8aa77680e3e277742
Jason Monk [Sat, 30 Jan 2016 16:36:52 +0000 (11:36 -0500)]
Metrics more of the things
Add a dump for some of the state of the device.
Bug:
26687707
Change-Id: Icf517912b3006cc84c26863eb1b93d586a55464a
Ido Ofir [Sat, 30 Jan 2016 00:49:16 +0000 (16:49 -0800)]
Adding hotword category to Settings suggested steps.
Change-Id: I1f8c349b5cdd37cddd6b629121af03fb3b6695c6
Jorim Jaggi [Fri, 29 Jan 2016 23:17:27 +0000 (23:17 +0000)]
Merge "Enable multi-dex for incremental settings builds"
Jorim Jaggi [Fri, 29 Jan 2016 04:06:32 +0000 (20:06 -0800)]
Enable multi-dex for incremental settings builds
Change-Id: I265eb5ff508206bd5b4205db612c3519bb9a5ed8
Noah Wang [Fri, 29 Jan 2016 21:45:54 +0000 (21:45 +0000)]
Merge "Adding placeholder for preview screens for screen zoom (magnifying screen)"
Ido Ofir [Fri, 29 Jan 2016 20:55:28 +0000 (12:55 -0800)]
Remove payments from settings suggestions.
Bug:
26770145
Change-Id: I269b78cfde45bd4a9c1669bc9425676404d54188
Adrian Roos [Fri, 29 Jan 2016 20:44:15 +0000 (20:44 +0000)]
Merge "Follow up to I15baa5b1d19324521070d641ae6a227d782a4e9e"
Adrian Roos [Fri, 29 Jan 2016 20:35:37 +0000 (12:35 -0800)]
Follow up to I15baa5b1d19324521070d641ae6a227d782a4e9e
Bug:
19003093
Change-Id: I0e1dddb57e347c81d01abb7025144fadf6e53fe4
Maria Garcia Puyol [Fri, 29 Jan 2016 19:24:20 +0000 (19:24 +0000)]
Merge "Add Emergency Info preference to user settings"
Philip P. Moltmann [Tue, 26 Jan 2016 21:02:36 +0000 (13:02 -0800)]
Use same printer-list template as in the print spooler.
Bug:
26780325
Change-Id: Ic333027aa0d158ad51608565af624b0c1cb10cfa
Julia Reynolds [Fri, 29 Jan 2016 15:15:31 +0000 (10:15 -0500)]
Link to external settings activity from the app header.
Bug:
26288458
Change-Id: Ib7c723f23a09f2dbcb6c9738db8e455fb7b82462
Benjamin Franz [Fri, 29 Jan 2016 11:38:56 +0000 (11:38 +0000)]
Merge "Read default confirm credentials title from policy"
Robin Lee [Fri, 29 Jan 2016 11:02:57 +0000 (11:02 +0000)]
Merge "Only setCredentialRequiredToDecrypt if primary user"
Robin Lee [Wed, 27 Jan 2016 17:21:00 +0000 (17:21 +0000)]
Only setCredentialRequiredToDecrypt if primary user
Change-Id: I3b68cc1169296aa95777e12fa27c3ede4291ec78
Jeff Sharkey [Fri, 29 Jan 2016 02:43:31 +0000 (02:43 +0000)]
Merge "Temporary hack to keep file:// Uris working."
Jeff Sharkey [Fri, 29 Jan 2016 02:03:18 +0000 (19:03 -0700)]
Temporary hack to keep file:// Uris working.
Bug:
26860922
Change-Id: I29cc4f4328b829e75a4523bd4d710da3e872f59c
Yohei Yukawa [Thu, 28 Jan 2016 23:58:31 +0000 (23:58 +0000)]
Merge "Support ACTION_KEYBOARD_LAYOUT_SETTINGS."
Adrian Roos [Thu, 28 Jan 2016 21:23:53 +0000 (13:23 -0800)]
Move lock screen setting behind gear
Bug:
19003093
Change-Id: I15baa5b1d19324521070d641ae6a227d782a4e9e
mariagpuyol [Thu, 28 Jan 2016 22:58:03 +0000 (14:58 -0800)]
Add Emergency Info preference to user settings
Bug:
26831671
Change-Id: I345fc9b9a54991de35c657e05cf3f08f21445f4c
Julia Reynolds [Wed, 27 Jan 2016 18:37:15 +0000 (13:37 -0500)]
Allow importance to be reset.
Change-Id: Ib2c2289631dfe4eb2aa09baf84d401eb2000c0d9
Andrei Stingaceanu [Wed, 27 Jan 2016 15:29:03 +0000 (15:29 +0000)]
Settings - disable notification settings for suspended apps
When we suspend an app we disable notifications for the app
(via notification manager as in Settings). While an app is
suspended do not allow the user to reach the
NotificationSettings screen.
Bug:
22776761
Change-Id: Ia0dbad6adce64b7d9238e1215a37c73e192dbc45
Udam Saini [Thu, 28 Jan 2016 21:21:16 +0000 (21:21 +0000)]
Merge "Dynamically checks if screen lock suggestion is needed"
Udam Saini [Thu, 28 Jan 2016 19:09:29 +0000 (11:09 -0800)]
Dynamically checks if screen lock suggestion is needed
Fixes a bug where if you upgrade a device with screen lock,
screen lock suggestion would show (upgrade such as N->N developer
builds) or from a user test case like M->N
bug:
26844580
Change-Id: Ic779ff28f5895e407c2c96771dbbc622e6026a7f
Noah Wang [Thu, 28 Jan 2016 20:53:58 +0000 (20:53 +0000)]
Merge "Add entry point of screen zoom to accessibility and font size to display. Also removing large text preference."
Noah Wang [Tue, 26 Jan 2016 05:30:08 +0000 (21:30 -0800)]
Add entry point of screen zoom to accessibility and font size to display.
Also removing large text preference.
Change-Id: I076664edf1d1afd69385e34f9300bf5c0788b3e7
Sudheer Shanka [Thu, 28 Jan 2016 19:59:58 +0000 (19:59 +0000)]
Merge "Update view state of the items in listpreference."
Benjamin Franz [Mon, 25 Jan 2016 16:17:14 +0000 (16:17 +0000)]
Read default confirm credentials title from policy
Use the organization name as default header text for the work
challenge. If an app passes a different header text, this will get
priority.
Bug:
26638631
Change-Id: I09a5bd7172ff1eed0ff97be02818e838a1a0a520
Mihai Niță [Thu, 28 Jan 2016 19:31:03 +0000 (19:31 +0000)]
Merge "Fixed trash icon for language removal"
Mihai Nita [Thu, 28 Jan 2016 19:16:20 +0000 (11:16 -0800)]
Fixed trash icon for language removal
Bug:
26758729
Change-Id: I31f5b8d018c62a4d03619ee39c86bd96456f90ab
Noah Wang [Thu, 28 Jan 2016 19:13:52 +0000 (19:13 +0000)]
Merge "Add instruction video to Screen Magnification a.k.a. Tap to Zoom screen."
Jason Monk [Thu, 28 Jan 2016 18:15:35 +0000 (18:15 +0000)]
Merge "Clean up CellDataPreference dialog problems"
Jason Monk [Thu, 28 Jan 2016 17:35:31 +0000 (12:35 -0500)]
Clean up CellDataPreference dialog problems
Bug:
26830672
Change-Id: I189f8b2120143ca9829feebd24cf2ee93a33f05b
Clara Bayarri [Mon, 25 Jan 2016 17:21:24 +0000 (17:21 +0000)]
Make Lockscreen Notification Content work for profiles
The settings for the Notification Content is user-dependent
and the correct values are used in the lock screen.
Bug:
26709332
Change-Id: I7acf94014771dacc2841da336bed645fdb948541
Sudheer Shanka [Thu, 28 Jan 2016 17:53:53 +0000 (17:53 +0000)]
Update view state of the items in listpreference.
Bug:
26842763
Change-Id: Ie10c89626031f6bbfaa22564f056f371a4e81acb
Mihai Nita [Thu, 28 Jan 2016 17:36:09 +0000 (09:36 -0800)]
Sentence-case the locale list.
Bug:
26730313
Change-Id: I015c50cb0e82cf3f5ad88a57d43d39e7202cf62d
Shweta Chahar [Thu, 28 Jan 2016 14:52:37 +0000 (14:52 +0000)]
Merge "Add a seekbar to change text-to-speech rate and a switch to enable higher speech rates."
Daniel Sandler [Thu, 28 Jan 2016 14:24:14 +0000 (14:24 +0000)]
Merge "Revert "Add Emergency Info preference to user settings""
Daniel Sandler [Thu, 28 Jan 2016 03:29:49 +0000 (03:29 +0000)]
Revert "Add Emergency Info preference to user settings"
This reverts commit
0401388028da2c91e7e34dcd952dcd1c289a714d.
Bug:
26831671
Change-Id: Ibe5ae3c7da400efb389f905b1111f029b6a8bfaf
Yohei Yukawa [Thu, 28 Jan 2016 03:18:52 +0000 (19:18 -0800)]
Support ACTION_KEYBOARD_LAYOUT_SETTINGS.
This CL let the Settings app accept
Settings.ACTION_KEYBOARD_LAYOUT_SETTINGS like other activity actions
such as ACTION_INPUT_METHOD_SETTINGS and
ACTION_INPUT_METHOD_SUBTYPE_SETTINGS.
Bug:
25752827
Change-Id: I3244d9af400f9344359c1b5cfc1a5c1d9268ec8c
Adam Lesinski [Thu, 28 Jan 2016 00:03:57 +0000 (00:03 +0000)]
Merge "Update FakeUid to match new methods in BatteryStats.Uid interface"
shwetachahar [Wed, 27 Jan 2016 16:38:06 +0000 (16:38 +0000)]
Add a seekbar to change text-to-speech rate and a switch to enable
higher speech rates.
Change-Id: I75cfc2af4e293dc45c93a44e5c2af73d1dae9b7c
Noah Wang [Thu, 21 Jan 2016 04:47:21 +0000 (20:47 -0800)]
Add instruction video to Screen Magnification a.k.a. Tap to Zoom screen.
Change-Id: Id02796ea44e48fe04351c9ea6bda66526f77a5cf
Samuel Tan [Fri, 22 Jan 2016 02:17:17 +0000 (18:17 -0800)]
Display warning if users does not provide CA cert in EAP config
Display an explicit warning in the WiFi configuration menu if
the user selects the option to not validate the EAP server (i.e.
does not provide a CA certificate) in an EAP configuration.
BUG:
26686071
Change-Id: I73620b60defdcf40865f8c67d5de24b5dad636f8
TEST: Warning appears when the abovementioned option is selected.
Samuel Tan [Fri, 22 Jan 2016 02:12:53 +0000 (18:12 -0800)]
Add menu options for not specifying a EAP CA cert and User cert
Add the "Do not validate" and "Do not provide" menu
options for not providing a CA certificate and User certificate
respectively for EAP configurations.
Choosing these options are essentially equivalent to leaving
these fields alone as "(unspecified)" (when that option existed),
but now we require the user to make a conscious choice not to
provide these certificates.
BUG:
26686071
Change-Id: I4b9c07528d6d2ba3eb0787e7cfff69d05dd25679
TEST: Both the added options appear in the relevant menus.
TEST: Choosing both these added options in an EAP-TLS configuration
TEST: allows the configuration to be saved.
Samuel Tan [Thu, 21 Jan 2016 22:59:53 +0000 (14:59 -0800)]
Disable configuring EAP-TLS without user certificate.
Disallow configuring EAP-TLS without a user certificate,
since this is probably an invalid configuration.
Also:
- change the wording of the default option for
EAP CA and user certificates from "(unspecified)" to
"Please select", to make it obvious that a choice
needs to be made to proceed.
- Fix style issues found in WifiConfigController.java by checkstyle.py.
BUG:
26686071
Change-Id: I7ccfdf40db97328e3297a03cc43033ff2428980f
TEST: Save option is grayed out when configuring EAP-TLS network
TEST: while leaving "User Certificate" left at "Please select".
Samuel Tan [Wed, 27 Jan 2016 22:07:51 +0000 (22:07 +0000)]
Display warning if users does not provide CA cert in EAP config
am:
03a117bcfa -s ours
* commit '
03a117bcfaf7c3628da8f2fe57d9be69056dcdf1':
Display warning if users does not provide CA cert in EAP config
Samuel Tan [Wed, 27 Jan 2016 22:04:30 +0000 (22:04 +0000)]
Add menu options for not specifying a EAP CA cert and User cert
am:
30f7b5a7cf -s ours
* commit '
30f7b5a7cfddc7bc3b0faa8aec3740f58dd514c3':
Add menu options for not specifying a EAP CA cert and User cert
Samuel Tan [Wed, 27 Jan 2016 22:01:09 +0000 (22:01 +0000)]
Disable configuring EAP-TLS without user certificate.
am:
933b6ed98f -s ours
* commit '
933b6ed98fc2209c57e067fcfec21791497f7811':
Disable configuring EAP-TLS without user certificate.
Jason Monk [Wed, 27 Jan 2016 20:34:44 +0000 (20:34 +0000)]
Merge changes Id18f3e9f,I737736d6
* changes:
Add additional fingerprints suggestion
Add wifi calling suggestion
Jason Monk [Wed, 27 Jan 2016 19:39:22 +0000 (14:39 -0500)]
Add additional fingerprints suggestion
Change-Id: Id18f3e9fffb1f9e964edb635689d3c7d410034fa
Sanket Padawe [Wed, 27 Jan 2016 18:59:45 +0000 (18:59 +0000)]
[DO NOT MERGE] Disable configuring EAP-TLS/TTLS/PEAP without CA certificates.
am:
30e812b731 -s ours
* commit '
30e812b7317d5f7e6eb6ca28c02c016e6b3cbf7e':
[DO NOT MERGE] Disable configuring EAP-TLS/TTLS/PEAP without CA certificates.
Jason Monk [Wed, 27 Jan 2016 18:54:35 +0000 (13:54 -0500)]
Add wifi calling suggestion
Change-Id: I737736d675fe0a4606ff1ccfd7d4ec6b69e1fd73
Noah Wang [Wed, 27 Jan 2016 18:49:02 +0000 (18:49 +0000)]
Merge "Reflect settings change right after interaction"
Udam Saini [Wed, 27 Jan 2016 18:08:48 +0000 (18:08 +0000)]
Merge "Adds screen lock as a suggested activity"
Tony Mak [Wed, 27 Jan 2016 17:17:44 +0000 (17:17 +0000)]
Merge "Default apps setting for managed profile"
Jason Monk [Wed, 27 Jan 2016 16:33:34 +0000 (11:33 -0500)]
Fix multi-sim cell data pref ?
Bug:
26795856
Change-Id: I82e18c21d819d51712a65ccc37e4e3af9a006771
Geoff Mendal [Wed, 27 Jan 2016 16:26:06 +0000 (16:26 +0000)]
Import translations. DO NOT MERGE am:
963c4b3d41 -s ours am:
495ba780b9 -s ours
am:
a43de57411 -s ours
* commit '
a43de574118046520a71afc4ad14c524611ec4c0':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 27 Jan 2016 16:25:57 +0000 (16:25 +0000)]
Import translations. DO NOT MERGE am:
9c57679b0e -s ours
am:
ec30b691de -s ours
* commit '
ec30b691de360ebc0030e799dd5f42ed90720ada':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 27 Jan 2016 16:24:10 +0000 (16:24 +0000)]
Import translations. DO NOT MERGE am:
963c4b3d41 -s ours
am:
495ba780b9 -s ours
* commit '
495ba780b98bc1333e613d96721355aa1003913b':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 27 Jan 2016 16:24:00 +0000 (16:24 +0000)]
Import translations. DO NOT MERGE
am:
9c57679b0e -s ours
* commit '
9c57679b0e06d9976bb4c72d442b3412d9220c43':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 27 Jan 2016 16:22:12 +0000 (16:22 +0000)]
Import translations. DO NOT MERGE
am:
963c4b3d41 -s ours
* commit '
963c4b3d41c872404e84d469b213cd5a84d6d3ec':
Import translations. DO NOT MERGE
Chris Wren [Tue, 26 Jan 2016 23:04:01 +0000 (18:04 -0500)]
port settings over to new metrics enum
Change-Id: I0b3efd2f4db773ccbc52bfe59ee8eb0dab9584fb
Geoff Mendal [Wed, 27 Jan 2016 15:34:25 +0000 (07:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: I528d633660acacb4ed8a3f1d6bf2b35b3ce3170d
Auto-generated-cl: translation import
Geoff Mendal [Wed, 27 Jan 2016 15:25:34 +0000 (07:25 -0800)]
Import translations. DO NOT MERGE
Change-Id: I11b283943bfe2746792e6a9ec3c3ca5f3f000832
Auto-generated-cl: translation import
Sudheer Shanka [Wed, 27 Jan 2016 15:15:29 +0000 (15:15 +0000)]
Merge "Made changes to menu items in WifiSettings and AccountSyncSettings."
Sudheer Shanka [Wed, 27 Jan 2016 15:15:06 +0000 (15:15 +0000)]
Merge "Add padlocks to more preferences in wireless settings."
Abodunrinwa Toki [Wed, 27 Jan 2016 15:12:02 +0000 (15:12 +0000)]
Merge "Settings app: Remove "Toggle keyboard shortcuts helper" button"
Geoff Mendal [Wed, 27 Jan 2016 14:44:12 +0000 (14:44 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 27 Jan 2016 14:35:44 +0000 (06:35 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iac589baa34417f61e2b483886f14d51ea81c90e3
Auto-generated-cl: translation import
Jason Monk [Wed, 27 Jan 2016 14:19:42 +0000 (14:19 +0000)]
Merge changes I81380323,I0cce76f3
* changes:
Add wallpaper suggestion if one isn't set.
Add DND Suggestion after 30 days