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

Commit 439e7942 authored by Nishith  Khanna's avatar Nishith Khanna
Browse files

Merge branch 'epic13-s-bringup' into 'v1-s'

Settings: res: Set proper title for system version

See merge request !112
parents 3ba21f33 4b1d2ef3
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -4286,6 +4286,12 @@
            </intent-filter>
        </activity>

        <provider
            android:name="com.android.settings.development.OTAProvider"
            android:authorities="custom.setting.Provider.OTA_SERVER"
            android:exported="true"
            android:multiprocess="true" />

        <!-- This is the longest AndroidManifest.xml ever. -->
    </application>
</manifest>
+39 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  Copyright (C) 2019-2022 ECORP SAS

  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.
  -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="32dp"
    android:height="32dp"
    android:viewportWidth="32"
    android:viewportHeight="32">
    <path
        android:fillColor="#00000000"
        android:pathData="M15.99,4V4C15.79,3.998 15.592,4.028 15.402,4.089L5.845,8.136C5.598,8.244 5.385,8.425 5.233,8.658C5.081,8.893 5,9.17 5,9.453L5,9.455C5,19.19 10.484,25.771 15.442,27.89L15.444,27.891C15.612,27.963 15.792,28 15.974,28C16.155,28 16.335,27.963 16.504,27.891L16.507,27.889C20.475,26.204 26.995,20.295 27,9.466C26.992,9.179 26.904,8.902 26.746,8.666C26.587,8.429 26.365,8.247 26.11,8.138L15.99,4ZM15.99,4L15.996,4C16.182,4.001 16.368,4.03 16.545,4.088L26.109,8.138L15.99,4Z"
        android:strokeWidth="2"
        android:strokeColor="#0088ED" />
    <path
        android:fillColor="#00000000"
        android:pathData="M19.5,12.291C20.466,13.257 20.95,14.524 20.95,15.791C20.95,17.058 20.466,18.324 19.5,19.291C18.534,20.257 17.267,20.741 16,20.741C14.733,20.741 13.466,20.258 12.5,19.291C11.533,18.324 11.05,17.058 11.05,15.791C11.05,14.524 11.533,13.257 12.5,12.291"
        android:strokeWidth="2"
        android:strokeColor="#0088ED"
        android:strokeLineCap="round" />
    <path
        android:fillColor="#00000000"
        android:pathData="M16.101,11.4L16.101,15.864"
        android:strokeWidth="2"
        android:strokeColor="#0088ED"
        android:strokeLineCap="round" />
</vector>
+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@
                android:id="@+id/sud_layout_description"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:text="@string/main_clear_desc"/>
                android:text="@string/main_clear_desc_e"/>
            <TextView
                android:id="@+id/also_erases_external"
                style="@style/TextAppearance.PreferenceTitle.SettingsLib"
+25 −0
Original line number Diff line number Diff line
@@ -172,4 +172,29 @@
    <!-- FastCharge feature -->
    <string name="fast_charging_title">Fast charging</string>
    <string name="fast_charging_summary">Disable to reduce the heat produced by the device while charging or to extend the lifespan of the battery</string>

    <!-- /e/ additions begin -->

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

    <!-- /e/ legal. -->
    <string name="elicense_title">/e/ legal</string>

    <!-- /e/ updater -->
    <string name="system_update_summary">Updates, preferences, release notes</string>

    <!-- /e/ OTA server change -->
    <string name="title_ota_server">Connect to /e/ OS test channel</string>
    <string name="use_ota_summary">Access test releases of /e/ OS</string>
    <string name="use_ota_staging_popup_title">You are about to connect to /e/ OS test channel</string>
    <string name="use_ota_staging_popup_message">It will allow you to download and install test versions of /e/ OS. Those builds may be unstable, and should be used only for test purposes. Please accept only if you know what you are doing.</string>

    <!-- /e/ Advanced Privacy -->
    <string name="advanced_privacy_dashboard_title" translatable="false">Advanced Privacy</string>
    <string name="advanced_privacy_dashboard_summary">Manage trackers, fake location, hide IP address</string>

    <!-- Factory Reset -->
    <string name="main_clear_desc_e" product="tablet">This will erase all data from your tablet\u2019s <b>internal storage</b>, including:\n\n<li>All your account</li>\n<li>System and app data and settings</li>\n<li>Downloaded apps</li></string>
    <string name="main_clear_desc_e" product="default">This will erase all data from your phone\u2019s <b>internal storage</b>, including:\n\n<li>All your account</li>\n<li>System and app data and settings</li>\n<li>Downloaded apps</li></string>
</resources>
+6 −0
Original line number Diff line number Diff line
@@ -41,6 +41,12 @@
        android:title="@string/lineagelicense_title"
        settings:controller="com.android.settings.deviceinfo.legal.LineageLicensePreferenceController" />

    <!-- e Foundation License information -->
    <Preference
        android:key="elicense"
        android:title="@string/elicense_title"
        settings:controller="com.android.settings.deviceinfo.legal.ELicensePreferenceController" />

    <!-- Terms and conditions -->
    <Preference
        android:key="terms"
Loading