diff options
| -rw-r--r-- | packages/SettingsProvider/res/values/customize.xml | 4 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/packages/SettingsProvider/res/values/customize.xml b/packages/SettingsProvider/res/values/customize.xml index b5e6648..9085d2d 100644 --- a/packages/SettingsProvider/res/values/customize.xml +++ b/packages/SettingsProvider/res/values/customize.xml @@ -30,10 +30,10 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <resources> <!-- Time format,default vlaue is 24 : 24 format,other value is 12 format --> - <string name="def_time_format" translatable="false">24</string> + <string name="def_time_format" translatable="false"></string> <!-- Date format,yyyy-MM-dd: 2013/07/30; MM-dd-yyyy:07/30/2013; dd-MM-yyyy:30/07/2013 --> - <string name="def_date_format" translatable="false">MM-dd-yyyy</string> + <string name="def_date_format" translatable="false"></string> <!-- Default Input Method, its value is from inputmethod's package name and main class name diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 1b8ef79..ad4a614 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -2600,11 +2600,15 @@ class DatabaseHelper extends SQLiteOpenHelper { */ //LEGACY CAF CHANGES - loadStringSetting(stmt, Settings.System.TIME_12_24, - R.string.def_time_format); + if (!TextUtils.isEmpty(mContext.getResources().getString(R.string.def_time_format))) { + loadStringSetting(stmt, Settings.System.TIME_12_24, + R.string.def_time_format); + } - loadStringSetting(stmt, Settings.System.DATE_FORMAT, - R.string.def_date_format); + if (!TextUtils.isEmpty(mContext.getResources().getString(R.string.def_date_format))) { + loadStringSetting(stmt, Settings.System.DATE_FORMAT, + R.string.def_date_format); + } } finally { if (stmt != null) stmt.close(); } |