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

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

Merge "Regional: Customize date and time format and accessibility services"

parents dc94576a d18b35ac

packages/SettingsProvider/res/values/defaults.xml

+14 −0
Original line number Diff line number Diff line
@@ -276,4 +276,18 @@ 


    <!-- Voice Call earpiece Volume,its value is from 0 to 5,default value is 4 -->

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



    <!-- 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"></string>



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

    <string name="def_time_format" translatable="false"></string>



    <!-- enable accessibility or not,1:enable;0:disable -->

    <integer name="def_enable_accessibility">0</integer>



    <!-- for enable accessibility services,split by ":" ,

         example "com.google.android.marvin.talkback/

         com.google.android.marvin.talkback.TalkBackService" -->

    <string name="def_enable_accessibility_services" translatable="false"></string>

</resources>

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

+29 −0
Original line number Diff line number Diff line
@@ -2168,6 +2168,35 @@ public class SettingsProvider extends ContentProvider { 
                        final SettingsState systemSettings = getSystemSettingsLocked(userId);

                        loadCustomizedVolumeLevels(systemSettings);

                    }



                    // Allow OEMs to set date format, time format and enable/disable accessibility

                    // services in resource.

                    final SettingsState dateAndTimeSettings = getSystemSettingsLocked(userId);

                    String defaultStringComponent;

                    int defaultIntComponent;

                    defaultStringComponent = getContext().getResources().getString(

                            R.string.def_date_format);

                    if (!TextUtils.isEmpty(defaultStringComponent)) {

                        dateAndTimeSettings.insertSettingLocked(Settings.System.DATE_FORMAT,

                                defaultStringComponent,SettingsState.SYSTEM_PACKAGE_NAME);

                    }

                    defaultStringComponent = getContext().getResources().getString(

                            R.string.def_time_format);

                    if (!TextUtils.isEmpty(defaultStringComponent)) {

                        dateAndTimeSettings.insertSettingLocked(Settings.System.TIME_12_24,

                                defaultStringComponent,SettingsState.SYSTEM_PACKAGE_NAME);

                    }

                    defaultIntComponent = getContext().getResources().getInteger(

                            R.integer.def_enable_accessibility);

                    secureSettings.insertSettingLocked(Settings.Secure.ACCESSIBILITY_ENABLED,

                            String.valueOf(defaultIntComponent),SettingsState.SYSTEM_PACKAGE_NAME);

                    defaultStringComponent = getContext().getResources().getString(

                            R.string.def_enable_accessibility_services);

                    if (!TextUtils.isEmpty(defaultStringComponent)) {

                        secureSettings.insertSettingLocked(Settings.Secure.

                                ENABLED_ACCESSIBILITY_SERVICES,defaultStringComponent,

                                SettingsState.SYSTEM_PACKAGE_NAME);

                    }

                    currentVersion = 122;

                }

                // vXXX: Add new settings above this point.