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

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

Merge branch 'fix-oreo-build-error' into 'v1-oreo' 

Fixed oreo build error

See merge request !51
parents 249964d1 7f608fad

res/xml/device_info_settings.xml

+0 −14
Original line number Diff line number Diff line
@@ -22,20 +22,6 @@ 
        <org.lineageos.internal.preference.deviceinfo.LineageVersionPreference

                android:key="lineage_version" />



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

        <Preference android:key="additional_system_update_settings"

                    android:title="@string/additional_system_update_settings_list_item_title">

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

                    android:targetPackage="@string/additional_system_update"

                    android:targetClass="@string/additional_system_update_menu" />

        </Preference>



        <!-- LineageOS updates -->

        <org.lineageos.internal.preference.deviceinfo.LineageUpdatesPreference

                android:key="lineage_updates"

                lineage:requiresOwner="true"

                lineage:requiresPackage="org.lineageos.updater" />



        <!-- Device status - launches activity -->

        <Preference android:key="status_info"

                android:title="@string/device_status"

res/xml/system_dashboard_fragment.xml

+1 −9
Original line number Diff line number Diff line
@@ -25,14 +25,6 @@ 
        android:order="-250"

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



    <Preference

        android:key="additional_system_update_settings"

        android:title="@string/additional_system_update_settings_list_item_title"

        android:order="-31">

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

                android:targetPackage="@string/additional_system_update"

                android:targetClass="@string/additional_system_update_menu" />

    </Preference>

   

    <Preference

        android:key="reset_dashboard"

res/xml/system_updater_prefs.xml

+6 −8
Original line number Diff line number Diff line
@@ -3,14 +3,12 @@ 
    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" />

        android:key="additional_system_update_settings"

        android:title="@string/additional_system_update_settings_list_item_title"

        android:order="-31">

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

                android:targetPackage="@string/additional_system_update"

                android:targetClass="@string/additional_system_update_menu" />

    </Preference>



</PreferenceScreen>

src/com/android/settings/SystemUpdaterSettings.java

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ public class SystemUpdaterSettings extends Fragment { 
    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



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

        Intent intent = new Intent("android.intent.action.MAIN");

        intent.setComponent(new ComponentName("org.lineageos.updater", "org.lineageos.updater.UpdatesActivity"));

        startActivity(intent);



        Activity activity = getActivity();