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

Commit 943b637e authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge branch 'backport_A11_settingsFixes' into 'v1-q' 

Settings: backport certain fixes from v1-r

See merge request !98
parents ac334983 ba1a6114

res/values/cm_strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -16,6 +16,12 @@ 
     limitations under the License.

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- /e/ updater -->

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



    <!-- /e/ version -->

    <string name="e_version">/e/ OS version</string>



    <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->

    <plurals name="show_dev_countdown_cm">

        <item quantity="one">You are now <xliff:g id="step_count">%1$d</xliff:g> step away from enabling development settings.</item>

res/xml/firmware_version.xml

+1 −9
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
    <!-- Lineage version -->

    <Preference

        android:key="lineage_version"

        android:title="@*lineageos.platform:string/lineage_version"

        android:title="@string/e_version"

        android:summary="@string/summary_placeholder"

        android:selectable="false"

        settings:enableCopying="true"
@@ -61,14 +61,6 @@ 
        settings:enableCopying="true"

        settings:controller="com.android.settings.deviceinfo.firmwareversion.LineageVendorSecurityPatchLevelPreferenceController"/>



    <!-- Mainline module version -->

    <Preference

        android:key="module_version"

        android:title="@string/module_version"

        android:summary="@string/summary_placeholder"

        settings:enableCopying="true"

        settings:controller="com.android.settings.deviceinfo.firmwareversion.MainlineModuleVersionPreferenceController"/>



    <!-- Baseband -->

    <Preference

        android:key="base_band"

res/xml/top_level_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
    <Preference

        android:key="top_level_update"

        android:title="@string/system_update_settings_list_item_title"

        android:summary="@string/summary_placeholder"

        android:summary="@string/system_update_summary"

        android:icon="@drawable/ic_system_update"

        android:order="-150"

        android:fragment="com.android.settings.SystemUpdaterSettings"