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

Commit 249964d1 authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Merge branch 'issue-1076-oreo' into 'v1-oreo' 

Move updater to top of settings main page

See merge request !47
parents 8f122719 52ca93a2

AndroidManifest.xml

+16 −0
Original line number Diff line number Diff line
@@ -147,6 +147,22 @@ 
            </intent-filter>

        </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 android:priority="100">

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

            </intent-filter>

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

                android:value="com.android.settings.category.ia.homepage" />

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

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

        </activity>







        <!-- Wireless Controls -->

        <activity android:name=".Settings$NetworkDashboardActivity"

            android:taskAffinity="com.android.settings"

res/xml/system_dashboard_fragment.xml

+0 −22
Original line number Diff line number Diff line
@@ -25,28 +25,6 @@ 
        android:order="-250"

        android:fragment="com.android.settings.gestures.GestureSettings" />



    <!-- Backup -->

    <!--

    <Preference

        android:key="backup_settings"

        android:title="@string/privacy_settings_title"

        android:summary="@string/summary_placeholder"

        android:icon="@drawable/ic_settings_backup"

        android:order="-60">

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

    </Preference>

    -->



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

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

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -192,5 +192,6 @@ public class Settings extends SettingsActivity { 
    public static class StorageDashboardActivity extends SettingsActivity {}

    public static class UserAndAccountDashboardActivity extends SettingsActivity {}

    public static class SystemDashboardActivity extends SettingsActivity {}

    public static class SystemUpdaterActivity extends SettingsActivity { /* empty */ }



}

src/com/android/settings/SystemUpdaterSettings.java

0 → 100644
+52 −0
Original line number Diff line number Diff line 
package com.android.settings;



import android.os.Bundle;

import android.content.Intent;

import android.content.ComponentName;

import android.app.Fragment;



import android.app.Activity;

import android.content.Context;

import android.provider.SearchIndexableResource;

import com.android.settings.R;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import java.util.ArrayList;

import java.util.List;





public class SystemUpdaterSettings extends Fragment {



    @Override

    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        Intent intent = new Intent("android.settings.SYSTEM_UPDATE_SETTINGS");

        startActivity(intent);



        Activity activity = getActivity();



        if (activity != null) {

            activity.finish();

        }



    }





    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider() {

                @Override

                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,

                                                                            boolean enabled) {

                    final ArrayList<SearchIndexableResource> result = new ArrayList<>();



                    final SearchIndexableResource sir = new SearchIndexableResource(context);

                    sir.xmlResId = R.xml.system_updater_prefs;

                    result.add(sir);

                    return result;

                }

            };





}