Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix additional summary of RestrictedSwitchPreference." into nyc-dev

Browse Source
This commit is contained in:
Sudheer Shanka
2016-04-20 17:50:18 +00:00
committed by Android (Google) Code Review
parent eeaaf26805 8f182f1454
commit 205d10bb13
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java
View File

@@ -94,9 +94,9 @@ public class RestrictedSwitchPreference extends SwitchPreference {
additionalSummaryView.setText( additionalSummaryView.setText(
isChecked() ? R.string.enabled_by_admin : R.string.disabled_by_admin); isChecked() ? R.string.enabled_by_admin : R.string.disabled_by_admin);
additionalSummaryView.setVisibility(View.VISIBLE); additionalSummaryView.setVisibility(View.VISIBLE);
} else {
additionalSummaryView.setVisibility(View.GONE);
} }
} else {
additionalSummaryView.setVisibility(View.GONE);
} }
} else { } else {
final TextView summaryView = (TextView) holder.findViewById(android.R.id.summary); final TextView summaryView = (TextView) holder.findViewById(android.R.id.summary);
@@ -106,9 +106,9 @@ public class RestrictedSwitchPreference extends SwitchPreference {
isChecked() ? R.string.enabled_by_admin : R.string.disabled_by_admin); isChecked() ? R.string.enabled_by_admin : R.string.disabled_by_admin);
summaryView.setVisibility(View.VISIBLE); summaryView.setVisibility(View.VISIBLE);
} }
// No need to change the visibility to GONE in the else case here since Preference
// class would have already changed it if there is no summary to display.
} }
// No need to change the visibility to GONE in the else case here since Preference class
// would have already changed it if there is no summary to display.
} }
} }