Merge changes I4073682b,I2c7db5d7 into main (938e9720) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/ui/view/ChipTextTruncationHelperTest.kt

0 → 100644

+121 −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.systemui.statusbar.chips.ui.view

		import android.view.View
		import android.widget.TextView
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.res.R
		import com.google.common.truth.Truth.assertThat
		import kotlin.test.Test
		import org.junit.Before
		import org.junit.runner.RunWith

		@SmallTest
		@RunWith(AndroidJUnit4::class)
		class ChipTextTruncationHelperTest : SysuiTestCase() {

		val underTest by lazy { ChipTextTruncationHelper(TextView(context)) }

		@Before
		fun setUp() {
		mContext.getOrCreateTestableResources().apply {
		this.addOverride(R.dimen.ongoing_activity_chip_max_text_width, MAX_WIDTH)
		}
		}

		@Test
		fun shouldShowText_desiredLessThanMax_true() {
		val result =
		underTest.shouldShowText(
		desiredTextWidthPx = MAX_WIDTH / 2,
		widthMeasureSpec = UNLIMITED_WIDTH_SPEC,
		)

		assertThat(result).isTrue()
		}

		@Test
		fun shouldShowText_desiredSlightlyLargerThanMax_true() {
		val result =
		underTest.shouldShowText(
		desiredTextWidthPx = (MAX_WIDTH * 1.1).toInt(),
		widthMeasureSpec = UNLIMITED_WIDTH_SPEC,
		)

		assertThat(result).isTrue()
		}

		@Test
		fun shouldShowText_desiredMoreThanTwiceMax_false() {
		val result =
		underTest.shouldShowText(
		desiredTextWidthPx = (MAX_WIDTH * 2.2).toInt(),
		widthMeasureSpec = UNLIMITED_WIDTH_SPEC,
		)

		assertThat(result).isFalse()
		}

		@Test
		fun shouldShowText_widthSpecLessThanMax_usesWidthSpec() {
		val smallerWidthSpec =
		SysuiMeasureSpec(
		View.MeasureSpec.makeMeasureSpec(MAX_WIDTH / 2, View.MeasureSpec.AT_MOST)
		)

		// WHEN desired is more than twice the smallerWidthSpec
		val desiredWidth = (MAX_WIDTH * 1.1).toInt()

		val result =
		underTest.shouldShowText(
		desiredTextWidthPx = desiredWidth,
		widthMeasureSpec = smallerWidthSpec,
		)

		// THEN returns false because smallerWidthSpec is used as the requirement
		assertThat(result).isFalse()
		}

		@Test
		fun shouldShowText_maxLessThanWidthSpec_usesMax() {
		val largerWidthSpec =
		SysuiMeasureSpec(
		View.MeasureSpec.makeMeasureSpec(MAX_WIDTH * 3, View.MeasureSpec.AT_MOST)
		)

		// WHEN desired is more than twice the max
		val desiredWidth = (MAX_WIDTH * 2.2).toInt()

		val result =
		underTest.shouldShowText(
		desiredTextWidthPx = desiredWidth,
		widthMeasureSpec = largerWidthSpec,
		)

		// THEN returns false because the max is used as the requirement
		assertThat(result).isFalse()
		}

		companion object {
		private const val MAX_WIDTH = 200
		private val UNLIMITED_WIDTH_SPEC =
		SysuiMeasureSpec(View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED))
		}
		}

packages/SystemUI/res/layout/ongoing_activity_chip.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -58,14 +58,14 @@
		/>

		<!-- Shows generic text. -->
		<TextView
		<com.android.systemui.statusbar.chips.ui.view.ChipTextView
		android:id="@+id/ongoing_activity_chip_text"
		style="@style/StatusBar.Chip.Text.LimitedWidth"
		android:visibility="gone"
		/>

		<!-- Shows a time delta in short form, like "15min" or "1hr". -->
		<android.widget.DateTimeView
		<com.android.systemui.statusbar.chips.ui.view.ChipDateTimeView
		android:id="@+id/ongoing_activity_chip_short_time_delta"
		style="@style/StatusBar.Chip.Text.LimitedWidth"
		android:visibility="gone"

packages/SystemUI/res/values/styles.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -91,7 +91,6 @@
		<item name="android:ellipsize">none</item>
		<item name="android:requiresFadingEdge">horizontal</item>
		<item name="android:fadingEdgeLength">@dimen/ongoing_activity_chip_text_fading_edge_length</item>
		<item name="android:maxWidth">@dimen/ongoing_activity_chip_max_text_width</item>
		</style>

		<style name="Chipbar" />

packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/view/ChipDateTimeView.kt

0 → 100644

+54 −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.systemui.statusbar.chips.ui.view

		import android.content.Context
		import android.content.res.Configuration
		import android.util.AttributeSet
		import android.widget.DateTimeView

		/** A [DateTimeView] for chips in the status bar. See also: [ChipTextView]. */
		class ChipDateTimeView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
		DateTimeView(context, attrs) {
		private val textTruncationHelper = ChipTextTruncationHelper(this)

		override fun onConfigurationChanged(newConfig: Configuration?) {
		super.onConfigurationChanged(newConfig)
		textTruncationHelper.onConfigurationChanged()
		}

		override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
		// Evaluate how wide the text wants to be if it had unlimited space. This is needed so
		// that [textTruncationHelper.shouldShowText] works correctly.
		super.onMeasure(textTruncationHelper.unlimitedWidthMeasureSpec.specInt, heightMeasureSpec)

		if (
		textTruncationHelper.shouldShowText(
		desiredTextWidthPx = measuredWidth,
		widthMeasureSpec = SysuiMeasureSpec(widthMeasureSpec),
		)
		) {
		// Show the text with the width spec specified by the helper
		super.onMeasure(textTruncationHelper.widthMeasureSpec.specInt, heightMeasureSpec)
		} else {
		// Changing visibility ensures that the content description is not read aloud when the
		// text isn't displayed.
		visibility = GONE
		setMeasuredDimension(0, 0)
		}
		}
		}

packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/view/ChipTextTruncationHelper.kt

0 → 100644

+95 −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.systemui.statusbar.chips.ui.view

		import android.view.View
		import android.view.View.MeasureSpec
		import android.widget.TextView.resolveSize
		import com.android.systemui.res.R

		/**
		* Helper class to determine when a status bar chip's text should be hidden because it's too long.
		*/
		class ChipTextTruncationHelper(private val view: View) {
		/** A measure spec for the status bar chip text with an unlimited width. */
		val unlimitedWidthMeasureSpec =
		SysuiMeasureSpec(MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED))

		/** The [MeasureSpec] that the view should actually use win [onMeasure]. */
		lateinit var widthMeasureSpec: SysuiMeasureSpec

		private var maxWidth: Int = 0
		set(value) {
		field = value
		maximumWidthMeasureSpec =
		SysuiMeasureSpec(MeasureSpec.makeMeasureSpec(maxWidth, MeasureSpec.AT_MOST))
		}

		/** A measure spec for the status bar chip text with the correct maximum width. */
		private lateinit var maximumWidthMeasureSpec: SysuiMeasureSpec

		init {
		maxWidth = fetchMaxWidth()
		}

		fun onConfigurationChanged() {
		maxWidth = fetchMaxWidth()
		}

		/**
		* Returns true if this view should show the text because there's enough room for a substantial
		* amount of text, and returns false if this view should hide the text because the text is much
		* too long.
		*
		* @param desiredTextWidthPx should be calculated by having the view measure itself with
		* [unlimitedWidthMeasureSpec] and then sending its `measuredWidth` to this method. (This
		* class can't compute [desiredTextWidthPx] directly because [View.onMeasure] can only be
		* called by the view itself.)
		* @param widthMeasureSpec the view's current and unmodified width spec
		*/
		fun shouldShowText(desiredTextWidthPx: Int, widthMeasureSpec: SysuiMeasureSpec): Boolean {
		// Evaluate how wide the text can be based on:
		// #1: The maximum width encoded by [maxWidth]
		val maxWidthBasedOnDimension =
		resolveSize(desiredTextWidthPx, maximumWidthMeasureSpec.specInt)
		// #2: The width the view is allowed to take up (If there's 2 chips, the second chip likely
		// has < [maxWidth] room available)
		val maxWidthBasedOnViewSpaceAvailable =
		resolveSize(desiredTextWidthPx, widthMeasureSpec.specInt)

		val enforcedTextWidth: Int
		if (maxWidthBasedOnViewSpaceAvailable < maxWidthBasedOnDimension) {
		// View space available takes priority
		this.widthMeasureSpec = widthMeasureSpec
		enforcedTextWidth = maxWidthBasedOnViewSpaceAvailable
		} else {
		// Enforce the maximum width
		this.widthMeasureSpec = maximumWidthMeasureSpec
		enforcedTextWidth = maxWidthBasedOnDimension
		}

		// Only show the text if at least 50% of it can show. (Assume that if < 50% of the text will
		// be visible, the text will be more confusing than helpful.)
		return desiredTextWidthPx <= enforcedTextWidth * 2
		}

		private fun fetchMaxWidth() =
		view.context.resources.getDimensionPixelSize(R.dimen.ongoing_activity_chip_max_text_width)
		}

		/** A typed class for [MeasureSpec] ints. */
		data class SysuiMeasureSpec(val specInt: Int)