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

Commit 34a96e70 authored by Jaewan Kim's avatar Jaewan Kim Committed by Android (Google) Code Review
Browse files

Merge "PIP: Support accessibility" into nyc-dev

parents 4d07c889 f915bf7e

packages/SystemUI/res/layout/tv_pip_control_button.xml

+2 −1
Original line number Diff line number Diff line
@@ -38,5 +38,6 @@ 
        android:alpha="0"

        android:fontFamily="sans-serif"

        android:textSize="12sp"

        android:textColor="#EEEEEE" />

        android:textColor="#EEEEEE"

        android:importantForAccessibility="no" />

</merge>

packages/SystemUI/res/layout/tv_pip_recents_overlay.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
    <com.android.systemui.tv.pip.PipRecentsControlsView

        android:id="@+id/pip_controls"

        android:layout_width="wrap_content"

        android:layout_height="match_parent" />

        android:layout_height="wrap_content" />



    <View

        android:id="@+id/recents"

packages/SystemUI/src/com/android/systemui/recents/tv/RecentsTvActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.view.KeyEvent; 
import android.view.View;

import android.view.ViewTreeObserver.OnPreDrawListener;

import android.view.WindowManager;

import android.view.accessibility.AccessibilityEvent;

import android.widget.FrameLayout.LayoutParams;



import com.android.systemui.R;
@@ -131,6 +132,7 @@ public class RecentsTvActivity extends Activity implements OnPreDrawListener { 
                @Override

                public void onRecentsFocused() {

                    mRecentsView.requestFocus();

                    mRecentsView.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);

                }

            };

    private final View.OnFocusChangeListener mPipViewFocusChangeListener =

packages/SystemUI/src/com/android/systemui/tv/pip/PipControlButtonView.java

+3 −2
Original line number Diff line number Diff line
@@ -92,8 +92,8 @@ public class PipControlButtonView extends LinearLayout { 
        TypedArray typedArray =

            context.obtainStyledAttributes(attrs, values, defStyleAttr, defStyleRes);



        mButtonImageView.setImageDrawable(typedArray.getDrawable(0));

        mDescriptionTextView.setText(typedArray.getText(1));

        setImageResource(typedArray.getResourceId(0, 0));

        setText(typedArray.getResourceId(1, 0));



        typedArray.recycle();

    }
@@ -132,6 +132,7 @@ public class PipControlButtonView extends LinearLayout { 
     * Sets the text for description the with the given resource id.

     */

    public void setText(int resId) {

        mButtonImageView.setContentDescription(getContext().getString(resId));

        mDescriptionTextView.setText(resId);

    }

packages/SystemUI/src/com/android/systemui/tv/pip/PipRecentsOverlayManager.java

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.graphics.PixelFormat; 
import android.util.Log;

import android.view.LayoutInflater;

import android.view.View;

import android.view.accessibility.AccessibilityEvent;

import android.view.WindowManager.LayoutParams;

import android.view.WindowManager;
@@ -141,6 +142,7 @@ public class PipRecentsOverlayManager { 


        mWindowManager.updateViewLayout(mOverlayView, mPipRecentsControlsViewFocusedLayoutParams);

        mPipControlsView.requestFocus();

        mPipControlsView.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);

        mPipControlsView.startFocusGainAnimation();

    }