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

Fix layout transition from Display->Ambient Display to Gestures

Browse Source 
1. Add handling in Gestures settings to scroll to the corresponding
preference when launching from Display->Ambient Display
2. Remove the bitmap creation for the video preview image
3. Use a custom aspect ration framee layout to hold the animation
instead to avoid resizing of the animation view.

Bug: 29795707
Change-Id: I67209ba2508a93da4fc46ff20986309dbe5a83d5
This commit is contained in:
Doris Ling
2016-06-30 18:58:40 -07:00
parent f230f4f9ad
commit 9a3cf7725b
6 changed files with 110 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/com/android/settings/gestures/GesturePreference.java
View File

@@ -50,7 +50,8 @@ public final class GesturePreference extends SwitchPreference {
private Uri mVideoPath;
private MediaPlayer mMediaPlayer;
private MediaMetadataRetriever mMediaMetadata;
private boolean animationAvailable;
private boolean mAnimationAvailable;
private boolean mPreviewReady;
public GesturePreference(Context context, AttributeSet attrs) {
super(context, attrs);
@@ -68,7 +69,7 @@ public final class GesturePreference extends SwitchPreference {
.build();
mMediaMetadata = new MediaMetadataRetriever();
mMediaMetadata.setDataSource(mContext, mVideoPath);
animationAvailable = true;
mAnimationAvailable = true;
} catch (Exception e) {
Log.w(TAG, "Animation resource not found. Will not show animation.");
} finally {
@@ -86,20 +87,11 @@ public final class GesturePreference extends SwitchPreference {
final ImageView playButton = (ImageView) holder.findViewById(R.id.gesture_play_button);
final View animationFrame = holder.findViewById(R.id.gesture_animation_frame);
if (!animationAvailable) {
if (!mAnimationAvailable) {
animationFrame.setVisibility(View.GONE);
return;
}
Bitmap bitmap = mMediaMetadata.getFrameAtTime(0);
if (bitmap != null) {
imageView.setImageDrawable(new BitmapDrawable(bitmap));
imageView.setColorFilter(mContext.getResources().getColor(
R.color.gestures_setting_background_color), PorterDuff.Mode.DARKEN);
}
imageView.setVisibility(View.VISIBLE);
playButton.setVisibility(View.VISIBLE);
video.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -119,13 +111,22 @@ public final class GesturePreference extends SwitchPreference {
@Override
public void onSurfaceTextureAvailable(SurfaceTexture surfaceTexture, int width,
int height) {
animationFrame.setLayoutParams(new LinearLayout.LayoutParams(width, width));
mMediaPlayer = MediaPlayer.create(mContext, mVideoPath);
if (mMediaPlayer != null) {
mMediaPlayer.setSurface(new Surface(surfaceTexture));
mMediaPlayer.setOnSeekCompleteListener(
new MediaPlayer.OnSeekCompleteListener() {
@Override
public void onSeekComplete(MediaPlayer mp) {
mPreviewReady = true;
mMediaPlayer.setOnSeekCompleteListener(null);
}
});
mMediaPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
@Override
public void onPrepared(MediaPlayer mediaPlayer) {
mediaPlayer.seekTo(0);
mediaPlayer.setLooping(true);
}
});
@@ -150,7 +151,7 @@ public final class GesturePreference extends SwitchPreference {
@Override
public void onSurfaceTextureUpdated(SurfaceTexture surfaceTexture) {
if (mMediaPlayer.isPlaying() && imageView.getVisibility() == View.VISIBLE) {
if (mPreviewReady && imageView.getVisibility() == View.VISIBLE) {
imageView.setVisibility(View.GONE);
}
}