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

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

Merge "Setting: Support hotsopt idle feature."

parents 8d96eef6 83935b9a

AndroidManifest.xml

+6 −0
Original line number Diff line number Diff line
@@ -1623,6 +1623,12 @@ 
            </intent-filter>

        </receiver>



        <service android:name=".wifi.HotsoptService" >

            <intent-filter>

                <action android:name="com.android.settings.wifi.HotsoptService" />

            </intent-filter>

        </service>



        <!-- Standard picker for widgets -->

        <activity android:name="AppWidgetPickActivity"

                android:label="@string/widget_picker_title"

res/values/arrays.xml

+19 −0
Original line number Diff line number Diff line
@@ -1422,4 +1422,23 @@ 
        <item>China_Telecom</item>

        <item>roamingTextSearching</item>

    </string-array>



    <string-array name="wifi_hotsopt_mode_entries">

        <item>Always</item>

        <item>Turn off when idle for 5 min</item>

        <item>Turn off when idle for 10 min</item>

    </string-array>



    <string-array name="wifi_hotsopt_mode_entryValues">

        <item>Always</item>

        <item>Turn_off_5min</item>

        <item>Turn_off_10min</item>

    </string-array>



    <string-array name="wifi_hotsopt_mode_summaries">

        <item>Always</item>

        <item>Turn off when idle for 5 min</item>

        <item>Turn off when idle for 10 min</item>

    </string-array>



</resources>

res/values/customize.xml

+3 −3
Original line number Diff line number Diff line
@@ -51,12 +51,12 @@ 
    <!-- Whether to show country in language -->

    <bool name="def_language_country_enable">false</bool>



    <!-- Whether to lava security enable -->

    <bool name="def_lava_security_enable">false</bool>



    <!-- Whether to show OTA/System update in deviceinfo -->

    <bool name="def_device_info_ota_update_enable">false</bool>



    <!-- Whether wifi hotspot enable -->

    <bool name="def_wifi_hotspot_enable">false</bool>



    <!-- Setting customize default carriers name -->

    <string name="def_custome_carriers_defname"></string>

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -6109,8 +6109,6 @@ 
    <string name="display_auto_rotate_stay_in_landscape">Stay in landscape view</string>

    <!-- [CHAR LIMIT=70] Don't rotate when screen is turned option -->

    <string name="display_auto_rotate_stay_in_current">Stay in current orientation</string>

    <string name="hotsopt_working_mode_title">Keep WiFi Hotspot on</string>



    <!-- Encryption interstitial title [CHAR LIMIT=30] -->

    <string name="encryption_interstitial_header">Encryption</string>
@@ -6201,6 +6199,8 @@ 
    <string name="label_global_roaming_settings">Roaming Settings</string>

    <string name="lte_select_title">Default 4G/3G SIM card</string>

    <string name="diag_port_enable_preference">Auto load usb device</string>

    <!-- hotsopt working mode title-->

    <string name="wifi_hotsopt_mode_title">Keep WiFi Hotspot on</string>

    <string name="factory_test_info">Factory test</string>

    <string name="factory_test">Factory test mode</string>

    <string name="network_debug_info">Network debug info</string>

res/xml/tether_prefs.xml

+6 −0
Original line number Diff line number Diff line
@@ -31,6 +31,12 @@ 
        android:title="@string/wifi_tether_configure_ap_text"

        android:persistent="false" />



    <ListPreference

        android:key="wifi_hotsopt_mode"

        android:title="@string/wifi_hotsopt_mode_title"

        android:entries="@array/wifi_hotsopt_mode_entries"

        android:entryValues="@array/wifi_hotsopt_mode_entryValues" />



    <SwitchPreference

        android:key="enable_bluetooth_tethering"

        android:title="@string/bluetooth_tether_checkbox_text"