Merge "Cleanup flag "allow_set_title_max_lines"" into main (57d4f640) · Commits · e / os / android_frameworks_base

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

+8 −15

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ import androidx.preference.CheckBoxPreference;
		import androidx.preference.PreferenceViewHolder;

		import com.android.settingslib.widget.preference.selector.R;
		import com.android.settingslib.widget.selectorwithwidgetpreference.flags.Flags;

		/**
		* Selector preference (checkbox or radio button) with an optional additional widget.
		@@ -180,11 +179,9 @@ public class SelectorWithWidgetPreference extends CheckBoxPreference {
		: getContext().getString(R.string.settings_label));
		}

		if (Flags.allowSetTitleMaxLines()) {
		TextView title = (TextView) holder.findViewById(android.R.id.title);
		title.setMaxLines(mTitleMaxLines);
		}
		}

		/**
		* Set the visibility state of appendix view.
		@@ -244,17 +241,13 @@ public class SelectorWithWidgetPreference extends CheckBoxPreference {
		setLayoutResource(R.layout.preference_selector_with_widget);
		setIconSpaceReserved(false);

		if (Flags.allowSetTitleMaxLines()) {
		final TypedArray a =
		context.obtainStyledAttributes(
		attrs, R.styleable.SelectorWithWidgetPreference, defStyleAttr,
		defStyleRes);
		attrs, R.styleable.SelectorWithWidgetPreference, defStyleAttr, defStyleRes);
		mTitleMaxLines =
		a.getInt(R.styleable.SelectorWithWidgetPreference_titleMaxLines,
		DEFAULT_MAX_LINES);
		a.getInt(R.styleable.SelectorWithWidgetPreference_titleMaxLines, DEFAULT_MAX_LINES);
		a.recycle();
		}
		}

		@VisibleForTesting(otherwise = VisibleForTesting.NONE)
		public View getExtraWidget() {

packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/SelectorWithWidgetPreferenceTest.java

+0 −27

Original line number	Diff line number	Diff line
		@@ -21,9 +21,6 @@ import static com.google.common.truth.Truth.assertThat;
		import static org.junit.Assert.assertEquals;

		import android.app.Application;
		import android.platform.test.annotations.DisableFlags;
		import android.platform.test.annotations.EnableFlags;
		import android.platform.test.flag.junit.SetFlagsRule;
		import android.util.AttributeSet;
		import android.view.LayoutInflater;
		import android.view.View;
		@@ -33,10 +30,8 @@ import androidx.preference.PreferenceViewHolder;
		import androidx.test.core.app.ApplicationProvider;

		import com.android.settingslib.widget.preference.selector.R;
		import com.android.settingslib.widget.selectorwithwidgetpreference.flags.Flags;

		import org.junit.Before;
		import org.junit.Rule;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.robolectric.Robolectric;
		@@ -45,7 +40,6 @@ import org.robolectric.RobolectricTestRunner;
		@RunWith(RobolectricTestRunner.class)
		public class SelectorWithWidgetPreferenceTest {

		@Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
		private Application mContext;
		private SelectorWithWidgetPreference mPreference;

		@@ -128,26 +122,6 @@ public class SelectorWithWidgetPreferenceTest {
		}

		@Test
		@DisableFlags(Flags.FLAG_ALLOW_SET_TITLE_MAX_LINES)
		public void onBindViewHolder_titleMaxLinesSet_flagOff_titleMaxLinesMatchesDefault() {
		final int titleMaxLines = 5;
		AttributeSet attributeSet = Robolectric.buildAttributeSet()
		.addAttribute(R.attr.titleMaxLines, String.valueOf(titleMaxLines))
		.build();
		mPreference = new SelectorWithWidgetPreference(mContext, attributeSet);
		View view = LayoutInflater.from(mContext)
		.inflate(mPreference.getLayoutResource(), null /* root */);
		PreferenceViewHolder preferenceViewHolder =
		PreferenceViewHolder.createInstanceForTests(view);

		mPreference.onBindViewHolder(preferenceViewHolder);

		TextView title = (TextView) preferenceViewHolder.findViewById(android.R.id.title);
		assertThat(title.getMaxLines()).isEqualTo(SelectorWithWidgetPreference.DEFAULT_MAX_LINES);
		}

		@Test
		@EnableFlags(Flags.FLAG_ALLOW_SET_TITLE_MAX_LINES)
		public void onBindViewHolder_noTitleMaxLinesSet_titleMaxLinesMatchesDefault() {
		AttributeSet attributeSet = Robolectric.buildAttributeSet().build();
		mPreference = new SelectorWithWidgetPreference(mContext, attributeSet);
		@@ -163,7 +137,6 @@ public class SelectorWithWidgetPreferenceTest {
		}

		@Test
		@EnableFlags(Flags.FLAG_ALLOW_SET_TITLE_MAX_LINES)
		public void onBindViewHolder_titleMaxLinesSet_titleMaxLinesUpdated() {
		final int titleMaxLines = 5;
		AttributeSet attributeSet = Robolectric.buildAttributeSet()