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

Commit 5b425480 authored by Steve Kondik's avatar Steve Kondik Committed by Arne Coucheron
Browse files

Settings: Add CM Updater 

Squashed commit of the following:

Author: DvTonder <david.vantonder@gmail.com>
Settings: Add Updater and Changelog
Change-Id: I8cf09962d9ba667bcdba78d7214fd6b5bb0feedc

Author: Jorge Ruesga <jorge@ruesga.com>
settings: hide settings of disabled components

Change-Id: I977bd0c9668b479773802f99d03ecd1072e12f75
JIRA: CYAN-3552
Issue: https://jira.cyanogenmod.org/browse/CYAN-3552


Signed-off-by: default avatarJorge Ruesga <jorge@ruesga.com>

Author: Michael Bestas <mikeioannina@gmail.com>
Move CM updater & remove summary

* Move CM Updater to the top, like the fota app
* Use android's default 'System updates' empty summary
Change-Id: Ia3358397be97bc0ac19dd73598d053eb29efe31d

Change-Id: I8cf09962d9ba667bcdba78d7214fd6b5bb0feedc
parent 072848cd

res/values/cm_strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ 
    <string name="build_date">Build date</string>

    <string name="build_date_default">2015-01-01-0000</string>



    <!-- CM Updater -->

    <string name="cmupdate_settings_title">CyanogenMod updates</string>



    <!-- Names of categories of app ops tabs - extension of AOSP -->

    <string name="app_ops_categories_location">Location</string>

    <string name="app_ops_categories_personal">Personal</string>

res/xml/device_info_settings.xml

+12 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
-->



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

        xmlns:cm="http://schemas.android.com/apk/res/cyanogenmod.platform"

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

        android:title="@string/about_settings">
@@ -33,6 +34,17 @@ 
                    android:targetClass="@string/additional_system_update_menu" />

        </PreferenceScreen>



        <!-- CyanogenMod Updates -->

        <cyanogenmod.preference.SelfRemovingPreference android:key="cm_updates"

                android:title="@string/cmupdate_settings_title"

                android:summary="@string/system_update_settings_list_item_summary"

                cm:requiresOwner="true"

                cm:requiresPackage="com.cyanogenmod.updater">

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

                    android:targetPackage="com.cyanogenmod.updater"

                    android:targetClass="com.cyanogenmod.updater.UpdatesSettings" />

        </cyanogenmod.preference.SelfRemovingPreference>



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

        <PreferenceScreen android:key="status_info"

                android:title="@string/device_status"