summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andrej Karadžić <andrejk@google.com> 2025-03-18 03:57:30 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2025-03-18 03:57:30 -0700
commit97de09f9db09ffe3703eaa542cb7f49ff71e8afb (patch)
tree29c8f194e10a941d9610b4dd7658c6b2dd386d12
parent3a641657c7ca8f49bb4064a4faf191e328aff7aa (diff)
parent56f4e644f4d63510ccfe1b99c457c13d17360263 (diff)
Merge "Make "Learn more" link horizontally centered in CollapsableTextView" into main
-rw-r--r--packages/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_collapsable_textview.xml3
-rw-r--r--packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/CollapsableTextView.kt1
2 files changed, 3 insertions, 1 deletions
diff --git a/packages/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_collapsable_textview.xml b/packages/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_collapsable_textview.xml
index 7d7bec14ed78..cc55cacb9e5c 100644
--- a/packages/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_collapsable_textview.xml
+++ b/packages/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_collapsable_textview.xml
@@ -44,10 +44,11 @@
<com.android.settingslib.widget.LinkableTextView
android:id="@+id/settingslib_expressive_learn_more"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@android:id/title"
app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
android:paddingTop="@dimen/settingslib_expressive_space_extrasmall6"
android:textAlignment="viewStart"
android:clickable="true"
diff --git a/packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/CollapsableTextView.kt b/packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/CollapsableTextView.kt
index 976711bdc5f3..007dc5143262 100644
--- a/packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/CollapsableTextView.kt
+++ b/packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/CollapsableTextView.kt
@@ -85,6 +85,7 @@ class CollapsableTextView @JvmOverloads constructor(
Gravity.CENTER_VERTICAL, Gravity.CENTER, Gravity.CENTER_HORIZONTAL -> {
centerHorizontally(titleTextView)
centerHorizontally(collapseButton)
+ centerHorizontally(learnMoreTextView)
}
}
isCollapsable = getBoolean(isCollapsableAttr, DEFAULT_COLLAPSABLE)