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

Commit 4573c0e0 authored by Victor Hsieh's avatar Victor Hsieh Committed by Android (Google) Code Review
Browse files

Merge "Revert "Support installation of the new app source certificate""

parents a7fd2030 cef970cd
Loading
Loading
Loading
Loading
+0 −5
Original line number Diff line number Diff line
@@ -1348,11 +1348,6 @@
                  android:exported="false">
        </activity>

        <activity android:name=".security.InstallAppSourceCertificateWarning"
                  android:theme="@style/GlifV3Theme.Light"
                  android:exported="false">
        </activity>

        <activity
            android:name="Settings$DeviceAdminSettingsActivity"
            android:label="@string/device_admin_settings_title">
+0 −56
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ Copyright (C) 2019 The Android Open Source 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.
  -->
<com.google.android.setupdesign.GlifLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/setup_wizard_layout"
    android:layout_width="match_parent"
    android:layout_height="match_parent">

    <LinearLayout
        style="@style/SudContentFrame"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:orientation="vertical"
        android:gravity="center_horizontal">

        <ImageView
            android:id="@+id/sud_layout_icon"
            style="@style/SudGlifIcon"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:gravity="center"
            android:src="@drawable/ic_warning_googred_48dp"/>

        <TextView
            android:id="@+id/sud_layout_title"
            style="@style/SudGlifHeaderTitle"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:gravity="center"
            android:text="@string/app_src_certificate_warning_title"/>

        <TextView
            android:id="@+id/sud_layout_description"
            style="@style/SudDescription.Glif"
            android:layout_marginTop="16dp"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:text="@string/app_src_certificate_warning_description"/>

    </LinearLayout>

</com.google.android.setupdesign.GlifLayout>
+0 −9
Original line number Diff line number Diff line
@@ -73,14 +73,5 @@
            android:textAppearance="?android:attr/textAppearanceSmall"
            android:textColor="?android:attr/textColorTertiary"
            android:paddingStart="?android:attr/listPreferredItemPaddingStart"/>

        <TextView
            android:id="@+id/contents_appsrccrt"
            android:text="@string/one_appsrccrt"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:textAppearance="?android:attr/textAppearanceSmall"
            android:textColor="?android:attr/textColorTertiary"
            android:paddingStart="?android:attr/listPreferredItemPaddingStart"/>
    </LinearLayout>
</LinearLayout>
+1 −23
Original line number Diff line number Diff line
@@ -6096,8 +6096,6 @@
    <string name="credential_for_vpn_and_apps">Installed for VPN and apps</string>
    <!-- Sub-heading for a user credential installed to be used as part of a Wi-Fi configuration. [CHAR LIMIT=NONE]. -->
    <string name="credential_for_wifi">Installed for Wi-Fi</string>
    <!-- Sub-heading for a user credential installed to be used by kernel for fs-verity verification [CHAR LIMIT=NONE]. -->
    <string name="credential_for_fsverity">Installed for app install source verification</string>
    <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
    <string name="credentials_reset_hint">Remove all the contents?</string>
    <!-- Toast message [CHAR LIMIT=30] -->
@@ -6112,8 +6110,6 @@
    <string name="user_certificate">VPN &amp; app user certificate</string>
    <!-- Title of Wi-Fi certificate [CHAR LIMIT=30] -->
    <string name="wifi_certificate">Wi\u2011Fi certificate</string>
    <!-- Title of App Source certificate [CHAR LIMIT=40] -->
    <string name="app_src_certificate">App Source certificate</string>
    <!-- Title of warning shown to the user before they can install a CA certificate [CHAR LIMIT=NONE] -->
    <string name="ca_certificate_warning_title">Your privacy is at risk</string>
    <!-- Description of warning shown to the user before they can install a CA certificate [CHAR LIMIT=NONE] -->
@@ -6122,10 +6118,6 @@
    <string name="certificate_warning_dont_install">Don\u2019t install</string>
    <!-- Label for button to continue installing a certificate [CHAR_LIMIT=50] -->
    <string name="certificate_warning_install_anyway">Install anyways</string>
    <!-- Title of warning shown to the user before they can install an App Source certificate [CHAR LIMIT=60] -->
    <string name="app_src_certificate_warning_title">Install this certificate at your own risk</string>
    <!-- Description of warning shown to the user before they can install an App Source certificate [CHAR LIMIT=NONE] -->
    <string name="app_src_certificate_warning_description">App source certificates verify that apps are safe for your device. Only install certificates from organizations you trust.</string>
    <!-- Toast message that a certificate was not installed -->
    <string name="cert_not_installed">Certificate not installed</string>
@@ -6757,28 +6749,14 @@
    <string name="one_usercrt">one user certificate</string>
    <!-- Item found in the PKCS12 keystore being investigated [CHAR LIMIT=NONE] -->
    <string name="one_cacrt">one CA certificate</string>
    <!-- Item found in the PKCS12 keystore being investigated [CHAR LIMIT=NONE]-->
    <!-- Item found in thee PKCS12 keystore being investigated [CHAR LIMIT=NONE]-->
    <string name="n_cacrts">%d CA certificates</string>
    <!-- Item found in the PKCS12 keystore being investigated [CHAR LIMIT=NONE] -->
    <string name="one_appsrccrt">one App Source certificate</string>
    <!-- Alert dialog when viewing a set of user credentials. -->
    <string name="user_credential_title">Credential details</string>
    <!-- Announcement to confirm a user credential being removed. [CHAR LIMIT=NONE] -->
    <string name="user_credential_removed">Removed credential: <xliff:g id="credential_name" example="signing key">%s</xliff:g></string>
    <!-- Placeholder for the list of installed user credentials (private keys) when the list is empty. [CHAR LIMIT=120] -->
    <string name="user_credential_none_installed">No user credentials installed</string>
    <!-- Title of alert dialog after an app source certificate is installed. [CHAR LIMIT=50] -->
    <string name="app_src_cert_reboot_dialog_install_title">Restart to use certificate</string>
    <!-- Message of alert dialog after an app source certificate is installed. [CHAR LIMIT=NONE] -->
    <string name="app_src_cert_reboot_dialog_install_message">To use this app source certificate, you need to restart your device</string>
    <!-- Title of alert dialog after an app source certificate is deleted. [CHAR LIMIT=55] -->
    <string name="app_src_cert_reboot_dialog_uninstall_title">Restart to finish uninstalling</string>
    <!-- Message of alert dialog after an app source certificate is deleted. [CHAR LIMIT=NONE] -->
    <string name="app_src_cert_reboot_dialog_uninstall_message">To uninstall this app source certificate, you need to restart your device</string>
    <!-- Button to restart the device. [CHAR LIMIT=25] -->
    <string name="app_src_cert_reboot_dialog_button_restart">Restart</string>
    <!-- Button to skip restarting the device. [CHAR LIMIT=25] -->
    <string name="app_src_cert_reboot_dialog_button_not_now">Not now</string>
    <!--  Title for spell checker settings -->
    <string name="spellcheckers_settings_title">Spell checker</string>
+1 −13
Original line number Diff line number Diff line
@@ -61,18 +61,6 @@

        </Preference>

        <Preference
            android:key="install_app_src_certificate"
            android:title="@string/app_src_certificate"
            settings:controller="com.android.settings.security.InstallAppSourceCertificatePreferenceController">

            <intent
                android:targetPackage="com.android.settings"
                android:targetClass="com.android.settings.security.InstallAppSourceCertificateWarning">
            </intent>

        </Preference>

    </PreferenceCategory>

</PreferenceScreen>
 No newline at end of file
Loading