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

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

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

Move updater to top of settings main page

See merge request !46
parents 6f75f122 d8a58db2

AndroidManifest.xml

+15 −0
Original line number Diff line number Diff line
@@ -199,6 +199,21 @@ 
            </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$WirelessSettingsActivity"

res/xml/device_info_settings.xml

+0 −8
Original line number Diff line number Diff line
@@ -26,14 +26,6 @@ 
                android:title="@string/mod_version"

                android:summary="@string/mod_version_default" />



        <!-- System update settings - launches activity -->

        <PreferenceScreen android:key="system_update_settings"

                android:title="@string/system_update_settings_list_item_title"

                android:summary="@string/system_update_settings_list_item_summary">

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

        </PreferenceScreen>





        <PreferenceScreen android:key="additional_system_update_settings"

                          android:title="@string/additional_system_update_settings_list_item_title">

            <intent android:action="android.intent.action.MAIN"

res/xml/system_updater_prefs.xml

0 → 100644
+7 −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"

    android:key="system_update_settings"

    android:summary="@string/system_update_settings_list_item_summary"

    android:title="@string/system_update_settings_list_item_title">

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

</PreferenceScreen>
 
 No newline at end of file

src/com/android/settings/SettingsActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -374,7 +374,8 @@ public class SettingsActivity extends SettingsDrawerActivity 
            ManageDomainUrls.class.getName(),

            AutomaticStorageManagerSettings.class.getName(),

            MicroGSettings.class.getName(),

            OpenKeychainSettings.class.getName()

            OpenKeychainSettings.class.getName(),

            SystemUpdaterSettings.class.getName()

    };

src/com/android/settings/SystemUpdaterSettings.java

0 → 100644
+51 −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;

                }

            };





}