Merge "Compute aspect ratio properly"

res/layout/video_preference.xml

@@ -28,7 +28,7 @@
 
     <com.android.settings.widget.AspectRatioFrameLayout
         android:layout_width="240dp"
-        android:layout_height="wrap_content"
+        android:layout_height="240dp"
         android:padding="@dimen/gesture_animation_padding">
 
         <TextureView

src/com/android/settings/widget/AspectRatioFrameLayout.java

@@ -22,12 +22,14 @@ import android.widget.FrameLayout;
 import com.android.settings.R;
 
 /**
- * A {@link FrameLayout} with customizable aspect ration.
+ * A {@link FrameLayout} with customizable aspect ratio.
  * This is used to avoid dynamically calculating the height for the frame. Default aspect
  * ratio will be 1 if none is set in layout attribute.
  */
 public final class AspectRatioFrameLayout extends FrameLayout {
 
+    private static final float ASPECT_RATIO_CHANGE_THREASHOLD = 0.01f;
+
     private float mAspectRatio = 1.0f;
 
     public AspectRatioFrameLayout(Context context) {
@@ -51,7 +53,25 @@ public final class AspectRatioFrameLayout extends FrameLayout {
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, (int) (widthMeasureSpec / mAspectRatio));
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        int width = getMeasuredWidth();
+        int height = getMeasuredHeight();
+        if (width == 0 || height == 0) {
+            return;
+        }
+        final float viewAspectRatio = (float) width / height;
+        final float aspectRatioDiff = mAspectRatio - viewAspectRatio;
+        if (Math.abs(aspectRatioDiff) <= ASPECT_RATIO_CHANGE_THREASHOLD) {
+            // 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));
     }
 
 }

tests/robotests/src/com/android/settings/widget/AspectRatioFrameLayoutTest.java

@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2017 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 android.content.Context;
+import android.view.View;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AspectRatioFrameLayoutTest {
+
+    private Context mContext;
+    private AspectRatioFrameLayout mLayout;
+
+    @Before
+    public void setup() {
+        mContext = RuntimeEnvironment.application;
+    }
+
+    @Test
+    public void measure_squareAspectRatio_stretchHeight() {
+        mLayout = new AspectRatioFrameLayout(mContext);
+
+        int widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.EXACTLY);
+        int heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(50, View.MeasureSpec.EXACTLY);
+
+        mLayout.measure(widthMeasureSpec, heightMeasureSpec);
+
+        assertThat(mLayout.getMeasuredWidth()).isEqualTo(100);
+        assertThat(mLayout.getMeasuredHeight()).isEqualTo(100);
+    }
+
+    @Test
+    public void measure_squareAspectRatio_stretchWidth() {
+        mLayout = new AspectRatioFrameLayout(mContext);
+
+        int widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(50, View.MeasureSpec.EXACTLY);
+        int heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.EXACTLY);
+
+        mLayout.measure(widthMeasureSpec, heightMeasureSpec);
+
+        assertThat(mLayout.getMeasuredWidth()).isEqualTo(100);
+        assertThat(mLayout.getMeasuredHeight()).isEqualTo(100);
+    }
+
+    @Test
+    public void measure_squareAspectRatio_doNotStretch() {
+        mLayout = new AspectRatioFrameLayout(mContext);
+
+        int widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.EXACTLY);
+        int heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.EXACTLY);
+
+        mLayout.measure(widthMeasureSpec, heightMeasureSpec);
+
+        assertThat(mLayout.getMeasuredWidth()).isEqualTo(100);
+        assertThat(mLayout.getMeasuredHeight()).isEqualTo(100);
+    }
+
+    @Test
+    public void measure_rectangleAspectRatio_stretch() {
+        mLayout = new AspectRatioFrameLayout(mContext);
+        // Set aspect ratio to 2:1.
+        ReflectionHelpers.setField(mLayout, "mAspectRatio", 2f);
+
+        int widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.EXACTLY);
+        int heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.EXACTLY);
+
+        mLayout.measure(widthMeasureSpec, heightMeasureSpec);
+
+        // Should stretch width/height to 2:1 ratio
+        assertThat(mLayout.getMeasuredWidth()).isEqualTo(200);
+        assertThat(mLayout.getMeasuredHeight()).isEqualTo(100);
+    }
+}