Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 151f49a2 authored Nov 04, 2024 by Edgar Wang

[Expressive design] some widgets should not be round corner

- ButtonPReference
- FooterPreference
- TopIntroPreference
- StatusBannerPreference

Bug: 377266201
Test: visual test
Flag: EXEMPT update library
Change-Id: Id23b89974dc6ae7ec691c6431de0c4cbb89a924b

parent 4a87d601

packages/SettingsLib/ButtonPreference/src/com/android/settingslib/widget/ButtonPreference.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ import com.google.android.material.button.MaterialButton;
		/**
		* A preference handled a button
		*/
		public class ButtonPreference extends Preference {
		public class ButtonPreference extends Preference implements GroupSectionDividerMixin {

		enum ButtonStyle {
		FILLED_NORMAL(0, 0, R.layout.settingslib_expressive_button_filled),

packages/SettingsLib/FooterPreference/src/com/android/settingslib/widget/FooterPreference.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ import java.net.URISyntaxException;
		* A custom preference acting as "footer" of a page. It has a field for icon and text. It is added
		* to screen as the last preference.
		*/
		public class FooterPreference extends Preference {
		public class FooterPreference extends Preference implements GroupSectionDividerMixin {
		private static final String TAG = "FooterPreference";

		public static final String KEY_FOOTER = "footer_preference";

packages/SettingsLib/StatusBannerPreference/src/com/android/settingslib/widget/StatusBannerPreference.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ class StatusBannerPreference @JvmOverloads constructor(
		attrs: AttributeSet? = null,
		defStyleAttr: Int = 0,
		defStyleRes: Int = 0
		) : Preference(context, attrs, defStyleAttr, defStyleRes) {
		) : Preference(context, attrs, defStyleAttr, defStyleRes), GroupSectionDividerMixin {

		enum class BannerStatus {
		GENERIC,

packages/SettingsLib/TopIntroPreference/src/com/android/settingslib/widget/TopIntroPreference.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ open class TopIntroPreference @JvmOverloads constructor(
		attrs: AttributeSet? = null,
		defStyleAttr: Int = 0,
		defStyleRes: Int = 0
		) : Preference(context, attrs, defStyleAttr, defStyleRes) {
		) : Preference(context, attrs, defStyleAttr, defStyleRes), GroupSectionDividerMixin {

		private var isCollapsable: Boolean = false
		private var minLines: Int = 2