diff options
| author | wangjing <wangjing@codeaurora.org> | 2015-04-15 14:45:13 +0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-02-03 11:51:06 -0800 |
| commit | 22869c183610b9c9e17d7cb820f6e7d70daeb93e (patch) | |
| tree | 712670d11c000ffa18ef8108f07d77a6b987881e /packages/SettingsProvider/src | |
| parent | 247d6d5c486ea33b378dc7ee2aa93a5e9e800bc1 (diff) | |
| download | frameworks_base-22869c183610b9c9e17d7cb820f6e7d70daeb93e.zip frameworks_base-22869c183610b9c9e17d7cb820f6e7d70daeb93e.tar.gz frameworks_base-22869c183610b9c9e17d7cb820f6e7d70daeb93e.tar.bz2 | |
Default time format is hard coded to 24
The items "def_time/date_format" will be hard coded for Default.
So should set "def_time/date_format" to be null in order to bring
back the AOSP implementation of picking the date format based on
the locale for Default
OPO-431
Change-Id: Ia5d74662782bcc00a8173fd49604f187a116468e
Diffstat (limited to 'packages/SettingsProvider/src')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 12 |
1 files changed, 8 insertions, 4 deletions
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(); } |