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

Allow switchbars to have alternate text

Browse Source 
For when On and Off aren't descriptive enough.

Bug: 63927402
Test: make -j20 RunSettingsRoboTests
Change-Id: I1e12d8d92dbe2f0a4c5202667cf1a76f0428e048
This commit is contained in:
Julia Reynolds
2017-12-21 13:26:39 -05:00
parent ce3633be80
commit 9c3d329de6
2 changed files with 85 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/widget/SwitchBar.java
View File

@@ -64,6 +64,8 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC
private TextView mTextView;
private String mLabel;
private String mSummary;
private int mOnTextId;
private int mOffTextId;
private boolean mLoggingIntialized;
private boolean mDisabledByAdmin;
@@ -102,9 +104,7 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC
mTextView = (TextView) findViewById(R.id.switch_text);
mTextView.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
mLabel = getResources().getString(R.string.switch_off_text);
mSummarySpan = new TextAppearanceSpan(mContext, R.style.TextAppearance_Small_SwitchBar);
updateText();
ViewGroup.MarginLayoutParams lp = (MarginLayoutParams) mTextView.getLayoutParams();
lp.setMarginStart(switchBarMarginStart);
@@ -117,6 +117,8 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC
lp.setMarginEnd(switchBarMarginEnd);
setBackgroundColor(switchBarBackgroundColor);
setSwitchBarText(R.string.switch_on_text, R.string.switch_off_text);
addOnSwitchChangeListener(new OnSwitchChangeListener() {
@Override
public void onSwitchChanged(Switch switchView, boolean isChecked) {
@@ -139,11 +141,16 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC
}
public void setTextViewLabel(boolean isChecked) {
mLabel = getResources()
.getString(isChecked ? R.string.switch_on_text : R.string.switch_off_text);
mLabel = getResources().getString(isChecked ? mOnTextId : mOffTextId);
updateText();
}
public void setSwitchBarText(int onText, int offText) {
mOnTextId = onText;
mOffTextId = offText;
setTextViewLabel(isChecked());
}
public void setSummary(String summary) {
mSummary = summary;
updateText();