Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22869c18 authored Apr 15, 2015 by wangjing Committed by Gerrit Code Review Feb 03, 2016

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

parent 247d6d5c

packages/SettingsProvider/res/values/customize.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+8 −4

Original line number	Diff line number	Diff line
		@@ -2600,11 +2600,15 @@ class DatabaseHelper extends SQLiteOpenHelper {
		*/

		//LEGACY CAF CHANGES
		if (!TextUtils.isEmpty(mContext.getResources().getString(R.string.def_time_format))) {
		loadStringSetting(stmt, Settings.System.TIME_12_24,
		R.string.def_time_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();
		}