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

Commit dc8d3fcc authored by wangjing's avatar wangjing
Browse files

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

Change-Id: Ia5d74662782bcc00a8173fd49604f187a116468e
parent 3518a75b

packages/SettingsProvider/res/values/customize.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -99,10 +99,10 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
    <integer name="def_voice_call_earpiece_volume" translatable="false">4</integer>

    <integer name="def_voice_call_earpiece_volume" translatable="false">4</integer>





    <!-- Time format,default vlaue is 24 : 24 format,other value is 12 format -->

    <!-- 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 -->

    <!-- 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

         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 Original line Diff line number Diff line
@@ -2393,11 +2393,15 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
            loadIntegerSetting(stmt, Settings.System.POINTER_SPEED,

            loadIntegerSetting(stmt, Settings.System.POINTER_SPEED,

                    R.integer.def_pointer_speed);

                    R.integer.def_pointer_speed);





            if (!TextUtils.isEmpty(mContext.getResources().getString(R.string.def_time_format))) {

                loadStringSetting(stmt, Settings.System.TIME_12_24,

                loadStringSetting(stmt, Settings.System.TIME_12_24,

                        R.string.def_time_format);

                        R.string.def_time_format);

            }





            if (!TextUtils.isEmpty(mContext.getResources().getString(R.string.def_date_format))) {

                loadStringSetting(stmt, Settings.System.DATE_FORMAT,

                loadStringSetting(stmt, Settings.System.DATE_FORMAT,

                        R.string.def_date_format);

                        R.string.def_date_format);

            }





            loadBooleanSetting(stmt, Settings.System.STATUS_BAR_SHOW_BATTERY_PERCENT,

            loadBooleanSetting(stmt, Settings.System.STATUS_BAR_SHOW_BATTERY_PERCENT,

                    R.bool.def_status_bar_show_battery_percent);

                    R.bool.def_status_bar_show_battery_percent);