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

Commit f34735c6 authored by Henry Fang's avatar Henry Fang
Browse files

Build local AttributeSet to reuse 

bug: 176772083
Test: atest TvViewTest
Change-Id: I447a5f3a04da3dccf8a7543c1e6fe927d737779f
parent 07a787db

media/java/android/media/tv/TvView.java

+14 −1
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ import android.annotation.RequiresPermission; 
import android.annotation.SystemApi;

import android.content.Context;

import android.content.pm.PackageManager;

import android.content.res.Resources;

import android.content.res.XmlResourceParser;

import android.graphics.Canvas;

import android.graphics.PorterDuff;

import android.graphics.Rect;
@@ -39,6 +41,7 @@ import android.text.TextUtils; 
import android.util.AttributeSet;

import android.util.Log;

import android.util.Pair;

import android.util.Xml;

import android.view.InputEvent;

import android.view.KeyEvent;

import android.view.MotionEvent;
@@ -99,6 +102,7 @@ public class TvView extends ViewGroup { 
    private int mSurfaceWidth;

    private int mSurfaceHeight;

    private final AttributeSet mAttrs;

    private final XmlResourceParser mParser;

    private final int mDefStyleAttr;

    private int mWindowZOrder;

    private boolean mUseRequestedSurfaceLayout;
@@ -168,7 +172,16 @@ public class TvView extends ViewGroup { 


    public TvView(Context context, AttributeSet attrs, int defStyleAttr) {

        super(context, attrs, defStyleAttr);

        int sourceResId = Resources.getAttributeSetSourceResId(attrs);

        if (sourceResId != Resources.ID_NULL) {

            Log.d(TAG, "Build local AttributeSet");

            mParser  = context.getResources().getXml(sourceResId);

            mAttrs = Xml.asAttributeSet(mParser);

        } else {

            Log.d(TAG, "Use passed in AttributeSet");

            mParser = null;

            mAttrs = attrs;

        }

        mDefStyleAttr = defStyleAttr;

        resetSurfaceView();

        mTvInputManager = (TvInputManager) getContext().getSystemService(Context.TV_INPUT_SERVICE);