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

Commit 51f1f110 authored by Mohit Mali's avatar Mohit Mali Committed by Aayush Gupta
Browse files

Settings: Move updater to top of settings main page 



Signed-off-by: Aayush Gupta's avatarAayush Gupta <theimpulson@e.email>
parent f638101b

AndroidManifest.xml

+16 −0
Original line number Diff line number Diff line
@@ -184,6 +184,22 @@ 
                android:value="com.android.settings.shortcut.CreateShortcut" />

        </activity>





        <!--System Updater-->

        <activity android:name="Settings$SystemUpdaterActivity"

            android:label="@string/system_update_settings_list_item_title"

            android:icon="@drawable/ic_system_update">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.SystemUpdaterSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

        </activity>





        <!-- Wireless Controls -->

        <activity

            android:name=".Settings$NetworkDashboardActivity"

res/values/cm_strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 
     limitations under the License.

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- /e/ updater -->

    <string name="system_update_summary">Updates, preferences, release notes</string>



    <!-- Mobile network setting screen, summary of Mobile data switch preference when the network

         is unavailable, the preference selection will be disabled. [CHAR LIMIT=NONE] -->

    <string name="mobile_data_settings_summary_unavailable">No SIM card available</string>

res/xml/system_dashboard_fragment.xml

+0 −12
Original line number Diff line number Diff line
@@ -65,18 +65,6 @@ 
        android:fragment="com.android.settings.system.ResetDashboardFragment"

        settings:controller="com.android.settings.system.ResetPreferenceController"/>



    <!-- System updates -->

    <Preference

        android:key="system_update_settings"

        android:title="@string/system_update_settings_list_item_title"

        android:summary="@string/summary_placeholder"

        android:icon="@drawable/ic_system_update"

        android:order="-30"

        settings:keywords="@string/keywords_system_update_settings"

        settings:controller="com.android.settings.system.SystemUpdatePreferenceController">

        <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS"/>

    </Preference>



    <Preference

        android:key="additional_system_update_settings"

        android:title="@string/additional_system_update_settings_list_item_title"

res/xml/system_updater_prefs.xml

0 → 100644
+16 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res-auto">



    <Preference

        android:icon="@drawable/ic_system_update"

        android:key="system_update_settings"

        android:order="-30"

        android:summary="@string/summary_placeholder"

        android:title="@string/system_update_settings_list_item_title"

        settings:controller="com.android.settings.system.SystemUpdatePreferenceController"

        settings:keywords="@string/keywords_system_update_settings">

        <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS" />

    </Preference>



</PreferenceScreen>

res/xml/top_level_settings.xml

+12 −0
Original line number Diff line number Diff line
@@ -20,6 +20,18 @@ 
    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:key="top_level_settings">



    <Preference

        android:key="top_level_update"

        android:title="@string/system_update_settings_list_item_title"

        android:summary="@string/system_update_summary"

        android:icon="@drawable/ic_system_update"

        android:order="-150"

        android:fragment="com.android.settings.SystemUpdaterSettings"

        settings:controller="com.android.settings.system.SystemUpdatePreferenceController"

        settings:keywords="@string/keywords_system_update_settings">

        <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS" />

    </Preference>



    <Preference

        android:key="top_level_network"

        android:title="@string/network_dashboard_title"