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

Commit eaa40d50 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '6024-t-e_dev_options' into 'v1-t' 

Add a dedicated section in developer options for /e/OS related settings

See merge request !192
parents 7f0b9338 b72e5265

res/values/e_strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -60,4 +60,6 @@ 
    <string name="e_version_pending_update_summary">/e/OS v<xliff:g id="version" example="6.0">%1$s</xliff:g> - update available</string>

    <string name="e_version_in_progress_update_summary">/e/OS v<xliff:g id="version" example="6.0">%1$s</xliff:g> - update in progress</string>

    <string name="e_version_reboot_pending_summary">/e/OS v<xliff:g id="version" example="6.0">%1$s</xliff:g> - installed reboot required</string>



    <string name="e_developer_options">/e/OS developer options</string>

</resources>
 
 No newline at end of file

res/xml/development_settings.xml

+24 −17
Original line number Diff line number Diff line
@@ -127,6 +127,30 @@ 
            android:fragment="com.android.settings.development.qstile.DevelopmentTileConfigFragment" />

    </PreferenceCategory>



    <PreferenceCategory

        android:key="e_developer_options"

        android:title="@string/e_developer_options"

        android:order="199">



        <SwitchPreference

            android:key="change_update_source"

            android:title="@string/title_ota_server"

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



        <SwitchPreference

            android:key="enable_telemetry"

            android:title="@string/enable_telemetry"

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



        <Preference

            android:key="sentry_userid"

            android:title="@string/sentry_userid_title"

            android:summary="@string/summary_placeholder"

            android:selectable="false"

            settings:enableCopying="true"

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

    </PreferenceCategory>



    <PreferenceCategory

        android:key="debug_debugging_category"

        android:title="@string/debug_debugging_category"
@@ -670,23 +694,6 @@ 
            android:key="reset_shortcut_manager_throttling"

            android:title="@string/reset_shortcut_manager_throttling" />



        <SwitchPreference

            android:key="change_update_source"

            android:title="@string/title_ota_server"

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



        <SwitchPreference

            android:key="enable_telemetry"

            android:title="@string/enable_telemetry"

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



        <Preference

            android:key="sentry_userid"

            android:title="@string/sentry_userid_title"

            android:summary="@string/summary_placeholder"

            android:selectable="false"

            settings:enableCopying="true"

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

    </PreferenceCategory>



    <PreferenceCategory