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

Commit 50b3b62e authored by Brian Isganitis's avatar Brian Isganitis Committed by Android (Google) Code Review
Browse files

Merge "Add a11y titles for taskbar windows." into tm-qpr-dev

parents 3a801de2 61b01e2c

quickstep/res/layout/all_apps_edu_view.xml

+2 −1
Original line number Diff line number Diff line
@@ -3,4 +3,5 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:orientation="vertical"

    android:layout_width="@dimen/swipe_edu_width"

    android:layout_height="@dimen/swipe_edu_max_height"/>
 
    android:layout_height="@dimen/swipe_edu_max_height"

    android:accessibilityPaneTitle="@string/taskbar_edu_a11y_title"/>

quickstep/res/layout/taskbar_all_apps.xml

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
<com.android.launcher3.taskbar.allapps.TaskbarAllAppsSlideInView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    android:layout_height="match_parent"

    android:accessibilityPaneTitle="@string/all_apps_label">



    <com.android.launcher3.taskbar.allapps.TaskbarAllAppsContainerView

        android:id="@+id/apps_view"

quickstep/res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -224,6 +224,8 @@ 
    <string name="accessibility_rotate_button">Rotate screen</string>



    <!-- ******* Taskbar Edu ******* -->

    <!-- Accessibility title for the taskbar education window. [CHAR_LIMIT=NONE] -->

    <string name="taskbar_edu_a11y_title">Taskbar education</string>

    <!-- Accessibility text spoken when the taskbar education panel appears [CHAR_LIMIT=NONE] -->

    <string name="taskbar_edu_opened">Taskbar education appeared</string>

    <!-- Accessibility text spoken when the taskbar education panel disappears [CHAR_LIMIT=NONE] -->
@@ -259,6 +261,10 @@ 
    <string name="taskbar_button_notifications">Notifications</string>

    <!-- Content description for quick settings button [CHAR_LIMIT=16] -->

    <string name="taskbar_button_quick_settings">Quick Settings</string>

    <!-- Accessibility title for the taskbar window. [CHAR_LIMIT=NONE] -->

    <string name="taskbar_a11y_title">Taskbar</string>

    <!-- Accessibility title for the taskbar window on phones. [CHAR_LIMIT=NONE] -->

    <string name="taskbar_phone_a11y_title">Navigation bar</string>



    <!-- Label for moving drop target to the top or left side of the screen, depending on orientation (from the taskbar only). -->

    <string name="move_drop_target_top_or_left">Move to top&#47;left</string>

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

+4 −0
Original line number Diff line number Diff line
@@ -332,6 +332,10 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
        windowLayoutParams.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;

        windowLayoutParams.privateFlags =

                WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION;

        windowLayoutParams.accessibilityTitle = getString(

                TaskbarManager.isPhoneMode(mDeviceProfile)

                        ? R.string.taskbar_phone_a11y_title

                        : R.string.taskbar_a11y_title);

        return windowLayoutParams;

    }