From 523d39266c0e41095a44c33ae98dbb1a1ae4350a Mon Sep 17 00:00:00 2001 From: Edgar Wang Date: Wed, 22 Nov 2023 13:28:48 +0800 Subject: [PATCH] Update SpellCheckerPreference layout to support divider Bug: 246499664 Test: robotest and visual Change-Id: I96908f4b566820b20a57e0161d74dfed2c566ea5 --- .../inputmethod/SpellCheckerPreference.java | 33 ++++++-- .../SpellCheckerPreferenceTest.java | 75 +++++++++++++++++++ 2 files changed, 100 insertions(+), 8 deletions(-) create mode 100644 tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceTest.java diff --git a/src/com/android/settings/inputmethod/SpellCheckerPreference.java b/src/com/android/settings/inputmethod/SpellCheckerPreference.java index 8c8942a00c6..b8028fe58a6 100644 --- a/src/com/android/settings/inputmethod/SpellCheckerPreference.java +++ b/src/com/android/settings/inputmethod/SpellCheckerPreference.java @@ -25,6 +25,7 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.textservice.SpellCheckerInfo; +import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog.Builder; import androidx.preference.PreferenceViewHolder; @@ -41,11 +42,15 @@ import com.android.settings.R; class SpellCheckerPreference extends CustomListPreference { private final SpellCheckerInfo[] mScis; - private Intent mIntent; + @VisibleForTesting + Intent mIntent; public SpellCheckerPreference(final Context context, final SpellCheckerInfo[] scis) { super(context, null); mScis = scis; + setLayoutResource( + com.android.settingslib.widget.preference.twotarget.R.layout.preference_two_target); + setWidgetLayoutResource(R.layout.preference_widget_gear); if (scis == null) { return; @@ -108,14 +113,26 @@ class SpellCheckerPreference extends CustomListPreference { @Override public void onBindViewHolder(PreferenceViewHolder view) { super.onBindViewHolder(view); + final View divider = view.findViewById( + com.android.settingslib.widget.preference.twotarget.R.id.two_target_divider); + final View widgetFrame = view.findViewById(android.R.id.widget_frame); + if (divider != null) { + divider.setVisibility(mIntent != null ? View.VISIBLE : View.GONE); + } + if (widgetFrame != null) { + widgetFrame.setVisibility(mIntent != null ? View.VISIBLE : View.GONE); + } + View settingsButton = view.findViewById(R.id.settings_button); - settingsButton.setVisibility(mIntent != null ? View.VISIBLE : View.INVISIBLE); - settingsButton.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - onSettingsButtonClicked(); - } - }); + if (settingsButton != null) { + settingsButton.setVisibility(mIntent != null ? View.VISIBLE : View.INVISIBLE); + settingsButton.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + onSettingsButtonClicked(); + } + }); + } } private void onSettingsButtonClicked() { diff --git a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceTest.java b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceTest.java new file mode 100644 index 00000000000..d8e54b02fbe --- /dev/null +++ b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceTest.java @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2023 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.settings.inputmethod; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.spy; + +import android.content.Context; +import android.content.Intent; +import android.view.View; +import android.view.textservice.SpellCheckerInfo; + +import androidx.preference.PreferenceViewHolder; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; + +@RunWith(RobolectricTestRunner.class) +public class SpellCheckerPreferenceTest { + + private Context mContext; + private PreferenceViewHolder mViewHolder; + private View mDivider; + private SpellCheckerPreference mPreference; + private final SpellCheckerInfo[] mScis = new SpellCheckerInfo[]{}; + + @Before + public void setUp() { + mContext = RuntimeEnvironment.application; + mPreference = new SpellCheckerPreference(mContext, mScis); + } + + @Test + public void onBindViewHolder_withIntent_DividerIsVisible() { + final View view = spy(View.inflate(mContext, mPreference.getLayoutResource(), null)); + mViewHolder = PreferenceViewHolder.createInstanceForTests(view); + mDivider = view.findViewById( + com.android.settingslib.widget.preference.twotarget.R.id.two_target_divider); + mPreference.mIntent = new Intent(Intent.ACTION_MAIN); + + mPreference.onBindViewHolder(mViewHolder); + + assertThat(mDivider.getVisibility()).isEqualTo(View.VISIBLE); + } + + @Test + public void onBindViewHolder_withoutIntent_DividerIsNotExist() { + final View view = spy(View.inflate(mContext, mPreference.getLayoutResource(), null)); + mViewHolder = PreferenceViewHolder.createInstanceForTests(view); + mDivider = view.findViewById( + com.android.settingslib.widget.preference.twotarget.R.id.two_target_divider); + + mPreference.onBindViewHolder(mViewHolder); + + assertThat(mDivider.getVisibility()).isEqualTo(View.GONE); + } +}