diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f81a97ff1b0..a4d899d5dc9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -137,6 +137,10 @@
+
+
true
+
+
+ - @raw/accessibility_timeout_banner
+ - @raw/accessibility_timeout_banner_tablet
+
+ - @raw/accessibility_shortcut_type_triple_tap
+ - @raw/accessibility_shortcut_type_triple_tap_tablet
+
+ - @raw/accessibility_color_inversion_banner
+ - @raw/accessibility_color_inversion_banner_tablet
+
+ - @raw/accessibility_magnification_banner
+ - @raw/accessibility_magnification_banner_tablet
+
+ - @raw/extra_dim_banner
+ - @raw/extra_dim_banner_tablet
diff --git a/res/values/drawables.xml b/res/values/drawables.xml
new file mode 100644
index 00000000000..61c7fe0b5fb
--- /dev/null
+++ b/res/values/drawables.xml
@@ -0,0 +1,58 @@
+
+
+
+ @drawable/accessibility_shortcut_type_software_gesture_talkback
+ @drawable/accessibility_shortcut_type_software_gesture_talkback_tablet
+
+ @drawable/accessibility_button_preview_base
+ @drawable/accessibility_button_preview_base_tablet
+
+ @drawable/accessibility_button_preview_large_floating_menu
+ @drawable/accessibility_button_preview_large_floating_menu_tablet
+
+ @drawable/accessibility_button_preview_small_floating_menu
+ @drawable/accessibility_button_preview_small_floating_menu_tablet
+
+ @drawable/accessibility_button_preview_three_finger
+ @drawable/accessibility_button_preview_three_finger_tablet
+
+ @drawable/accessibility_button_preview_two_finger
+ @drawable/accessibility_button_preview_two_finger_tablet
+
+ @drawable/accessibility_captioning_banner
+ @drawable/accessibility_captioning_banner_tablet
+
+ @drawable/accessibility_shortcut_type_hardware
+ @drawable/accessibility_shortcut_type_hardware_tablet
+
+ @drawable/accessibility_shortcut_type_software
+ @drawable/accessibility_shortcut_type_software_tablet
+
+ @drawable/accessibility_shortcut_type_software_floating
+ @drawable/accessibility_shortcut_type_software_floating_tablet
+
+ @drawable/accessibility_shortcut_type_software_gesture
+ @drawable/accessibility_shortcut_type_software_gesture_tablet
+
+ @drawable/accessibility_magnification_mode_fullscreen
+ @drawable/accessibility_magnification_mode_fullscreen_tablet
+
+ @drawable/accessibility_magnification_mode_switch
+ @drawable/accessibility_magnification_mode_switch_tablet
+
+ @drawable/accessibility_magnification_mode_window
+ @drawable/accessibility_magnification_mode_window_tablet
+
\ No newline at end of file
diff --git a/res/xml/accessibility_control_timeout_settings.xml b/res/xml/accessibility_control_timeout_settings.xml
index 3cd0dd63e63..eb7f6a533bb 100644
--- a/res/xml/accessibility_control_timeout_settings.xml
+++ b/res/xml/accessibility_control_timeout_settings.xml
@@ -28,7 +28,7 @@
+ settings:lottie_rawRes="@raw/a11y_timeout_banner"/>
{
removeDialog(DialogEnums.EDIT_SHORTCUT);
diff --git a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
index dafa16819d8..381466f0031 100644
--- a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
+++ b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
@@ -26,6 +26,7 @@ import android.util.Log;
import androidx.window.embedding.ActivityFilter;
import androidx.window.embedding.ActivityRule;
+import androidx.window.embedding.EmbeddingAspectRatio;
import androidx.window.embedding.RuleController;
import androidx.window.embedding.SplitAttributes;
import androidx.window.embedding.SplitPairFilter;
@@ -110,6 +111,7 @@ public class ActivityEmbeddingRulesController {
.setClearTop(clearTop)
.setMinWidthDp(ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthDp())
.setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp())
+ .setMaxAspectRatioInPortrait(EmbeddingAspectRatio.alwaysAllow())
.setDefaultSplitAttributes(attributes)
.build();
RuleController.getInstance(context).addRule(splitPairRule);
@@ -230,6 +232,7 @@ public class ActivityEmbeddingRulesController {
activityFilters, intent)
.setMinWidthDp(ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthDp())
.setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp())
+ .setMaxAspectRatioInPortrait(EmbeddingAspectRatio.alwaysAllow())
.setSticky(false)
.setFinishPrimaryWithPlaceholder(SplitRule.FinishBehavior.ADJACENT)
.setDefaultSplitAttributes(attributes)
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonPreviewPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonPreviewPreferenceControllerTest.java
index 05aba99d452..0cce56bd4d3 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonPreviewPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonPreviewPreferenceControllerTest.java
@@ -92,7 +92,7 @@ public class AccessibilityButtonPreviewPreferenceControllerTest {
final Drawable smallFloatingMenuWithTenOpacityDrawable =
AccessibilityLayerDrawable.createLayerDrawable(mContext,
- R.drawable.accessibility_button_preview_small_floating_menu, 10);
+ R.drawable.a11y_button_preview_small_floating_menu, 10);
assertThat(
mController.mIllustrationPreference.getImageDrawable().getConstantState())
.isEqualTo(smallFloatingMenuWithTenOpacityDrawable.getConstantState());
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityDialogUtilsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityDialogUtilsTest.java
index ddc3fe4dc92..4922eab8755 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityDialogUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityDialogUtilsTest.java
@@ -43,20 +43,20 @@ public class AccessibilityDialogUtilsTest {
}
@Test
- public void updateSoftwareShortcutInDialog_correctDialogType_success() {
+ public void updateShortcutInDialog_correctDialogType_success() {
final AlertDialog dialog = AccessibilityDialogUtils.showEditShortcutDialog(
mContext, AccessibilityDialogUtils.DialogType.EDIT_SHORTCUT_GENERIC, "Title",
null);
assertThat(
- AccessibilityDialogUtils.updateSoftwareShortcutInDialog(mContext, dialog)).isTrue();
+ AccessibilityDialogUtils.updateShortcutInDialog(mContext, dialog)).isTrue();
}
@Test
- public void updateSoftwareShortcutInDialog_useNotSupportedDialog_fail() {
+ public void updateShortcutInDialog_useNotSupportedDialog_fail() {
final AlertDialog dialog = new AlertDialog.Builder(mContext).setTitle("Title").show();
- assertThat(AccessibilityDialogUtils.updateSoftwareShortcutInDialog(mContext,
+ assertThat(AccessibilityDialogUtils.updateShortcutInDialog(mContext,
dialog)).isFalse();
}
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityLayerDrawableTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityLayerDrawableTest.java
index 915c788c3bd..1dfd4092213 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityLayerDrawableTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityLayerDrawableTest.java
@@ -43,7 +43,7 @@ public class AccessibilityLayerDrawableTest {
@Test
public void createLayerDrawable_configCorrect() {
final Drawable expected1stDrawable = mContext.getDrawable(
- R.drawable.accessibility_button_preview_base);
+ R.drawable.a11y_button_preview_base);
final Drawable expected2ndDrawable = mContext.getDrawable(TEST_RES_ID);
final AccessibilityLayerDrawable actualDrawable =