diff options
| -rw-r--r-- | core/java/com/android/internal/accessibility/dialog/AccessibilityTargetHelper.java | 15 | ||||
| -rw-r--r-- | core/res/res/layout/accessibility_enable_service_warning.xml (renamed from core/res/res/layout/accessibility_enable_service_encryption_warning.xml) | 8 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 7 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 4 |
4 files changed, 2 insertions, 32 deletions
diff --git a/core/java/com/android/internal/accessibility/dialog/AccessibilityTargetHelper.java b/core/java/com/android/internal/accessibility/dialog/AccessibilityTargetHelper.java index 4a20ad0f33f5..fc2c8cca9796 100644 --- a/core/java/com/android/internal/accessibility/dialog/AccessibilityTargetHelper.java +++ b/core/java/com/android/internal/accessibility/dialog/AccessibilityTargetHelper.java @@ -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); diff --git a/core/res/res/layout/accessibility_enable_service_encryption_warning.xml b/core/res/res/layout/accessibility_enable_service_warning.xml index 400051660592..01ef10177c5a 100644 --- a/core/res/res/layout/accessibility_enable_service_encryption_warning.xml +++ b/core/res/res/layout/accessibility_enable_service_warning.xml @@ -54,14 +54,6 @@ 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" android:layout_height="wrap_content" diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 76631926a52a..db0cc277c3af 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -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 diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index bacd25d026d4..a296aa5fbae5 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3414,14 +3414,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" /> |