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

Commit 21f030c9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Default time format is hard coded to 24"

parents eff3e44c dc8d3fcc

packages/SettingsProvider/res/values/customize.xml

+2 −2
Original line number 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>



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

                        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);

            }



            loadBooleanSetting(stmt, Settings.System.STATUS_BAR_SHOW_BATTERY_PERCENT,

                    R.bool.def_status_bar_show_battery_percent);