diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-02-20 23:06:08 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-02-20 23:06:08 +0100 |
| commit | 73652644f26b3cd0cbc7a2a4a310cee4d10dc38b (patch) | |
| tree | 4f45444afa392212b20797e00c4334543ca0b2fb /packages | |
| parent | dbd72cf82f0844de58b3b60bec5cb11a49e0bf22 (diff) | |
| parent | 8b77b66b55372e7f1e2892772d22b0fb00c22ba1 (diff) | |
| download | vendor_cmsdk-73652644f26b3cd0cbc7a2a4a310cee4d10dc38b.zip vendor_cmsdk-73652644f26b3cd0cbc7a2a4a310cee4d10dc38b.tar.gz vendor_cmsdk-73652644f26b3cd0cbc7a2a4a310cee4d10dc38b.tar.bz2 | |
Merge remote-tracking branch 'lineageos/cm-13.0' into replicant-6.0
Diffstat (limited to 'packages')
3 files changed, 23 insertions, 1 deletions
diff --git a/packages/CMSettingsProvider/res/values-ja/strings.xml b/packages/CMSettingsProvider/res/values-ja/strings.xml index 101423f..0977b14 100644 --- a/packages/CMSettingsProvider/res/values-ja/strings.xml +++ b/packages/CMSettingsProvider/res/values-ja/strings.xml @@ -16,5 +16,5 @@ limitations under the License. --> <resources> - <string name="app_name">CM設定ストレージ</string> + <string name="app_name">LineageOS 設定ストレージ</string> </resources> diff --git a/packages/CMSettingsProvider/res/values-sr-rCS/strings.xml b/packages/CMSettingsProvider/res/values-sr-rCS/strings.xml new file mode 100644 index 0000000..0647eaf --- /dev/null +++ b/packages/CMSettingsProvider/res/values-sr-rCS/strings.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<!--Generated by crowdin.com--> +<!-- + Copyright (C) 2014-2015 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<resources></resources> diff --git a/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderTest.java b/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderTest.java index 306436f..c4db088 100644 --- a/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderTest.java +++ b/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderTest.java @@ -126,7 +126,11 @@ import java.util.Map; * they may change at slightly different times. * * Test whether the setting was properly set and is not null. + * + * @deprecated Replaced by {@link Settings.Global#DEVICE_PROVISIONED} + * or {@link Settings.Secure#USER_SETUP_COMPLETE} */ + @Deprecated @SmallTest public void testCMProvisionedFlagFallbackSet() { final String newCmFlag = CMSettings.Secure.getStringForUser( |