From f2a9674bf255f1a8c850d54430b1c65618f1f8b7 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 17 Mar 2016 21:55:39 +0200 Subject: Automatic translation import Change-Id: I4af2a6a904e9229b261e95818f716d6b5708a6f4 --- .../res/values-ast-rES/strings.xml | 1 + .../SettingsProvider/res/values-be/strings.xml | 1 + .../SettingsProvider/res/values-br-rFR/strings.xml | 22 ++++++++++++++++++++++ .../SettingsProvider/res/values-cy/strings.xml | 22 ++++++++++++++++++++++ .../SettingsProvider/res/values-en-rPT/strings.xml | 22 ++++++++++++++++++++++ .../SettingsProvider/res/values-eo/strings.xml | 22 ++++++++++++++++++++++ .../SettingsProvider/res/values-es-rMX/strings.xml | 22 ++++++++++++++++++++++ .../SettingsProvider/res/values-fy-rNL/strings.xml | 22 ++++++++++++++++++++++ .../SettingsProvider/res/values-gd-rGB/strings.xml | 22 ++++++++++++++++++++++ .../SettingsProvider/res/values-ku/strings.xml | 1 + .../SettingsProvider/res/values-lb/strings.xml | 1 + .../SettingsProvider/res/values-oc-rFR/strings.xml | 22 ++++++++++++++++++++++ .../SettingsProvider/res/values-ug/strings.xml | 1 + 13 files changed, 181 insertions(+) create mode 100644 packages/SettingsProvider/res/values-br-rFR/strings.xml create mode 100644 packages/SettingsProvider/res/values-cy/strings.xml create mode 100644 packages/SettingsProvider/res/values-en-rPT/strings.xml create mode 100644 packages/SettingsProvider/res/values-eo/strings.xml create mode 100644 packages/SettingsProvider/res/values-es-rMX/strings.xml create mode 100644 packages/SettingsProvider/res/values-fy-rNL/strings.xml create mode 100644 packages/SettingsProvider/res/values-gd-rGB/strings.xml create mode 100644 packages/SettingsProvider/res/values-oc-rFR/strings.xml (limited to 'packages/SettingsProvider') diff --git a/packages/SettingsProvider/res/values-ast-rES/strings.xml b/packages/SettingsProvider/res/values-ast-rES/strings.xml index e4b0106..fa15ee4 100644 --- a/packages/SettingsProvider/res/values-ast-rES/strings.xml +++ b/packages/SettingsProvider/res/values-ast-rES/strings.xml @@ -18,5 +18,6 @@ */ --> + Axustes d\'almacenamientu diff --git a/packages/SettingsProvider/res/values-be/strings.xml b/packages/SettingsProvider/res/values-be/strings.xml index 2c3d4d7..d25ca6e 100644 --- a/packages/SettingsProvider/res/values-be/strings.xml +++ b/packages/SettingsProvider/res/values-be/strings.xml @@ -18,5 +18,6 @@ */ --> + Захоўванне налад diff --git a/packages/SettingsProvider/res/values-br-rFR/strings.xml b/packages/SettingsProvider/res/values-br-rFR/strings.xml new file mode 100644 index 0000000..ce94a95 --- /dev/null +++ b/packages/SettingsProvider/res/values-br-rFR/strings.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/packages/SettingsProvider/res/values-cy/strings.xml b/packages/SettingsProvider/res/values-cy/strings.xml new file mode 100644 index 0000000..ce94a95 --- /dev/null +++ b/packages/SettingsProvider/res/values-cy/strings.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/packages/SettingsProvider/res/values-en-rPT/strings.xml b/packages/SettingsProvider/res/values-en-rPT/strings.xml new file mode 100644 index 0000000..ce94a95 --- /dev/null +++ b/packages/SettingsProvider/res/values-en-rPT/strings.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/packages/SettingsProvider/res/values-eo/strings.xml b/packages/SettingsProvider/res/values-eo/strings.xml new file mode 100644 index 0000000..ce94a95 --- /dev/null +++ b/packages/SettingsProvider/res/values-eo/strings.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/packages/SettingsProvider/res/values-es-rMX/strings.xml b/packages/SettingsProvider/res/values-es-rMX/strings.xml new file mode 100644 index 0000000..ce94a95 --- /dev/null +++ b/packages/SettingsProvider/res/values-es-rMX/strings.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/packages/SettingsProvider/res/values-fy-rNL/strings.xml b/packages/SettingsProvider/res/values-fy-rNL/strings.xml new file mode 100644 index 0000000..ce94a95 --- /dev/null +++ b/packages/SettingsProvider/res/values-fy-rNL/strings.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/packages/SettingsProvider/res/values-gd-rGB/strings.xml b/packages/SettingsProvider/res/values-gd-rGB/strings.xml new file mode 100644 index 0000000..ce94a95 --- /dev/null +++ b/packages/SettingsProvider/res/values-gd-rGB/strings.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/packages/SettingsProvider/res/values-ku/strings.xml b/packages/SettingsProvider/res/values-ku/strings.xml index 097b8b7..9ae7925 100644 --- a/packages/SettingsProvider/res/values-ku/strings.xml +++ b/packages/SettingsProvider/res/values-ku/strings.xml @@ -18,5 +18,6 @@ */ --> + ڕێکخستنی بیرگە diff --git a/packages/SettingsProvider/res/values-lb/strings.xml b/packages/SettingsProvider/res/values-lb/strings.xml index c55b311..b553066 100644 --- a/packages/SettingsProvider/res/values-lb/strings.xml +++ b/packages/SettingsProvider/res/values-lb/strings.xml @@ -18,5 +18,6 @@ */ --> + Astellungsspäicher diff --git a/packages/SettingsProvider/res/values-oc-rFR/strings.xml b/packages/SettingsProvider/res/values-oc-rFR/strings.xml new file mode 100644 index 0000000..ce94a95 --- /dev/null +++ b/packages/SettingsProvider/res/values-oc-rFR/strings.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/packages/SettingsProvider/res/values-ug/strings.xml b/packages/SettingsProvider/res/values-ug/strings.xml index 28b9541..e5a1177 100644 --- a/packages/SettingsProvider/res/values-ug/strings.xml +++ b/packages/SettingsProvider/res/values-ug/strings.xml @@ -18,5 +18,6 @@ */ --> + ساقلىغۇچ تەڭشىكى -- cgit v1.1 From 6b44999628e81aaf3950b80c5fd2d8c931746c28 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Mon, 28 Mar 2016 00:43:27 +0300 Subject: Automatic translation import Change-Id: Ib371d8f862dced4aa36cfe076f876e9ae4bd62c2 --- .../SettingsProvider/res/values-as-rIN/strings.xml | 22 ++++++++++++++++++++++ .../SettingsProvider/res/values-or-rIN/strings.xml | 22 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 packages/SettingsProvider/res/values-as-rIN/strings.xml create mode 100644 packages/SettingsProvider/res/values-or-rIN/strings.xml (limited to 'packages/SettingsProvider') diff --git a/packages/SettingsProvider/res/values-as-rIN/strings.xml b/packages/SettingsProvider/res/values-as-rIN/strings.xml new file mode 100644 index 0000000..ce94a95 --- /dev/null +++ b/packages/SettingsProvider/res/values-as-rIN/strings.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/packages/SettingsProvider/res/values-or-rIN/strings.xml b/packages/SettingsProvider/res/values-or-rIN/strings.xml new file mode 100644 index 0000000..ce94a95 --- /dev/null +++ b/packages/SettingsProvider/res/values-or-rIN/strings.xml @@ -0,0 +1,22 @@ + + + + + + -- cgit v1.1 From 967f4adb4aace868aefe0ec88efd13a3d29677d4 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 6 Apr 2016 01:14:45 +0300 Subject: Automatic translation import Change-Id: I3849e73aee18720b20529d406c7657c0a0cee320 --- .../res/values-frp-rIT/strings.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 packages/SettingsProvider/res/values-frp-rIT/strings.xml (limited to 'packages/SettingsProvider') diff --git a/packages/SettingsProvider/res/values-frp-rIT/strings.xml b/packages/SettingsProvider/res/values-frp-rIT/strings.xml new file mode 100644 index 0000000..ce94a95 --- /dev/null +++ b/packages/SettingsProvider/res/values-frp-rIT/strings.xml @@ -0,0 +1,22 @@ + + + + + + -- cgit v1.1 From 89c3e36c3149438b8d0e3e438923dc95a15237db Mon Sep 17 00:00:00 2001 From: Ankit Gupta Date: Wed, 17 Feb 2016 15:48:17 -0800 Subject: SettingsProvider: Allow default volume adjust sound to be overlayed. Issue-id: YAM-145 Change-Id: I06394c4fcfca5978b50a4186935ac6bda7b94b16 --- 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 76b7d6f..9ecbfdd 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -86,6 +86,7 @@ /system/media/audio/ui/Unlock.ogg /system/media/audio/ui/Trusted.ogg /system/media/audio/ui/WirelessChargingStarted.ogg + true 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 f5f8ce6..e61868f 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -2622,6 +2622,8 @@ class DatabaseHelper extends SQLiteOpenHelper { R.bool.def_sound_effects_enabled); loadBooleanSetting(stmt, Settings.System.HAPTIC_FEEDBACK_ENABLED, R.bool.def_haptic_feedback); + loadBooleanSetting(stmt, Settings.System.VOLUME_ADJUST_SOUNDS_ENABLED, + R.bool.def_volume_adjust_sounds_enabled); loadIntegerSetting(stmt, Settings.System.LOCKSCREEN_SOUNDS_ENABLED, R.integer.def_lockscreen_sounds_enabled); -- cgit v1.1 From f39d0b018bcd74126b9d5b0787da53714197044a Mon Sep 17 00:00:00 2001 From: "Christopher R. Palmer" Date: Wed, 6 Apr 2016 20:39:59 -0400 Subject: SettingsProvider: fix build for volume adjust sound to be overlayed Change-Id: I76c5b55dad37fc2f52221c3a63de892be5b93f85 --- .../src/com/android/providers/settings/DatabaseHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 e61868f..92e4f83 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -2622,7 +2622,7 @@ class DatabaseHelper extends SQLiteOpenHelper { R.bool.def_sound_effects_enabled); loadBooleanSetting(stmt, Settings.System.HAPTIC_FEEDBACK_ENABLED, R.bool.def_haptic_feedback); - loadBooleanSetting(stmt, Settings.System.VOLUME_ADJUST_SOUNDS_ENABLED, + loadBooleanSetting(stmt, CMSettings.System.VOLUME_ADJUST_SOUNDS_ENABLED, R.bool.def_volume_adjust_sounds_enabled); loadIntegerSetting(stmt, Settings.System.LOCKSCREEN_SOUNDS_ENABLED, -- cgit v1.1 From 999439bcdff8834771868b1e034ee97b81921fe3 Mon Sep 17 00:00:00 2001 From: Roman Birg Date: Wed, 13 Apr 2016 15:48:26 -0700 Subject: SettingsProvider: move SYSTEM_PROFILES_ENABLED to CMSettings When upgrading from 12.1 -> 13.0, we end up losing this setting because we forward all calls for that setting directly to the CMSettings table, which would not have a default set. Most of the code assumes profiles are on by default. So if the user had profiles disabled (and potentially in a state they were unaware of), the upgrade could cause some pains as it would ignore their old setting. Ticket: OPO-620 Change-Id: I2b645dc9422fe15daf62d89e77b3e1429c668c04 Signed-off-by: Roman Birg --- .../android/providers/settings/SettingsProvider.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'packages/SettingsProvider') diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 5c871ca..c075e0b 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -2023,6 +2023,7 @@ public class SettingsProvider extends ContentProvider { if ((oldVersion == newVersion || oldVersion == CM_SETTINGS_DB_VERSION)) { if (oldVersion == CM_SETTINGS_DB_VERSION && !hasReplayedDefaultsFromL()) { forceReplayAOSPDefaults(mUserId); + forceMigrateProfilesEnabled(mUserId); setDefaultsReplayedFromLFlag(); } return; @@ -2221,6 +2222,23 @@ public class SettingsProvider extends ContentProvider { } } + private void forceMigrateProfilesEnabled(int userId) { + final SettingsState systemSettings = getSystemSettingsLocked(userId); + final Setting settingLocked = systemSettings.getSettingLocked( + CMSettings.System.SYSTEM_PROFILES_ENABLED); + if (settingLocked != null) { + final String value = settingLocked.getValue(); + if (value != null) { + CMSettings.System.putStringForUser(getContext().getContentResolver(), + CMSettings.System.SYSTEM_PROFILES_ENABLED, + value, + userId); + systemSettings.deleteSettingLocked( + CMSettings.System.SYSTEM_PROFILES_ENABLED); + } + } + } + } } } -- cgit v1.1 From 2ae2ee68efc22649509fc68cc525b9f67b882736 Mon Sep 17 00:00:00 2001 From: Scott Mertz Date: Wed, 13 Apr 2016 19:47:29 -0700 Subject: LockPatternUtils: Use the actual user id to set pattern size Ticket: CYNGNOS-2462 Change-Id: Ia68e26ec2dfc23317135d933bc25204c1380bb02 --- .../src/com/android/providers/settings/DatabaseHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 92e4f83..143d4ec 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -2250,7 +2250,7 @@ class DatabaseHelper extends SQLiteOpenHelper { try { LockPatternUtils lpu = new LockPatternUtils(mContext); List cellPattern = - LockPatternUtils.stringToPattern(lockPattern, lpu.getLockPatternSize()); + LockPatternUtils.stringToPattern(lockPattern, lpu.getLockPatternSize(mUserHandle)); lpu.saveLockPattern(cellPattern, null, UserHandle.USER_OWNER); } catch (IllegalArgumentException e) { // Don't want corrupted lock pattern to hang the reboot process -- cgit v1.1 From 1e1fdf144ba50e38dd5e311ca319241cb1e14142 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sat, 16 Apr 2016 17:44:54 +0300 Subject: Automatic translation import Change-Id: Ib87e41106982b159d249ebbe0653e569f9c7b454 --- .../res/values-csb-rPL/strings.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 packages/SettingsProvider/res/values-csb-rPL/strings.xml (limited to 'packages/SettingsProvider') diff --git a/packages/SettingsProvider/res/values-csb-rPL/strings.xml b/packages/SettingsProvider/res/values-csb-rPL/strings.xml new file mode 100644 index 0000000..ce94a95 --- /dev/null +++ b/packages/SettingsProvider/res/values-csb-rPL/strings.xml @@ -0,0 +1,22 @@ + + + + + + -- cgit v1.1 From a1756e05539aa5e4031f5f165d3d98bcbb22ba0a Mon Sep 17 00:00:00 2001 From: Rohit Yengisetty Date: Fri, 9 Oct 2015 13:43:20 -0700 Subject: SettingsProvider : load region-specific settings load region specific mobile data and data roaming for EU and LATAM region for feijao. Issue-id: FEIJ-23 Change-Id: Icd250f6d2fd3978d4c34a88405e53d09e479b207 --- .../android/providers/settings/DatabaseHelper.java | 52 ++++++++++++++++++++-- 1 file changed, 48 insertions(+), 4 deletions(-) (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 143d4ec..8515fdc 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -44,6 +44,12 @@ import android.provider.Settings.Secure; import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; +import android.content.res.Configuration; +import android.content.res.Resources; +import android.content.res.AssetManager; +import android.util.DisplayMetrics; +import android.content.pm.PackageManager.NameNotFoundException; + import com.android.ims.ImsConfig; import com.android.internal.content.PackageHelper; @@ -102,6 +108,7 @@ class DatabaseHelper extends SQLiteOpenHelper { private static final String TABLE_SYSTEM = "system"; private static final String TABLE_SECURE = "secure"; private static final String TABLE_GLOBAL = "global"; + private String mPublicSrcDir; static { mValidTables.add(TABLE_SYSTEM); @@ -133,6 +140,13 @@ class DatabaseHelper extends SQLiteOpenHelper { super(context, dbNameForUser(userHandle), null, DATABASE_VERSION); mContext = context; mUserHandle = userHandle; + try { + String packageName = mContext.getPackageName(); + mPublicSrcDir = mContext.getPackageManager().getApplicationInfo(packageName, 0) + .publicSourceDir; + } catch (NameNotFoundException e) { + e.printStackTrace(); + } } public static boolean isValidTable(String name) { @@ -2841,7 +2855,7 @@ class DatabaseHelper extends SQLiteOpenHelper { RILConstants.CDMA_CELL_BROADCAST_SMS_DISABLED); // Data roaming default, based on build - loadBooleanSetting(stmt, Settings.Global.DATA_ROAMING, + loadRegionLockedBooleanSetting(stmt, Settings.Global.DATA_ROAMING, R.bool.def_enable_data_roaming); loadBooleanSetting(stmt, Settings.Global.DEVICE_PROVISIONED, @@ -2862,18 +2876,18 @@ class DatabaseHelper extends SQLiteOpenHelper { } // Mobile Data default, based on build - loadBooleanSetting(stmt, Settings.Global.MOBILE_DATA, + loadRegionLockedBooleanSetting(stmt, Settings.Global.MOBILE_DATA, R.bool.def_enable_mobile_data); int phoneCount = TelephonyManager.getDefault().getPhoneCount(); // SUB specific flags for Multisim devices for (int phoneId = 0; phoneId < MAX_PHONE_COUNT; phoneId++) { // Mobile Data default, based on build - loadBooleanSetting(stmt, Settings.Global.MOBILE_DATA + phoneId, + loadRegionLockedBooleanSetting(stmt, Settings.Global.MOBILE_DATA + phoneId, R.bool.def_enable_mobile_data); // Data roaming default, based on build - loadBooleanSetting(stmt, Settings.Global.DATA_ROAMING + phoneId, + loadRegionLockedBooleanSetting(stmt, Settings.Global.DATA_ROAMING + phoneId, R.bool.def_enable_data_roaming); } @@ -3000,6 +3014,36 @@ class DatabaseHelper extends SQLiteOpenHelper { stmt.execute(); } + private Resources getRegionLockedResources() { + Configuration tempConfiguration = new Configuration(); + String mcc = SystemProperties.get("ro.prebundled.mcc"); + Resources customResources = null; + if (!TextUtils.isEmpty(mcc)) { + tempConfiguration.mcc = Integer.parseInt(mcc); + AssetManager assetManager = new AssetManager(); + assetManager.addAssetPath(mPublicSrcDir); + customResources = new Resources(assetManager, new DisplayMetrics(), + tempConfiguration); + } + + return customResources; + } + + private void loadRegionLockedStringSetting(SQLiteStatement stmt, String key, int resid) { + Resources customResources = getRegionLockedResources(); + loadSetting(stmt, key, customResources == null ? mContext.getResources().getString(resid) + : customResources.getString(resid)); + } + + private void loadRegionLockedBooleanSetting(SQLiteStatement stmt, String key, int resId) { + Resources customResources = getRegionLockedResources(); + if (customResources == null) { + customResources = mContext.getResources(); + } + + loadSetting(stmt, key, customResources.getBoolean(resId) ? "1" : "0"); + } + private void loadStringSetting(SQLiteStatement stmt, String key, int resid) { loadSetting(stmt, key, mContext.getResources().getString(resid)); } -- cgit v1.1 From 5d52a18c9cc91182a754deeb699ac0a62413b5ce Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Mon, 2 May 2016 01:32:01 +0300 Subject: Partially revert "Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/frameworks/base into cm-13.0" This reverts commit 0e1dbed9194839a90755670d8fdf9046a75b85f7, reversing changes made to 564f10b8f05ddf4d9ea2c0e64f1b113fe6dad4b8. Change-Id: Ife3a8c9c898034d5161fbf25a03eaf173ec66246 --- .../SettingsProvider/res/values-gu-rIN/strings.xml | 23 ++++++++++++++++++++++ .../SettingsProvider/res/values-pt-rBR/strings.xml | 23 ++++++++++++++++++++++ .../SettingsProvider/res/values-pt-rPT/strings.xml | 2 +- .../SettingsProvider/res/values-sq-rAL/strings.xml | 23 ++++++++++++++++++++++ .../SettingsProvider/res/values-vi/strings.xml | 2 +- 5 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 packages/SettingsProvider/res/values-gu-rIN/strings.xml create mode 100644 packages/SettingsProvider/res/values-pt-rBR/strings.xml create mode 100644 packages/SettingsProvider/res/values-sq-rAL/strings.xml (limited to 'packages/SettingsProvider') diff --git a/packages/SettingsProvider/res/values-gu-rIN/strings.xml b/packages/SettingsProvider/res/values-gu-rIN/strings.xml new file mode 100644 index 0000000..7241974 --- /dev/null +++ b/packages/SettingsProvider/res/values-gu-rIN/strings.xml @@ -0,0 +1,23 @@ + + + + + "સેટિંગ્સ સંગ્રહ" + diff --git a/packages/SettingsProvider/res/values-pt-rBR/strings.xml b/packages/SettingsProvider/res/values-pt-rBR/strings.xml new file mode 100644 index 0000000..ade1746 --- /dev/null +++ b/packages/SettingsProvider/res/values-pt-rBR/strings.xml @@ -0,0 +1,23 @@ + + + + + "Armazenamento de configurações" + diff --git a/packages/SettingsProvider/res/values-pt-rPT/strings.xml b/packages/SettingsProvider/res/values-pt-rPT/strings.xml index 6bd62e3..c7dc9e6 100644 --- a/packages/SettingsProvider/res/values-pt-rPT/strings.xml +++ b/packages/SettingsProvider/res/values-pt-rPT/strings.xml @@ -19,5 +19,5 @@ - "Armazenamento de Definições" + "Armazenamento de definições" diff --git a/packages/SettingsProvider/res/values-sq-rAL/strings.xml b/packages/SettingsProvider/res/values-sq-rAL/strings.xml new file mode 100644 index 0000000..a8e66d5 --- /dev/null +++ b/packages/SettingsProvider/res/values-sq-rAL/strings.xml @@ -0,0 +1,23 @@ + + + + + "Hapësira ruajtëse e \"Cilësimeve\"" + diff --git a/packages/SettingsProvider/res/values-vi/strings.xml b/packages/SettingsProvider/res/values-vi/strings.xml index 504479d..015fbfd 100644 --- a/packages/SettingsProvider/res/values-vi/strings.xml +++ b/packages/SettingsProvider/res/values-vi/strings.xml @@ -19,5 +19,5 @@ - "Lưu trữ cài đặt" + "Lưu trữ bộ nhớ" -- cgit v1.1 From 971ea687427cc8ca09093fde962aadf90704f516 Mon Sep 17 00:00:00 2001 From: Danesh M Date: Fri, 13 May 2016 13:09:15 -0700 Subject: CMSettings : Move force_show_navbar to global Keep feature inline with 12.1, only allow owner to control the feature and mirror across users. Also add additional checks for moved settings. OPO-696 Change-Id: I81c942ab106fead12020107b99c0795a5b9aac98 --- .../src/com/android/providers/settings/DatabaseHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 8515fdc..a3aeaa9 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -2087,7 +2087,7 @@ class DatabaseHelper extends SQLiteOpenHelper { } String[] systemToSecure = new String[] { - CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR, + CMSettings.Global.DEV_FORCE_SHOW_NAVBAR, CMSettings.Secure.KEYBOARD_BRIGHTNESS, CMSettings.Secure.BUTTON_BRIGHTNESS, CMSettings.Secure.BUTTON_BACKLIGHT_TIMEOUT -- cgit v1.1 From 1d9d5901f26797d32553eaf5e767ad4e3a2eb12b Mon Sep 17 00:00:00 2001 From: Roman Birg Date: Mon, 11 Jul 2016 09:41:14 -0700 Subject: SettingsProvider: fix data_enabled default lookup We shouldn't set the MOBILE_DATA + phoneId keys because it will cause collisions with other parts of the system that actually query MOBILE_DATA + subId - leading to incorrect defaults. TelephonyManager.getIntWithSubId() actually falls back to just MOBILE_DATA for a specific sub id query, so we do not need to touch these values, since it applies the same default to all sub ids anyways. Ticket: CYNGNOS-3171 Change-Id: I38405000b3d641029080fb630eae4d128bd44719 Signed-off-by: Roman Birg --- .../src/com/android/providers/settings/DatabaseHelper.java | 10 ---------- 1 file changed, 10 deletions(-) (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 a3aeaa9..e4b2409 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -2880,16 +2880,6 @@ class DatabaseHelper extends SQLiteOpenHelper { R.bool.def_enable_mobile_data); int phoneCount = TelephonyManager.getDefault().getPhoneCount(); - // SUB specific flags for Multisim devices - for (int phoneId = 0; phoneId < MAX_PHONE_COUNT; phoneId++) { - // Mobile Data default, based on build - loadRegionLockedBooleanSetting(stmt, Settings.Global.MOBILE_DATA + phoneId, - R.bool.def_enable_mobile_data); - - // Data roaming default, based on build - loadRegionLockedBooleanSetting(stmt, Settings.Global.DATA_ROAMING + phoneId, - R.bool.def_enable_data_roaming); - } loadBooleanSetting(stmt, Settings.Global.NETSTATS_ENABLED, R.bool.def_netstats_enabled); -- cgit v1.1 From 138db497ea40e9fce0f14df403ca94340123ec5b Mon Sep 17 00:00:00 2001 From: "pinky@build01" Date: Sat, 27 Aug 2016 14:21:49 -0700 Subject: Automatic translation import Change-Id: If7eac9a9fa7e145c9d35ece91a8ccab33601a1ca Ticket: - --- .../SettingsProvider/res/values-bs-rBA/strings.xml | 22 ++++++++++++++++++++++ .../SettingsProvider/res/values-es-rCO/strings.xml | 22 ++++++++++++++++++++++ .../SettingsProvider/res/values-ga-rIE/strings.xml | 22 ++++++++++++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 packages/SettingsProvider/res/values-bs-rBA/strings.xml create mode 100644 packages/SettingsProvider/res/values-es-rCO/strings.xml create mode 100644 packages/SettingsProvider/res/values-ga-rIE/strings.xml (limited to 'packages/SettingsProvider') diff --git a/packages/SettingsProvider/res/values-bs-rBA/strings.xml b/packages/SettingsProvider/res/values-bs-rBA/strings.xml new file mode 100644 index 0000000..ce94a95 --- /dev/null +++ b/packages/SettingsProvider/res/values-bs-rBA/strings.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/packages/SettingsProvider/res/values-es-rCO/strings.xml b/packages/SettingsProvider/res/values-es-rCO/strings.xml new file mode 100644 index 0000000..ce94a95 --- /dev/null +++ b/packages/SettingsProvider/res/values-es-rCO/strings.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/packages/SettingsProvider/res/values-ga-rIE/strings.xml b/packages/SettingsProvider/res/values-ga-rIE/strings.xml new file mode 100644 index 0000000..ce94a95 --- /dev/null +++ b/packages/SettingsProvider/res/values-ga-rIE/strings.xml @@ -0,0 +1,22 @@ + + + + + + -- cgit v1.1