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

Merge "Typos in CheckBoxAndSettingsPreference"

Browse Source
This commit is contained in:
Gilles Debunne
2011-12-08 11:17:05 -08:00
committed by Android (Google) Code Review
parent d99ba493ef c79bf37621
commit 5aa7a15706
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/com/android/settings/inputmethod/CheckBoxAndSettingsPreference.java
View File

@@ -34,8 +34,7 @@ public class CheckBoxAndSettingsPreference extends CheckBoxPreference {
private SettingsPreferenceFragment mFragment; private SettingsPreferenceFragment mFragment;
private TextView mTitleText; private TextView mTitleText;
private TextView mSummaryText; private TextView mSummaryText;
private View mCheckBox; private ImageView mSettingsButton;
private ImageView mSetingsButton;
private Intent mSettingsIntent; private Intent mSettingsIntent;
public CheckBoxAndSettingsPreference(Context context, AttributeSet attrs) { public CheckBoxAndSettingsPreference(Context context, AttributeSet attrs) {
@@ -47,28 +46,28 @@ public class CheckBoxAndSettingsPreference extends CheckBoxPreference {
@Override @Override
protected void onBindView(View view) { protected void onBindView(View view) {
super.onBindView(view); super.onBindView(view);
mCheckBox = view.findViewById(R.id.inputmethod_pref); View textLayout = view.findViewById(R.id.inputmethod_pref);
mCheckBox.setOnClickListener( textLayout.setOnClickListener(
new OnClickListener() { new OnClickListener() {
@Override @Override
public void onClick(View arg0) { public void onClick(View arg0) {
onCheckBoxClicked(); onCheckBoxClicked();
} }
}); });
mSetingsButton = (ImageView)view.findViewById(R.id.inputmethod_settings);
mSettingsButton = (ImageView) view.findViewById(R.id.inputmethod_settings);
mTitleText = (TextView)view.findViewById(android.R.id.title); mTitleText = (TextView)view.findViewById(android.R.id.title);
mSummaryText = (TextView)view.findViewById(android.R.id.summary); mSummaryText = (TextView)view.findViewById(android.R.id.summary);
mSetingsButton.setOnClickListener( mSettingsButton.setOnClickListener(
new OnClickListener() { new OnClickListener() {
@Override @Override
public void onClick(View arg0) { public void onClick(View clickedView) {
onSettingsButtonClicked(arg0); onSettingsButtonClicked();
} }
}); });
enableSettingsButton(); enableSettingsButton();
} }
@Override @Override
public void setEnabled(boolean enabled) { public void setEnabled(boolean enabled) {
super.setEnabled(enabled); super.setEnabled(enabled);
@@ -88,23 +87,23 @@ public class CheckBoxAndSettingsPreference extends CheckBoxPreference {
} }
} }
protected void onSettingsButtonClicked(View arg0) { protected void onSettingsButtonClicked() {
if (mFragment != null && mSettingsIntent != null) { if (mFragment != null && mSettingsIntent != null) {
mFragment.startActivity(mSettingsIntent); mFragment.startActivity(mSettingsIntent);
} }
} }
private void enableSettingsButton() { private void enableSettingsButton() {
if (mSetingsButton != null) { if (mSettingsButton != null) {
if (mSettingsIntent == null) { if (mSettingsIntent == null) {
mSetingsButton.setVisibility(View.GONE); mSettingsButton.setVisibility(View.GONE);
} else { } else {
final boolean checked = isChecked(); final boolean checked = isChecked();
mSetingsButton.setEnabled(checked); mSettingsButton.setEnabled(checked);
mSetingsButton.setClickable(checked); mSettingsButton.setClickable(checked);
mSetingsButton.setFocusable(checked); mSettingsButton.setFocusable(checked);
if (!checked) { if (!checked) {
mSetingsButton.setAlpha(DISABLED_ALPHA); mSettingsButton.setAlpha(DISABLED_ALPHA);
} }
} }
} }