Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "PIP: Support accessibility" into nyc-dev

Browse Source
This commit is contained in:
Jaewan Kim
2016-04-21 01:11:38 +00:00
committed by Android (Google) Code Review
parent 4d07c88919 f915bf7e9b
commit 34a96e704e
5 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/res/layout/tv_pip_control_button.xml
View File

@@ -38,5 +38,6 @@
android:alpha="0"
android:fontFamily="sans-serif"
android:textSize="12sp"
android:textColor="#EEEEEE" />
android:textColor="#EEEEEE"
android:importantForAccessibility="no" />
</merge>

2
packages/SystemUI/res/layout/tv_pip_recents_overlay.xml
View File

@@ -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"

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

@@ -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 =

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

@@ -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);
}

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

@@ -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();
}