PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add ability to adjust height of VideoPreference" into qt-dev

Browse Source 
am: d5daa47be8

Change-Id: Iee281a8eeecd9dab5fff117a5035daa8440628e3
This commit is contained in:
Beverly
2019-05-23 22:14:04 -07:00
committed by android-build-merger
parent d5c5c8ab9f d5daa47be8
commit 3f5d795953
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/settings/widget/VideoPreference.java
View File

@@ -24,10 +24,12 @@ import android.media.MediaPlayer;
import android.net.Uri; import android.net.Uri;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log; import android.util.Log;
import android.util.TypedValue;
import android.view.Surface; import android.view.Surface;
import android.view.TextureView; import android.view.TextureView;
import android.view.View; import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference; import androidx.preference.Preference;
@@ -51,11 +53,12 @@ public class VideoPreference extends Preference {
@VisibleForTesting @VisibleForTesting
boolean mVideoReady; boolean mVideoReady;
private boolean mVideoPaused; private boolean mVideoPaused;
private float mAspectRadio = 1.0f; private float mAspectRatio = 1.0f;
private int mPreviewResource; private int mPreviewResource;
private boolean mViewVisible; private boolean mViewVisible;
private Surface mSurface; private Surface mSurface;
private int mAnimationId; private int mAnimationId;
private int mHeight = LinearLayout.LayoutParams.MATCH_PARENT - 1; // video height in pixels
public VideoPreference(Context context) { public VideoPreference(Context context) {
super(context); super(context);
@@ -121,7 +124,11 @@ public class VideoPreference extends Preference {
R.id.video_container); R.id.video_container);
imageView.setImageResource(mPreviewResource); imageView.setImageResource(mPreviewResource);
layout.setAspectRatio(mAspectRadio); layout.setAspectRatio(mAspectRatio);
if (mHeight >= LinearLayout.LayoutParams.MATCH_PARENT) {
layout.setLayoutParams(new LinearLayout.LayoutParams(
LinearLayout.LayoutParams.MATCH_PARENT, mHeight));
}
updateViewStates(imageView, playButton); updateViewStates(imageView, playButton);
video.setOnClickListener(v -> updateViewStates(imageView, playButton)); video.setOnClickListener(v -> updateViewStates(imageView, playButton));
@@ -247,8 +254,17 @@ public class VideoPreference extends Preference {
return mVideoPaused; return mVideoPaused;
} }
/**
* sets the height of the video preference
* @param height in dp
*/
public void setHeight(float height) {
mHeight = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, height,
mContext.getResources().getDisplayMetrics());
}
@VisibleForTesting @VisibleForTesting
void updateAspectRatio() { void updateAspectRatio() {
mAspectRadio = mMediaPlayer.getVideoWidth() / (float) mMediaPlayer.getVideoHeight(); mAspectRatio = mMediaPlayer.getVideoWidth() / (float) mMediaPlayer.getVideoHeight();
} }
} }