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

Commit 54bdf65c authored by Eric Biggers's avatar Eric Biggers
Browse files

Remove FDE warning from AccessibilityShortcutChooserActivity 

This encryption warning is never shown, since
StorageManager.isNonDefaultBlockEncrypted() is hard-coded to return
false, since FDE (Full Disk Encryption) is no longer supported.
Therefore, remove an unused TextView and string, and stop calling
StorageManager.isNonDefaultBlockEncrypted().

Remove the word "encryption" from the layout name
"accessibility_enable_service_encryption_warning", since this layout
is still used for other, non-encryption related warnings.

Bug: 208476087
Change-Id: Ic4e9024eadd602205516aa3ba4cc01887a2a7d34
parent b8e11a0a

core/java/com/android/internal/accessibility/dialog/AccessibilityTargetHelper.java

+1 −14
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import android.app.ActivityManager; 
import android.content.ComponentName;

import android.content.Context;

import android.os.Build;

import android.os.storage.StorageManager;

import android.provider.Settings;

import android.text.BidiFormatter;

import android.view.LayoutInflater;
@@ -282,19 +281,7 @@ public final class AccessibilityTargetHelper { 
                Context.LAYOUT_INFLATER_SERVICE);



        final View content = inflater.inflate(

                R.layout.accessibility_enable_service_encryption_warning, /* root= */ null);



        final TextView encryptionWarningView = (TextView) content.findViewById(

                R.id.accessibility_encryption_warning);

        if (StorageManager.isNonDefaultBlockEncrypted()) {

            final String text = context.getString(

                    R.string.accessibility_enable_service_encryption_warning,

                    getServiceName(context, target.getLabel()));

            encryptionWarningView.setText(text);

            encryptionWarningView.setVisibility(View.VISIBLE);

        } else {

            encryptionWarningView.setVisibility(View.GONE);

        }

                R.layout.accessibility_enable_service_warning, /* root= */ null);



        final ImageView dialogIcon = content.findViewById(

                R.id.accessibility_permissionDialog_icon);

core/res/res/layout/accessibility_enable_service_encryption_warning.xml→core/res/res/layout/accessibility_enable_service_warning.xml

+0 −8
Original line number Diff line number Diff line
@@ -53,14 +53,6 @@ 
                android:textColor="?android:attr/textColorPrimary"

                android:fontFamily="google-sans-medium"/>



            <TextView

                android:id="@+id/accessibility_encryption_warning"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:padding="10dip"

                android:textAlignment="viewStart"

                android:textAppearance="?android:attr/textAppearanceMedium"/>



            <TextView

                android:id="@+id/accessibility_permissionDialog_description"

                android:layout_width="match_parent"

core/res/res/values/strings.xml

+0 −7
Original line number Diff line number Diff line
@@ -4687,13 +4687,6 @@ 
        <xliff:g id="service" example="TalkBack">%1$s</xliff:g> to have full control of your

        device?</string>



    <!-- Warning that the device data will not be encrypted with password or PIN if

    enabling an accessibility service and there is a secure lock setup. [CHAR LIMIT=NONE] -->

    <string name="accessibility_enable_service_encryption_warning">If you turn on

        <xliff:g id="service" example="TalkBack">%1$s</xliff:g>, your device won’t use your screen

        lock to enhance data encryption.

    </string>



    <!-- Warning description that explains that it's appropriate for accessibility

     services to have full control to help users with accessibility needs. [CHAR LIMIT=NONE] -->

    <string name="accessibility_service_warning_description">Full control is appropriate for apps

core/res/res/values/symbols.xml

+1 −3
Original line number Diff line number Diff line
@@ -3413,14 +3413,12 @@ 
  <java-symbol type="string" name="accessibility_edit_shortcut_menu_volume_title" />

  <java-symbol type="string" name="accessibility_uncheck_legacy_item_warning" />



  <java-symbol type="layout" name="accessibility_enable_service_encryption_warning" />

  <java-symbol type="layout" name="accessibility_enable_service_warning" />

  <java-symbol type="id" name="accessibility_permissionDialog_icon" />

  <java-symbol type="id" name="accessibility_permissionDialog_title" />

  <java-symbol type="id" name="accessibility_encryption_warning" />

  <java-symbol type="id" name="accessibility_permission_enable_allow_button" />

  <java-symbol type="id" name="accessibility_permission_enable_deny_button" />

  <java-symbol type="string" name="accessibility_enable_service_title" />

  <java-symbol type="string" name="accessibility_enable_service_encryption_warning" />



  <java-symbol type="layout" name="accessibility_shortcut_chooser_item" />

  <java-symbol type="id" name="accessibility_shortcut_target_checkbox" />