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

Commit 49ee30ce authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'backlog_3287_3286-p' into 'v1-pie'

LineageParts: Change references to /e/ OS in Trust ASB dialog

See merge request !7
parents 667c24e0 e47d1cf5
Loading
Loading
Loading
Loading
+0 −3
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@

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

    <!-- Metrics server endpoint -->
    <string name="stats_lineage_url">https://stats.lineageos.org/api/v1/stats</string>

    <!-- When true, weather options will be displayed in settings dashboard -->
    <bool name="config_showWeatherMenu">true</bool>

+1 −22
Original line number Diff line number Diff line
@@ -541,28 +541,6 @@
                 <b>Total commits:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
                 <b>Last update:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>

    <!-- Anonymous Statistics #Lineage -->
    <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
    <string name="anonymous_statistics_title">LineageOS statistics</string>
    <string name="anonymous_statistics_summary">Help make LineageOS better by opting into anonymous statistics reporting</string>
    <string name="anonymous_statistics_warning_title">About</string>
    <string name="anonymous_statistics_warning">Opting into LineageOS Statistics will allow non-personal data to be submitted to the
        developers of LineageOS to track unique installations across devices. The information submitted includes an unique identifier,
        which does not compromise your privacy or personal data. The data is submitted during each boot.\n\nFor an example of the data that is submitted, tap on Preview Data.</string>
    <string name="enable_reporting_title">Enable reporting</string>
    <string name="preview_data_title">Preview data</string>
    <string name="view_stats_title">View stats</string>
    <string name="anonymous_learn_more">Learn more</string>

    <!-- Anonymous Statistics - Preview -->
    <string name="preview_id_title">Unique ID</string>
    <string name="preview_device_title">Device</string>
    <string name="preview_version_title">Version</string>
    <string name="preview_country_title">Country</string>
    <string name="preview_carrier_title">Carrier</string>
    <string name="stats_collection_title">Stats collection</string>
    <string name="stats_collection_summary">Allow installation metrics and device statistics to be collected</string>

    <!-- Display : Rotation  -->
    <string name="accelerometer_title">Auto-rotate screen</string>
    <string name="display_rotation_title">Rotation settings</string>
@@ -724,6 +702,7 @@
    <!-- Lowercase on purpose, appears in trust_feature_security_patches_value_base -->
    <string name="trust_feature_security_patches_value_old">out of date</string>
    <string name="trust_feature_security_patches_explain">Security patches are released monthly by Google in cooperation with SoC vendors to address flaws which could be exploited by malicious apps to bypass security restrictions and cause permanent damage to your device. Patches made available by Google are applied every month on all supported devices, but patches to proprietary code can only be applied by your device\'s manufacturer. To keep your device safe make sure your LineageOS build is always up-to-date, and (if applicable) ensure your vendor image is updated to the latest one recommended by LineageOS.</string>
    <string name="trust_feature_security_patches_explain_e">Security patches are released monthly by Google in cooperation with SoC vendors to address flaws which could be exploited by malicious apps to bypass security restrictions and cause permanent damage to your device. Patches made available by Google are applied every month on all supported devices, but patches to proprietary code can only be applied by your device\'s manufacturer. To keep your device safe make sure your /e/ OS build is always up-to-date, and (if applicable) ensure your vendor image is updated to the latest one recommended by /e/ OS.</string>
    <string name="trust_feature_encryption">Encryption</string>
    <string name="trust_feature_encryption_value_enabled">Enabled</string>
    <string name="trust_feature_encryption_value_nolock">Needs a secure lock screen</string>

res/xml/preview_data.xml

deleted100644 → 0
+0 −52
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2012 The CyanogenMod Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->

<PreferenceScreen
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:title="@string/preview_data_title">

    <Preference
        android:key="preview_id"
        style="?android:preferenceInformationStyle"
        android:title="@string/preview_id_title"
        android:summary="%s" />

    <Preference
        android:key="preview_device"
        style="?android:preferenceInformationStyle"
        android:title="@string/preview_device_title"
        android:summary="%s" />

    <Preference
        android:key="preview_version"
        style="?android:preferenceInformationStyle"
        android:title="@string/preview_version_title"
        android:summary="%s" />

    <Preference
        android:key="preview_country"
        style="?android:preferenceInformationStyle"
        android:title="@string/preview_country_title"
        android:summary="%s" />

    <Preference
        android:key="preview_carrier"
        style="?android:preferenceInformationStyle"
        android:title="@string/preview_carrier_title"
        android:summary="%s" />

</PreferenceScreen>
+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public class TrustPreferences extends SettingsPreferenceFragment {
        mRootPref.setOnPreferenceClickListener(p ->
                 showInfo(R.string.trust_feature_root_explain));
        mSecurityPatchesPref.setOnPreferenceClickListener(p ->
                showInfo(R.string.trust_feature_security_patches_explain));
                showInfo(R.string.trust_feature_security_patches_explain_e));
        mEncryptionPref.setOnPreferenceClickListener(p ->
                showInfo(R.string.trust_feature_encryption_explain));
        mSmsLimitPref.setOnPreferenceChangeListener((p, v) ->