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

Commit 651a02a8 authored by Mohit Mali's avatar Mohit Mali Committed by Abhishek Aggarwal
Browse files

Settings: Move updater to top of settings main page 



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

res/values/cm_strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -180,4 +180,7 @@ 


    <!-- /e/ legal. -->

    <string name="elicense_title">/e/ legal</string>



    <!-- /e/ updater -->

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

</resources>

res/xml/system_dashboard_fragment.xml

+0 −11
Original line number Diff line number Diff line
@@ -54,17 +54,6 @@ 
                android:targetClass="@string/additional_system_update_menu"/>

    </Preference>



    <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="-58"

        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="reset_dashboard"

        android:title="@string/reset_dashboard_title"

res/xml/top_level_settings.xml

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

<!--

  Copyright (C) 2018 The Android Open Source Project

  Copyright (C) 2019-2021 ECORP SAS



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.
@@ -20,6 +21,17 @@ 
    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:key="top_level_settings">



    <com.android.settings.widget.HomepagePreference

        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="-160"

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

        settings:keywords="@string/keywords_system_update_settings">

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

    </com.android.settings.widget.HomepagePreference>



    <com.android.settings.widget.HomepagePreference

        android:fragment="com.android.settings.network.NetworkDashboardFragment"

        android:icon="@drawable/ic_settings_wireless"

src/com/android/settings/system/SystemUpdatePreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ public class SystemUpdatePreferenceController extends BasePreferenceController { 


    private static final String TAG = "SysUpdatePrefContr";



    private static final String KEY_SYSTEM_UPDATE_SETTINGS = "system_update_settings";

    private static final String KEY_SYSTEM_UPDATE_SETTINGS = "top_level_update";



    private final UserManager mUm;

    private final SystemUpdateManager mUpdateManager;