PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update SpellCheckerPreference layout to support divider" into main

Browse Source
This commit is contained in:
Edgar Wang
2023-11-23 07:50:41 +00:00
committed by Android (Google) Code Review
parent 1e0301d70f 523d39266c
commit 40cc58f5a1
2 changed files with 100 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/com/android/settings/inputmethod/SpellCheckerPreference.java
View File

@@ -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() {