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

Commit c7589f7f authored by Harry Youd's avatar Harry Youd Committed by Gabriele M
Browse files

Recents: Add accessibility descriptions for lock ImageViews 

Change-Id: I09ce342ce135017294f5a4197b7e52dded3fb17e
parent b3ae3463

packages/SystemUI/res/values/cm_strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -207,4 +207,9 @@ 
    <!-- Volume panel QS tile -->

    <string name="quick_settings_sync_label">Sync</string>

    <string name="quick_settings_volume_panel_label">Volume panel</string>



    <!-- Content description for Accessibility on unlocked tasks in recents -->

    <string name="accessibility_lock_task">Prevent <xliff:g id="task">%1$s</xliff:g> from being dismissed</string>

    <!-- Content description for Accessibility on locked tasks in recents -->

    <string name="accessibility_unlock_task">Allow <xliff:g id="task">%1$s</xliff:g> to be dismissed</string>

</resources>

packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java

+11 −3
Original line number Diff line number Diff line
@@ -479,9 +479,17 @@ public class TaskViewHeader extends FrameLayout 
    }



    private void updateLockTaskDrawable() {

        if (Recents.sLockedTasks.contains(mTask)) {

            mLockTaskButton.setImageDrawable(mTask.useLightOnPrimaryColor ?

                    mLightLockedDrawable : mDarkLockedDrawable);

            mLockTaskButton.setContentDescription(

                    getResources().getString(R.string.accessibility_unlock_task, mTask.title));

        } else {

            mLockTaskButton.setImageDrawable(mTask.useLightOnPrimaryColor ?

                (Recents.sLockedTasks.contains(mTask) ? mLightLockedDrawable : mLightUnlockedDrawable) :

                (Recents.sLockedTasks.contains(mTask) ? mDarkLockedDrawable : mDarkUnlockedDrawable));

                    mLightUnlockedDrawable : mDarkUnlockedDrawable);

            mLockTaskButton.setContentDescription(

                    getResources().getString(R.string.accessibility_lock_task, mTask.title));

        }

        ((AnimatedVectorDrawable) mLockTaskButton.getDrawable()).start();

    }