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

Commit bc66f23f authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Android (Google) Code Review
Browse files

Merge "Support talkback for functions on the caption view."

parents 09fa8395 1e83f128

core/java/com/android/internal/widget/DecorCaptionView.java

+2 −0
Original line number Diff line number Diff line
@@ -123,6 +123,8 @@ public class DecorCaptionView extends ViewGroup implements View.OnTouchListener, 
    private void init(Context context) {

        mDragSlop = ViewConfiguration.get(context).getScaledTouchSlop();

        mGestureDetector = new GestureDetector(context, this);

        setContentDescription(context.getString(R.string.accessibility_freeform_caption,

                context.getPackageManager().getApplicationLabel(context.getApplicationInfo())));

    }



    @Override

core/res/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -5320,4 +5320,7 @@ 
    <string name="accessibility_system_action_lock_screen_label">Lock Screen</string>

    <!-- Label for taking screenshot action [CHAR LIMIT=NONE] -->

    <string name="accessibility_system_action_screenshot_label">Screenshot</string>



    <!-- Accessibility description of caption view -->

    <string name="accessibility_freeform_caption"><xliff:g id="app_name">%1$s</xliff:g> app in Pop-up window.</string>

</resources>

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -3763,4 +3763,6 @@ 
  <java-symbol type="string" name="accessibility_system_action_recents_label" />

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

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



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

</resources>