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

Add battery illustration

Browse Source 
Also update the VideoPreference to handle the full screen
illustration by adding attr isFullWidth and aspectRadio.

Change-Id: If2ccba4ce792801c6fd79b7c60af4e3826c091cc
Fixes: 74409022
Test: Screenshot | RunSettingsRoboTests
This commit is contained in:
Lei Yu
2018-03-30 09:50:02 -07:00
parent cf60ff7e08
commit 0a358ba47c
9 changed files with 110 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
res/drawable-nodpi/auto_awesome_battery Normal file
View File

30
res/layout/smart_battery_header.xml
View File

@@ -1,30 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2018 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- Entity header -->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/entity_header"
style="@style/EntityHeader"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:minHeight="200dp"
android:paddingBottom="32dp"
android:paddingStart="@dimen/preference_no_icon_padding_start"
android:paddingTop="24dp">
</LinearLayout>

4
res/layout/video_preference.xml
View File

@@ -23,11 +23,11 @@
android:clipToPadding="false"
android:gravity="center"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:orientation="horizontal">
<com.android.settings.widget.AspectRatioFrameLayout
android:layout_width="240dp"
android:id="@+id/video_container"
android:layout_width="wrap_content"
android:layout_height="240dp"
android:padding="@dimen/gesture_animation_padding">

0
res/raw/auto_awesome_battery.mp4 Normal file
View File

14
res/xml/smart_battery_detail.xml
View File

@@ -21,18 +21,16 @@
android:key="smart_battery_detail"
android:title="@string/smart_battery_manager_title">
<!-- TODO(b/71722498): Add header back, otherwise also remove smart_battery_header
<com.android.settings.applications.LayoutPreference
android:key="header_view"
android:layout="@layout/smart_battery_header"
android:selectable="false"
android:order="-10000"/>
-->
<com.android.settings.widget.VideoPreference
android:key="auto_awesome_battery"
settings:animation="@raw/auto_awesome_battery"
settings:preview="@drawable/auto_awesome_battery"/>
<SwitchPreference
android:key="smart_battery"
android:title="@string/smart_battery_title"
android:summary="@string/smart_battery_summary"/>
android:summary="@string/smart_battery_summary"
settings:allowDividerAbove="true"/>
<SwitchPreference
android:key="auto_restriction"

14
src/com/android/settings/widget/AspectRatioFrameLayout.java
View File

@@ -16,6 +16,7 @@ package com.android.settings.widget;
import android.content.Context;
import android.content.res.TypedArray;
import android.support.annotation.VisibleForTesting;
import android.util.AttributeSet;
import android.widget.FrameLayout;
@@ -30,7 +31,8 @@ public final class AspectRatioFrameLayout extends FrameLayout {
private static final float ASPECT_RATIO_CHANGE_THREASHOLD = 0.01f;
private float mAspectRatio = 1.0f;
@VisibleForTesting
float mAspectRatio = 1.0f;
public AspectRatioFrameLayout(Context context) {
this(context, null);
@@ -51,6 +53,10 @@ public final class AspectRatioFrameLayout extends FrameLayout {
}
}
public void setAspectRatio(float aspectRadio) {
mAspectRatio = aspectRadio;
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
@@ -65,11 +71,9 @@ public final class AspectRatioFrameLayout extends FrameLayout {
// Close enough, skip.
return;
}
if (aspectRatioDiff > 0) {
width = (int) (height * mAspectRatio);
} else {
height = (int) (width / mAspectRatio);
}
super.onMeasure(MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY));
}

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

@@ -22,6 +22,7 @@ import android.content.res.TypedArray;
import android.graphics.SurfaceTexture;
import android.media.MediaPlayer;
import android.net.Uri;
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
import android.util.AttributeSet;
@@ -42,10 +43,13 @@ public class VideoPreference extends Preference {
private final Context mContext;
private Uri mVideoPath;
private MediaPlayer mMediaPlayer;
private boolean mAnimationAvailable;
@VisibleForTesting
MediaPlayer mMediaPlayer;
@VisibleForTesting
boolean mAnimationAvailable;
private boolean mVideoReady;
private boolean mVideoPaused;
private float mAspectRadio = 1.0f;
private int mPreviewResource;
public VideoPreference(Context context, AttributeSet attrs) {
@@ -73,6 +77,7 @@ public class VideoPreference extends Preference {
mMediaPlayer.setOnPreparedListener(mediaPlayer -> mediaPlayer.setLooping(true));
mAnimationAvailable = true;
updateAspectRatio();
} else {
setVisible(false);
}
@@ -94,7 +99,11 @@ public class VideoPreference extends Preference {
final TextureView video = (TextureView) holder.findViewById(R.id.video_texture_view);
final ImageView imageView = (ImageView) holder.findViewById(R.id.video_preview_image);
final ImageView playButton = (ImageView) holder.findViewById(R.id.video_play_button);
final AspectRatioFrameLayout layout = (AspectRatioFrameLayout) holder.findViewById(
R.id.video_container);
imageView.setImageResource(mPreviewResource);
layout.setAspectRatio(mAspectRadio);
video.setOnClickListener(v -> {
if (mMediaPlayer != null) {
@@ -178,4 +187,9 @@ public class VideoPreference extends Preference {
return mVideoPaused;
}
@VisibleForTesting
void updateAspectRatio() {
mAspectRadio = mMediaPlayer.getVideoWidth() / (float)mMediaPlayer.getVideoHeight();
}
}

6
tests/robotests/src/com/android/settings/widget/AspectRatioFrameLayoutTest.java
View File

@@ -41,7 +41,7 @@ public class AspectRatioFrameLayoutTest {
}
@Test
public void measure_squareAspectRatio_stretchHeight() {
public void measure_squareAspectRatio_squeezeWidth() {
mLayout = new AspectRatioFrameLayout(mContext);
int widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.EXACTLY);
@@ -49,8 +49,8 @@ public class AspectRatioFrameLayoutTest {
mLayout.measure(widthMeasureSpec, heightMeasureSpec);
assertThat(mLayout.getMeasuredWidth()).isEqualTo(100);
assertThat(mLayout.getMeasuredHeight()).isEqualTo(100);
assertThat(mLayout.getMeasuredWidth()).isEqualTo(50);
assertThat(mLayout.getMeasuredHeight()).isEqualTo(50);
}
@Test

73
tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java Normal file
View File

@@ -0,0 +1,73 @@
/*
* Copyright (C) 2018 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.media.MediaPlayer;
import android.support.v7.preference.PreferenceViewHolder;
import android.view.LayoutInflater;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
@RunWith(SettingsRobolectricTestRunner.class)
public class VideoPreferenceTest {
private static final int VIDEO_WIDTH = 100;
private static final int VIDEO_HEIGHT = 150;
@Mock
private MediaPlayer mMediaPlayer;
private Context mContext;
private VideoPreference mVideoPreference;
private PreferenceViewHolder mPreferenceViewHolder;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mVideoPreference = new VideoPreference(mContext, null /* attrs */);
mVideoPreference.mMediaPlayer = mMediaPlayer;
when(mMediaPlayer.getVideoWidth()).thenReturn(VIDEO_WIDTH);
when(mMediaPlayer.getVideoHeight()).thenReturn(VIDEO_HEIGHT);
mPreferenceViewHolder = PreferenceViewHolder.createInstanceForTests(
LayoutInflater.from(mContext).inflate(R.layout.video_preference, null));
}
@Test
public void onBindViewHolder_hasCorrectRatio() {
mVideoPreference.mAnimationAvailable = true;
mVideoPreference.updateAspectRatio();
mVideoPreference.onBindViewHolder(mPreferenceViewHolder);
final AspectRatioFrameLayout layout =
(AspectRatioFrameLayout) mPreferenceViewHolder.findViewById(R.id.video_container);
assertThat(layout.mAspectRatio).isWithin(0.01f).of(VIDEO_WIDTH / (float) VIDEO_HEIGHT);
}
}