Loading src/com/android/launcher3/allapps/FloatingMaskView.java +15 −6 Original line number Diff line number Diff line Loading @@ -21,6 +21,7 @@ import android.util.AttributeSet; import android.view.ViewGroup; import android.widget.ImageView; import androidx.annotation.VisibleForTesting; import androidx.constraintlayout.widget.ConstraintLayout; import com.android.launcher3.R; Loading Loading @@ -53,13 +54,21 @@ public class FloatingMaskView extends ConstraintLayout { @Override protected void onLayout(boolean changed, int left, int top, int right, int bottom) { super.onLayout(changed, left, top, right, bottom); ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams) getLayoutParams(); AllAppsRecyclerView allAppsContainerView = mActivityContext.getAppsView().getActiveRecyclerView(); setParameters((ViewGroup.MarginLayoutParams) getLayoutParams(), mActivityContext.getAppsView().getActiveRecyclerView()); } @VisibleForTesting void setParameters(ViewGroup.MarginLayoutParams lp, AllAppsRecyclerView recyclerView) { if (lp != null) { lp.rightMargin = allAppsContainerView.getPaddingRight(); lp.leftMargin = allAppsContainerView.getPaddingLeft(); mBottomBox.setMinimumHeight(allAppsContainerView.getPaddingBottom()); lp.rightMargin = recyclerView.getPaddingRight(); lp.leftMargin = recyclerView.getPaddingLeft(); getBottomBox().setMinimumHeight(recyclerView.getPaddingBottom()); } } @VisibleForTesting ImageView getBottomBox() { return mBottomBox; } } tests/src/com/android/launcher3/allapps/FloatingMaskViewTest.kt 0 → 100644 +66 −0 Original line number Diff line number Diff line /* * Copyright (C) 2024 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.launcher3.allapps import android.content.Context import android.view.ViewGroup import android.view.ViewGroup.MarginLayoutParams import android.widget.ImageView import androidx.test.core.app.ApplicationProvider import com.android.launcher3.util.ActivityContextWrapper import com.google.common.truth.Truth import org.junit.Before import org.junit.Test import org.mockito.Mock import org.mockito.Mockito import org.mockito.MockitoAnnotations class FloatingMaskViewTest { @Mock private val mockAllAppsRecyclerView: AllAppsRecyclerView? = null @Mock private val mockBottomBox: ImageView? = null private var mVut: FloatingMaskView? = null @Before fun setUp() { MockitoAnnotations.initMocks(this) val context: Context = ActivityContextWrapper(ApplicationProvider.getApplicationContext()) mVut = FloatingMaskView(context) mVut!!.layoutParams = MarginLayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT) } @Test fun setParameters_paramsMarginEqualRecyclerViewPadding() { val floatingMaskView = Mockito.spy(mVut) Mockito.`when`(mockAllAppsRecyclerView!!.paddingLeft).thenReturn(PADDING_PX) Mockito.`when`(mockAllAppsRecyclerView.paddingRight).thenReturn(PADDING_PX) Mockito.`when`(mockAllAppsRecyclerView.paddingBottom).thenReturn(PADDING_PX) Mockito.`when`(floatingMaskView!!.bottomBox).thenReturn(mockBottomBox) val lp = floatingMaskView.layoutParams as MarginLayoutParams floatingMaskView.setParameters(lp, mockAllAppsRecyclerView) Truth.assertThat(lp.leftMargin).isEqualTo(PADDING_PX) Truth.assertThat(lp.rightMargin).isEqualTo(PADDING_PX) Mockito.verify(mockBottomBox)?.minimumHeight = PADDING_PX } companion object { private const val PADDING_PX = 15 } } Loading
src/com/android/launcher3/allapps/FloatingMaskView.java +15 −6 Original line number Diff line number Diff line Loading @@ -21,6 +21,7 @@ import android.util.AttributeSet; import android.view.ViewGroup; import android.widget.ImageView; import androidx.annotation.VisibleForTesting; import androidx.constraintlayout.widget.ConstraintLayout; import com.android.launcher3.R; Loading Loading @@ -53,13 +54,21 @@ public class FloatingMaskView extends ConstraintLayout { @Override protected void onLayout(boolean changed, int left, int top, int right, int bottom) { super.onLayout(changed, left, top, right, bottom); ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams) getLayoutParams(); AllAppsRecyclerView allAppsContainerView = mActivityContext.getAppsView().getActiveRecyclerView(); setParameters((ViewGroup.MarginLayoutParams) getLayoutParams(), mActivityContext.getAppsView().getActiveRecyclerView()); } @VisibleForTesting void setParameters(ViewGroup.MarginLayoutParams lp, AllAppsRecyclerView recyclerView) { if (lp != null) { lp.rightMargin = allAppsContainerView.getPaddingRight(); lp.leftMargin = allAppsContainerView.getPaddingLeft(); mBottomBox.setMinimumHeight(allAppsContainerView.getPaddingBottom()); lp.rightMargin = recyclerView.getPaddingRight(); lp.leftMargin = recyclerView.getPaddingLeft(); getBottomBox().setMinimumHeight(recyclerView.getPaddingBottom()); } } @VisibleForTesting ImageView getBottomBox() { return mBottomBox; } }
tests/src/com/android/launcher3/allapps/FloatingMaskViewTest.kt 0 → 100644 +66 −0 Original line number Diff line number Diff line /* * Copyright (C) 2024 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.launcher3.allapps import android.content.Context import android.view.ViewGroup import android.view.ViewGroup.MarginLayoutParams import android.widget.ImageView import androidx.test.core.app.ApplicationProvider import com.android.launcher3.util.ActivityContextWrapper import com.google.common.truth.Truth import org.junit.Before import org.junit.Test import org.mockito.Mock import org.mockito.Mockito import org.mockito.MockitoAnnotations class FloatingMaskViewTest { @Mock private val mockAllAppsRecyclerView: AllAppsRecyclerView? = null @Mock private val mockBottomBox: ImageView? = null private var mVut: FloatingMaskView? = null @Before fun setUp() { MockitoAnnotations.initMocks(this) val context: Context = ActivityContextWrapper(ApplicationProvider.getApplicationContext()) mVut = FloatingMaskView(context) mVut!!.layoutParams = MarginLayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT) } @Test fun setParameters_paramsMarginEqualRecyclerViewPadding() { val floatingMaskView = Mockito.spy(mVut) Mockito.`when`(mockAllAppsRecyclerView!!.paddingLeft).thenReturn(PADDING_PX) Mockito.`when`(mockAllAppsRecyclerView.paddingRight).thenReturn(PADDING_PX) Mockito.`when`(mockAllAppsRecyclerView.paddingBottom).thenReturn(PADDING_PX) Mockito.`when`(floatingMaskView!!.bottomBox).thenReturn(mockBottomBox) val lp = floatingMaskView.layoutParams as MarginLayoutParams floatingMaskView.setParameters(lp, mockAllAppsRecyclerView) Truth.assertThat(lp.leftMargin).isEqualTo(PADDING_PX) Truth.assertThat(lp.rightMargin).isEqualTo(PADDING_PX) Mockito.verify(mockBottomBox)?.minimumHeight = PADDING_PX } companion object { private const val PADDING_PX = 15 } }