From a89f9d93cbda665259812e990bca1045bd8abf9f Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Tue, 17 Nov 2015 18:01:52 -0800 Subject: Don't back up / restore EAP network definitions Bug 25725016 Cherrypick from AOSP. Change-Id: I6aa11a76e7724a0aaad05a1aa074afa2c429370c --- .../providers/settings/SettingsBackupAgent.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'packages/SettingsProvider') diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java index b9a9c24..2e96f18 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java @@ -159,6 +159,7 @@ public class SettingsBackupAgent extends BackupAgentHelper { String key_mgmt = ""; boolean certUsed = false; boolean hasWepKey = false; + boolean isEap = false; final ArrayList rawLines = new ArrayList(); public static Network readFromStream(BufferedReader in) { @@ -189,6 +190,9 @@ public class SettingsBackupAgent extends BackupAgentHelper { ssid = line; } else if (line.startsWith("key_mgmt=")) { key_mgmt = line; + if (line.contains("EAP")) { + isEap = true; + } } else if (line.startsWith("client_cert=")) { certUsed = true; } else if (line.startsWith("ca_cert=")) { @@ -197,6 +201,8 @@ public class SettingsBackupAgent extends BackupAgentHelper { certUsed = true; } else if (line.startsWith("wep_")) { hasWepKey = true; + } else if (line.startsWith("eap=")) { + isEap = true; } } @@ -325,6 +331,13 @@ public class SettingsBackupAgent extends BackupAgentHelper { continue; } } + // Don't propagate EAP network definitions + if (net.isEap) { + if (DEBUG_BACKUP) { + Log.v(TAG, "Skipping EAP network " + net.ssid + " / " + net.key_mgmt); + } + continue; + } if (! mKnownNetworks.contains(net)) { if (DEBUG_BACKUP) { Log.v(TAG, "Adding " + net.ssid + " / " + net.key_mgmt); @@ -353,6 +366,12 @@ public class SettingsBackupAgent extends BackupAgentHelper { continue; } + if (net.isEap) { + // Similarly, omit EAP network definitions to avoid propagating + // controlled enterprise network definitions. + continue; + } + net.write(w); } } -- cgit v1.1 From ec85f34812b0f66715ad5ae4d1485f98a690746c Mon Sep 17 00:00:00 2001 From: Bryce Lee Date: Wed, 16 Dec 2015 13:32:28 -0800 Subject: Add setting for declaring disabled bluetooth profiles. Bug: 25900899 Change-Id: I420a7c590d72ba10f3e466d15dccfdbb520e810a --- packages/SettingsProvider/res/values/defaults.xml | 1 + .../src/com/android/providers/settings/SettingsProvider.java | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'packages/SettingsProvider') diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 1cd2908..ef32c19 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -25,6 +25,7 @@ cell,bluetooth,wifi,nfc,wimax bluetooth,wifi,nfc + 0 true true true diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 73971ad..aa00f7d 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -1855,7 +1855,7 @@ public class SettingsProvider extends ContentProvider { } private final class UpgradeController { - private static final int SETTINGS_VERSION = 122; + private static final int SETTINGS_VERSION = 123; private final int mUserId; @@ -2007,6 +2007,16 @@ public class SettingsProvider extends ContentProvider { } currentVersion = 122; } + + if (currentVersion == 122) { + final SettingsState globalSettings = getGlobalSettingsLocked(); + String defaultDisabledProfiles = (getContext().getResources().getString( + R.string.def_bluetooth_disabled_profiles)); + globalSettings.insertSettingLocked(Settings.Global.BLUETOOTH_DISABLED_PROFILES, + defaultDisabledProfiles, SettingsState.SYSTEM_PACKAGE_NAME); + currentVersion = 123; + } + // vXXX: Add new settings above this point. // Return the current version. -- cgit v1.1 From fd87e92a42b659be5b120c59d9413d41e94b6753 Mon Sep 17 00:00:00 2001 From: Geoff Mendal Date: Mon, 21 Dec 2015 06:50:08 -0800 Subject: Import translations. DO NOT MERGE Change-Id: If00b01a244af6221a01d0c060c58da7389fd1b35 Auto-generated-cl: translation import --- .../SettingsProvider/res/values-af/defaults.xml | 1 + .../SettingsProvider/res/values-am/defaults.xml | 1 + .../SettingsProvider/res/values-ar/defaults.xml | 1 + .../res/values-az-rAZ/defaults.xml | 25 ++++++++++++++++++++++ .../SettingsProvider/res/values-bg/defaults.xml | 1 + .../res/values-bn-rBD/defaults.xml | 1 + .../SettingsProvider/res/values-ca/defaults.xml | 1 + .../SettingsProvider/res/values-cs/defaults.xml | 1 + .../SettingsProvider/res/values-da/defaults.xml | 1 + .../SettingsProvider/res/values-de/defaults.xml | 1 + .../SettingsProvider/res/values-el/defaults.xml | 1 + .../res/values-en-rAU/defaults.xml | 1 + .../res/values-en-rGB/defaults.xml | 1 + .../res/values-en-rIN/defaults.xml | 1 + .../res/values-es-rUS/defaults.xml | 1 + .../SettingsProvider/res/values-es/defaults.xml | 1 + .../res/values-et-rEE/defaults.xml | 1 + .../res/values-eu-rES/defaults.xml | 1 + .../SettingsProvider/res/values-fa/defaults.xml | 1 + .../SettingsProvider/res/values-fi/defaults.xml | 1 + .../res/values-fr-rCA/defaults.xml | 1 + .../SettingsProvider/res/values-fr/defaults.xml | 1 + .../res/values-gl-rES/defaults.xml | 1 + .../res/values-gu-rIN/defaults.xml | 25 ++++++++++++++++++++++ .../SettingsProvider/res/values-hi/defaults.xml | 1 + .../SettingsProvider/res/values-hr/defaults.xml | 1 + .../SettingsProvider/res/values-hu/defaults.xml | 1 + .../res/values-hy-rAM/defaults.xml | 1 + .../SettingsProvider/res/values-in/defaults.xml | 1 + .../res/values-is-rIS/defaults.xml | 1 + .../SettingsProvider/res/values-it/defaults.xml | 1 + .../SettingsProvider/res/values-iw/defaults.xml | 1 + .../SettingsProvider/res/values-ja/defaults.xml | 1 + .../res/values-ka-rGE/defaults.xml | 1 + .../res/values-kk-rKZ/defaults.xml | 1 + .../res/values-km-rKH/defaults.xml | 1 + .../res/values-kn-rIN/defaults.xml | 1 + .../SettingsProvider/res/values-ko/defaults.xml | 1 + .../res/values-ky-rKG/defaults.xml | 1 + .../res/values-lo-rLA/defaults.xml | 1 + .../SettingsProvider/res/values-lt/defaults.xml | 1 + .../SettingsProvider/res/values-lv/defaults.xml | 1 + .../res/values-mk-rMK/defaults.xml | 1 + .../res/values-ml-rIN/defaults.xml | 1 + .../res/values-mn-rMN/defaults.xml | 1 + .../res/values-mr-rIN/defaults.xml | 1 + .../res/values-ms-rMY/defaults.xml | 1 + .../res/values-my-rMM/defaults.xml | 1 + .../SettingsProvider/res/values-nb/defaults.xml | 1 + .../res/values-ne-rNP/defaults.xml | 1 + .../SettingsProvider/res/values-nl/defaults.xml | 1 + .../res/values-pa-rIN/defaults.xml | 1 + .../SettingsProvider/res/values-pl/defaults.xml | 1 + .../res/values-pt-rBR/defaults.xml | 25 ++++++++++++++++++++++ .../res/values-pt-rPT/defaults.xml | 1 + .../SettingsProvider/res/values-pt/defaults.xml | 1 + .../SettingsProvider/res/values-ro/defaults.xml | 1 + .../SettingsProvider/res/values-ru/defaults.xml | 1 + .../res/values-si-rLK/defaults.xml | 1 + .../SettingsProvider/res/values-sk/defaults.xml | 1 + .../SettingsProvider/res/values-sl/defaults.xml | 1 + .../res/values-sq-rAL/defaults.xml | 1 + .../SettingsProvider/res/values-sr/defaults.xml | 1 + .../SettingsProvider/res/values-sv/defaults.xml | 1 + .../SettingsProvider/res/values-sw/defaults.xml | 1 + .../res/values-ta-rIN/defaults.xml | 1 + .../res/values-te-rIN/defaults.xml | 1 + .../SettingsProvider/res/values-th/defaults.xml | 1 + .../SettingsProvider/res/values-tl/defaults.xml | 1 + .../SettingsProvider/res/values-tr/defaults.xml | 1 + .../SettingsProvider/res/values-uk/defaults.xml | 1 + .../res/values-ur-rPK/defaults.xml | 1 + .../res/values-uz-rUZ/defaults.xml | 1 + .../SettingsProvider/res/values-vi/defaults.xml | 1 + .../res/values-zh-rCN/defaults.xml | 1 + .../res/values-zh-rHK/defaults.xml | 1 + .../res/values-zh-rTW/defaults.xml | 1 + .../SettingsProvider/res/values-zu/defaults.xml | 1 + 78 files changed, 150 insertions(+) create mode 100644 packages/SettingsProvider/res/values-az-rAZ/defaults.xml create mode 100644 packages/SettingsProvider/res/values-gu-rIN/defaults.xml create mode 100644 packages/SettingsProvider/res/values-pt-rBR/defaults.xml (limited to 'packages/SettingsProvider') diff --git a/packages/SettingsProvider/res/values-af/defaults.xml b/packages/SettingsProvider/res/values-af/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-af/defaults.xml +++ b/packages/SettingsProvider/res/values-af/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-am/defaults.xml b/packages/SettingsProvider/res/values-am/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-am/defaults.xml +++ b/packages/SettingsProvider/res/values-am/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-ar/defaults.xml b/packages/SettingsProvider/res/values-ar/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-ar/defaults.xml +++ b/packages/SettingsProvider/res/values-ar/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-az-rAZ/defaults.xml b/packages/SettingsProvider/res/values-az-rAZ/defaults.xml new file mode 100644 index 0000000..4a87a12 --- /dev/null +++ b/packages/SettingsProvider/res/values-az-rAZ/defaults.xml @@ -0,0 +1,25 @@ + + + + + "%1$s %2$s" + "%1$s" + + diff --git a/packages/SettingsProvider/res/values-bg/defaults.xml b/packages/SettingsProvider/res/values-bg/defaults.xml index aee229e..715e78f 100644 --- a/packages/SettingsProvider/res/values-bg/defaults.xml +++ b/packages/SettingsProvider/res/values-bg/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%2$s от %1$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-bn-rBD/defaults.xml b/packages/SettingsProvider/res/values-bn-rBD/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-bn-rBD/defaults.xml +++ b/packages/SettingsProvider/res/values-bn-rBD/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-ca/defaults.xml b/packages/SettingsProvider/res/values-ca/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-ca/defaults.xml +++ b/packages/SettingsProvider/res/values-ca/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-cs/defaults.xml b/packages/SettingsProvider/res/values-cs/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-cs/defaults.xml +++ b/packages/SettingsProvider/res/values-cs/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-da/defaults.xml b/packages/SettingsProvider/res/values-da/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-da/defaults.xml +++ b/packages/SettingsProvider/res/values-da/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-de/defaults.xml b/packages/SettingsProvider/res/values-de/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-de/defaults.xml +++ b/packages/SettingsProvider/res/values-de/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-el/defaults.xml b/packages/SettingsProvider/res/values-el/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-el/defaults.xml +++ b/packages/SettingsProvider/res/values-el/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-en-rAU/defaults.xml b/packages/SettingsProvider/res/values-en-rAU/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-en-rAU/defaults.xml +++ b/packages/SettingsProvider/res/values-en-rAU/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-en-rGB/defaults.xml b/packages/SettingsProvider/res/values-en-rGB/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-en-rGB/defaults.xml +++ b/packages/SettingsProvider/res/values-en-rGB/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-en-rIN/defaults.xml b/packages/SettingsProvider/res/values-en-rIN/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-en-rIN/defaults.xml +++ b/packages/SettingsProvider/res/values-en-rIN/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-es-rUS/defaults.xml b/packages/SettingsProvider/res/values-es-rUS/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-es-rUS/defaults.xml +++ b/packages/SettingsProvider/res/values-es-rUS/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-es/defaults.xml b/packages/SettingsProvider/res/values-es/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-es/defaults.xml +++ b/packages/SettingsProvider/res/values-es/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-et-rEE/defaults.xml b/packages/SettingsProvider/res/values-et-rEE/defaults.xml index 71e91ae..5ec05cb 100644 --- a/packages/SettingsProvider/res/values-et-rEE/defaults.xml +++ b/packages/SettingsProvider/res/values-et-rEE/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%2$s, %1$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-eu-rES/defaults.xml b/packages/SettingsProvider/res/values-eu-rES/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-eu-rES/defaults.xml +++ b/packages/SettingsProvider/res/values-eu-rES/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-fa/defaults.xml b/packages/SettingsProvider/res/values-fa/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-fa/defaults.xml +++ b/packages/SettingsProvider/res/values-fa/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-fi/defaults.xml b/packages/SettingsProvider/res/values-fi/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-fi/defaults.xml +++ b/packages/SettingsProvider/res/values-fi/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-fr-rCA/defaults.xml b/packages/SettingsProvider/res/values-fr-rCA/defaults.xml index beba56e..b728013 100644 --- a/packages/SettingsProvider/res/values-fr-rCA/defaults.xml +++ b/packages/SettingsProvider/res/values-fr-rCA/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%2$s de %1$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-fr/defaults.xml b/packages/SettingsProvider/res/values-fr/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-fr/defaults.xml +++ b/packages/SettingsProvider/res/values-fr/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-gl-rES/defaults.xml b/packages/SettingsProvider/res/values-gl-rES/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-gl-rES/defaults.xml +++ b/packages/SettingsProvider/res/values-gl-rES/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-gu-rIN/defaults.xml b/packages/SettingsProvider/res/values-gu-rIN/defaults.xml new file mode 100644 index 0000000..4a87a12 --- /dev/null +++ b/packages/SettingsProvider/res/values-gu-rIN/defaults.xml @@ -0,0 +1,25 @@ + + + + + "%1$s %2$s" + "%1$s" + + diff --git a/packages/SettingsProvider/res/values-hi/defaults.xml b/packages/SettingsProvider/res/values-hi/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-hi/defaults.xml +++ b/packages/SettingsProvider/res/values-hi/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-hr/defaults.xml b/packages/SettingsProvider/res/values-hr/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-hr/defaults.xml +++ b/packages/SettingsProvider/res/values-hr/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-hu/defaults.xml b/packages/SettingsProvider/res/values-hu/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-hu/defaults.xml +++ b/packages/SettingsProvider/res/values-hu/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-hy-rAM/defaults.xml b/packages/SettingsProvider/res/values-hy-rAM/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-hy-rAM/defaults.xml +++ b/packages/SettingsProvider/res/values-hy-rAM/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-in/defaults.xml b/packages/SettingsProvider/res/values-in/defaults.xml index 012a65f..71f1d3b 100644 --- a/packages/SettingsProvider/res/values-in/defaults.xml +++ b/packages/SettingsProvider/res/values-in/defaults.xml @@ -23,4 +23,5 @@ + diff --git a/packages/SettingsProvider/res/values-is-rIS/defaults.xml b/packages/SettingsProvider/res/values-is-rIS/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-is-rIS/defaults.xml +++ b/packages/SettingsProvider/res/values-is-rIS/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-it/defaults.xml b/packages/SettingsProvider/res/values-it/defaults.xml index 3ea32a1..524132e 100644 --- a/packages/SettingsProvider/res/values-it/defaults.xml +++ b/packages/SettingsProvider/res/values-it/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%2$s %1$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-iw/defaults.xml b/packages/SettingsProvider/res/values-iw/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-iw/defaults.xml +++ b/packages/SettingsProvider/res/values-iw/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-ja/defaults.xml b/packages/SettingsProvider/res/values-ja/defaults.xml index 3ea32a1..524132e 100644 --- a/packages/SettingsProvider/res/values-ja/defaults.xml +++ b/packages/SettingsProvider/res/values-ja/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%2$s %1$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-ka-rGE/defaults.xml b/packages/SettingsProvider/res/values-ka-rGE/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-ka-rGE/defaults.xml +++ b/packages/SettingsProvider/res/values-ka-rGE/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-kk-rKZ/defaults.xml b/packages/SettingsProvider/res/values-kk-rKZ/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-kk-rKZ/defaults.xml +++ b/packages/SettingsProvider/res/values-kk-rKZ/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-km-rKH/defaults.xml b/packages/SettingsProvider/res/values-km-rKH/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-km-rKH/defaults.xml +++ b/packages/SettingsProvider/res/values-km-rKH/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-kn-rIN/defaults.xml b/packages/SettingsProvider/res/values-kn-rIN/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-kn-rIN/defaults.xml +++ b/packages/SettingsProvider/res/values-kn-rIN/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-ko/defaults.xml b/packages/SettingsProvider/res/values-ko/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-ko/defaults.xml +++ b/packages/SettingsProvider/res/values-ko/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-ky-rKG/defaults.xml b/packages/SettingsProvider/res/values-ky-rKG/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-ky-rKG/defaults.xml +++ b/packages/SettingsProvider/res/values-ky-rKG/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-lo-rLA/defaults.xml b/packages/SettingsProvider/res/values-lo-rLA/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-lo-rLA/defaults.xml +++ b/packages/SettingsProvider/res/values-lo-rLA/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-lt/defaults.xml b/packages/SettingsProvider/res/values-lt/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-lt/defaults.xml +++ b/packages/SettingsProvider/res/values-lt/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-lv/defaults.xml b/packages/SettingsProvider/res/values-lv/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-lv/defaults.xml +++ b/packages/SettingsProvider/res/values-lv/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-mk-rMK/defaults.xml b/packages/SettingsProvider/res/values-mk-rMK/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-mk-rMK/defaults.xml +++ b/packages/SettingsProvider/res/values-mk-rMK/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-ml-rIN/defaults.xml b/packages/SettingsProvider/res/values-ml-rIN/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-ml-rIN/defaults.xml +++ b/packages/SettingsProvider/res/values-ml-rIN/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-mn-rMN/defaults.xml b/packages/SettingsProvider/res/values-mn-rMN/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-mn-rMN/defaults.xml +++ b/packages/SettingsProvider/res/values-mn-rMN/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-mr-rIN/defaults.xml b/packages/SettingsProvider/res/values-mr-rIN/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-mr-rIN/defaults.xml +++ b/packages/SettingsProvider/res/values-mr-rIN/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-ms-rMY/defaults.xml b/packages/SettingsProvider/res/values-ms-rMY/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-ms-rMY/defaults.xml +++ b/packages/SettingsProvider/res/values-ms-rMY/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-my-rMM/defaults.xml b/packages/SettingsProvider/res/values-my-rMM/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-my-rMM/defaults.xml +++ b/packages/SettingsProvider/res/values-my-rMM/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-nb/defaults.xml b/packages/SettingsProvider/res/values-nb/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-nb/defaults.xml +++ b/packages/SettingsProvider/res/values-nb/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-ne-rNP/defaults.xml b/packages/SettingsProvider/res/values-ne-rNP/defaults.xml index 012a65f..71f1d3b 100644 --- a/packages/SettingsProvider/res/values-ne-rNP/defaults.xml +++ b/packages/SettingsProvider/res/values-ne-rNP/defaults.xml @@ -23,4 +23,5 @@ + diff --git a/packages/SettingsProvider/res/values-nl/defaults.xml b/packages/SettingsProvider/res/values-nl/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-nl/defaults.xml +++ b/packages/SettingsProvider/res/values-nl/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-pa-rIN/defaults.xml b/packages/SettingsProvider/res/values-pa-rIN/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-pa-rIN/defaults.xml +++ b/packages/SettingsProvider/res/values-pa-rIN/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-pl/defaults.xml b/packages/SettingsProvider/res/values-pl/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-pl/defaults.xml +++ b/packages/SettingsProvider/res/values-pl/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-pt-rBR/defaults.xml b/packages/SettingsProvider/res/values-pt-rBR/defaults.xml new file mode 100644 index 0000000..4a87a12 --- /dev/null +++ b/packages/SettingsProvider/res/values-pt-rBR/defaults.xml @@ -0,0 +1,25 @@ + + + + + "%1$s %2$s" + "%1$s" + + diff --git a/packages/SettingsProvider/res/values-pt-rPT/defaults.xml b/packages/SettingsProvider/res/values-pt-rPT/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-pt-rPT/defaults.xml +++ b/packages/SettingsProvider/res/values-pt-rPT/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-pt/defaults.xml b/packages/SettingsProvider/res/values-pt/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-pt/defaults.xml +++ b/packages/SettingsProvider/res/values-pt/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-ro/defaults.xml b/packages/SettingsProvider/res/values-ro/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-ro/defaults.xml +++ b/packages/SettingsProvider/res/values-ro/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-ru/defaults.xml b/packages/SettingsProvider/res/values-ru/defaults.xml index 3ea32a1..524132e 100644 --- a/packages/SettingsProvider/res/values-ru/defaults.xml +++ b/packages/SettingsProvider/res/values-ru/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%2$s %1$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-si-rLK/defaults.xml b/packages/SettingsProvider/res/values-si-rLK/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-si-rLK/defaults.xml +++ b/packages/SettingsProvider/res/values-si-rLK/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-sk/defaults.xml b/packages/SettingsProvider/res/values-sk/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-sk/defaults.xml +++ b/packages/SettingsProvider/res/values-sk/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-sl/defaults.xml b/packages/SettingsProvider/res/values-sl/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-sl/defaults.xml +++ b/packages/SettingsProvider/res/values-sl/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-sq-rAL/defaults.xml b/packages/SettingsProvider/res/values-sq-rAL/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-sq-rAL/defaults.xml +++ b/packages/SettingsProvider/res/values-sq-rAL/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-sr/defaults.xml b/packages/SettingsProvider/res/values-sr/defaults.xml index 3ea32a1..524132e 100644 --- a/packages/SettingsProvider/res/values-sr/defaults.xml +++ b/packages/SettingsProvider/res/values-sr/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%2$s %1$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-sv/defaults.xml b/packages/SettingsProvider/res/values-sv/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-sv/defaults.xml +++ b/packages/SettingsProvider/res/values-sv/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-sw/defaults.xml b/packages/SettingsProvider/res/values-sw/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-sw/defaults.xml +++ b/packages/SettingsProvider/res/values-sw/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-ta-rIN/defaults.xml b/packages/SettingsProvider/res/values-ta-rIN/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-ta-rIN/defaults.xml +++ b/packages/SettingsProvider/res/values-ta-rIN/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-te-rIN/defaults.xml b/packages/SettingsProvider/res/values-te-rIN/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-te-rIN/defaults.xml +++ b/packages/SettingsProvider/res/values-te-rIN/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-th/defaults.xml b/packages/SettingsProvider/res/values-th/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-th/defaults.xml +++ b/packages/SettingsProvider/res/values-th/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-tl/defaults.xml b/packages/SettingsProvider/res/values-tl/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-tl/defaults.xml +++ b/packages/SettingsProvider/res/values-tl/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-tr/defaults.xml b/packages/SettingsProvider/res/values-tr/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-tr/defaults.xml +++ b/packages/SettingsProvider/res/values-tr/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-uk/defaults.xml b/packages/SettingsProvider/res/values-uk/defaults.xml index 7655a19..a8e1fe8 100644 --- a/packages/SettingsProvider/res/values-uk/defaults.xml +++ b/packages/SettingsProvider/res/values-uk/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%2$s о %1$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-ur-rPK/defaults.xml b/packages/SettingsProvider/res/values-ur-rPK/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-ur-rPK/defaults.xml +++ b/packages/SettingsProvider/res/values-ur-rPK/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-uz-rUZ/defaults.xml b/packages/SettingsProvider/res/values-uz-rUZ/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-uz-rUZ/defaults.xml +++ b/packages/SettingsProvider/res/values-uz-rUZ/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-vi/defaults.xml b/packages/SettingsProvider/res/values-vi/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-vi/defaults.xml +++ b/packages/SettingsProvider/res/values-vi/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-zh-rCN/defaults.xml b/packages/SettingsProvider/res/values-zh-rCN/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-zh-rCN/defaults.xml +++ b/packages/SettingsProvider/res/values-zh-rCN/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-zh-rHK/defaults.xml b/packages/SettingsProvider/res/values-zh-rHK/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-zh-rHK/defaults.xml +++ b/packages/SettingsProvider/res/values-zh-rHK/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-zh-rTW/defaults.xml b/packages/SettingsProvider/res/values-zh-rTW/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-zh-rTW/defaults.xml +++ b/packages/SettingsProvider/res/values-zh-rTW/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + diff --git a/packages/SettingsProvider/res/values-zu/defaults.xml b/packages/SettingsProvider/res/values-zu/defaults.xml index 22443a5..4a87a12 100644 --- a/packages/SettingsProvider/res/values-zu/defaults.xml +++ b/packages/SettingsProvider/res/values-zu/defaults.xml @@ -21,4 +21,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "%1$s %2$s" "%1$s" + -- cgit v1.1 From 5711b9e460e76ee6dd6c3bbcf5565dcb650cd111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?eray=20or=C3=A7unus?= Date: Wed, 17 Jun 2015 16:12:19 +0300 Subject: lockscreen: Add option for showing unlock screen directly (1/3) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Option appears on PIN,pattern and password methods * User should press back button to see swipe-up-to-unlock screen. * Instantly hides keyguard if Smart Lock has unlocked phone. CYNGNOS-1873 Change-Id: I2ceeed348d7e61632b8344f35431f30cba62ca4f Signed-off-by: eray orçunus --- .../src/com/android/providers/settings/DatabaseHelper.java | 1 + 1 file changed, 1 insertion(+) (limited to 'packages/SettingsProvider') diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index ad4a614..2b5c14f 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -726,6 +726,7 @@ class DatabaseHelper extends SQLiteOpenHelper { Secure.LOCK_PATTERN_ENABLED, Secure.LOCK_PATTERN_VISIBLE, Secure.LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED, + CMSettings.Secure.LOCK_PASS_TO_SECURITY_VIEW, Secure.LOCK_PATTERN_SIZE, Secure.LOCK_DOTS_VISIBLE, Secure.LOCK_SHOW_ERROR_PATH, -- cgit v1.1 From 4c994ce23e0aa81a76efc2e6ec067e3563b8b891 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sun, 14 Feb 2016 16:22:46 +0200 Subject: Automatic translation import Change-Id: I6f7e9a4d7d72272d445319a26b386d7098aa26a4 --- .../SettingsProvider/res/values-be/strings.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 packages/SettingsProvider/res/values-be/strings.xml (limited to 'packages/SettingsProvider') diff --git a/packages/SettingsProvider/res/values-be/strings.xml b/packages/SettingsProvider/res/values-be/strings.xml new file mode 100644 index 0000000..2c3d4d7 --- /dev/null +++ b/packages/SettingsProvider/res/values-be/strings.xml @@ -0,0 +1,22 @@ + + + + + Захоўванне налад + -- cgit v1.1 From c014d6c5814fe766bc8ba586919e0986297b23d1 Mon Sep 17 00:00:00 2001 From: Ankit Gupta Date: Thu, 18 Feb 2016 11:39:51 -0800 Subject: SettingsProvider: allow ambient display/doze mode to be overlayed Issue-id: YAM-140 Change-Id: I3c296c645281509b7860e54d4e32790881d30ed6 (cherry picked from commit 3c1279528e3a6017ff42f2d7aa436be88c9022fa) --- packages/SettingsProvider/res/values/defaults.xml | 1 + .../src/com/android/providers/settings/DatabaseHelper.java | 2 ++ 2 files changed, 3 insertions(+) (limited to 'packages/SettingsProvider') diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 1346788..3ac4d51 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -41,6 +41,7 @@ 100% 100% true + false false false diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 2b5c14f..f5f8ce6 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -2710,6 +2710,8 @@ class DatabaseHelper extends SQLiteOpenHelper { com.android.internal.R.string.config_dreamsDefaultComponent); loadStringSetting(stmt, Settings.Secure.SCREENSAVER_DEFAULT_COMPONENT, com.android.internal.R.string.config_dreamsDefaultComponent); + loadBooleanSetting(stmt, Settings.Secure.DOZE_ENABLED, + R.bool.def_dozeEnabledByDefault); loadBooleanSetting(stmt, Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, R.bool.def_accessibility_display_magnification_enabled); -- cgit v1.1