Android: Round top corners of BottomSheet

This CL makes the top corners of BottomSheet round shape (of radius
4dp). The round corners resides inside the top shadow and takes
the half the height.

Bug: 985644
Change-Id: Ibfc26c06a9ca4c83aa5f7304e27a91f50fba9df7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1710016
Commit-Queue: Jinsuk Kim <jinsukkim@chromium.org>
Reviewed-by: Matthew Jones <mdjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#680342}

chrome/android/java/res/drawable/white_with_top_rounded_corners.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2017 The Chromium Authors. All rights reserved.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file. -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid
+        android:color="@android:color/white"/>
+    <corners
+        android:topRightRadius="@dimen/bottom_sheet_corner_radius"
+        android:topLeftRadius="@dimen/bottom_sheet_corner_radius" />
+</shape>

chrome/android/java/res/layout/bottom_sheet.xml

@@ -5,7 +5,6 @@
 
 <org.chromium.chrome.browser.widget.bottomsheet.BottomSheet
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/bottom_sheet"
     android:layout_width="match_parent"
     android:layout_height="wrap_content" >
@@ -28,7 +27,14 @@
             android:src="@drawable/modern_toolbar_shadow"
             android:scaleType="fitXY"
             android:scaleY="-1"
-            tools:ignore="ContentDescription" />
+            android:importantForAccessibility="no" />
+        <ImageView
+            android:id="@+id/bottom_sheet_round_top"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/bottom_sheet_corner_radius"
+            android:layout_marginTop="@dimen/bottom_sheet_corner_radius"
+            android:src="@drawable/white_with_top_rounded_corners"
+            android:importantForAccessibility="no" />
 
         <view
             class="org.chromium.chrome.browser.widget.bottomsheet.TouchRestrictingFrameLayout"

chrome/android/java/res/values/dimens.xml

@@ -552,6 +552,7 @@
     <!-- Bottom Sheet dimensions -->
     <dimen name="bottom_sheet_min_full_half_distance">140dp</dimen>
     <dimen name="bottom_sheet_peek_height">56dp</dimen>
+    <dimen name="bottom_sheet_corner_radius">4dp</dimen>
 
     <!-- TextBubble dimensions -->
     <dimen name="text_bubble_margin">4dp</dimen>

chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java

@@ -149,6 +149,9 @@ public class BottomSheet
     /** The height of the shadow that sits above the toolbar. */
     private final int mToolbarShadowHeight;
 
+    /** The radius of the rounded corner at the top of the sheet. */
+    private final int mRoundedCornerRadius;
+
     /** The {@link BottomSheetMetrics} used to record user actions and histograms. */
     private final BottomSheetMetrics mMetrics;
 
@@ -420,7 +423,8 @@ public class BottomSheet
                 getResources().getDimensionPixelSize(R.dimen.bottom_sheet_min_full_half_distance);
         mToolbarShadowHeight =
                 getResources().getDimensionPixelOffset(R.dimen.toolbar_shadow_height);
-
+        mRoundedCornerRadius =
+                getResources().getDimensionPixelOffset(R.dimen.bottom_sheet_corner_radius);
         mMetrics = new BottomSheetMetrics();
         addObserver(mMetrics);
 
@@ -1181,7 +1185,7 @@ public class BottomSheet
     @VisibleForTesting
     float getFullRatio() {
         if (mContainerHeight <= 0) return 0;
-        return (mContainerHeight + mToolbarShadowHeight) / mContainerHeight;
+        return (mContainerHeight + mToolbarShadowHeight - mRoundedCornerRadius) / mContainerHeight;
     }
 
     /**
@@ -1397,7 +1401,8 @@ public class BottomSheet
         mSheetContent.getContentView().measure(
                 MeasureSpec.makeMeasureSpec((int) mContainerWidth, MeasureSpec.EXACTLY),
                 MeasureSpec.makeMeasureSpec((int) mContainerHeight, MeasureSpec.AT_MOST));
-        mContentDesiredHeight = mSheetContent.getContentView().getMeasuredHeight();
+        mContentDesiredHeight =
+                mSheetContent.getContentView().getMeasuredHeight() - mRoundedCornerRadius;
     }
 
     private float getRatioForState(int state) {
@@ -1595,4 +1600,9 @@ public class BottomSheet
     private void invalidateContentDesiredHeight() {
         mContentDesiredHeight = HEIGHT_UNSPECIFIED;
     }
+
+    @VisibleForTesting
+    int getRoundedCornerRadius() {
+        return mRoundedCornerRadius;
+    }
 }

chrome/android/javatests/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetObserverTest.java

@@ -257,7 +257,8 @@ public class BottomSheetObserverTest {
         assertEquals(BottomSheet.SheetState.FULL, bottomSheet.getSheetState());
 
         // Check the offset.
-        assertEquals(wrappedContentHeight + bottomSheet.getToolbarShadowHeight(),
+        assertEquals(wrappedContentHeight + bottomSheet.getToolbarShadowHeight()
+                        - bottomSheet.getRoundedCornerRadius(),
                 bottomSheet.getCurrentOffsetPx(), MathUtils.EPSILON);
     }
 }