From 8f182f14540624e1af88ae91c9de493dea71fa6e Mon Sep 17 00:00:00 2001 From: Sudheer Shanka Date: Tue, 19 Apr 2016 17:27:52 -0700 Subject: [PATCH] Fix additional summary of RestrictedSwitchPreference. Bug: 27659072 Change-Id: I27fec7d5bf3daeb5525cf45c328aa2f0c93f7490 --- .../android/settingslib/RestrictedSwitchPreference.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java index e300f4535810f..b178e4870beda 100644 --- a/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java @@ -94,9 +94,9 @@ public class RestrictedSwitchPreference extends SwitchPreference { additionalSummaryView.setText( isChecked() ? R.string.enabled_by_admin : R.string.disabled_by_admin); additionalSummaryView.setVisibility(View.VISIBLE); + } else { + additionalSummaryView.setVisibility(View.GONE); } - } else { - additionalSummaryView.setVisibility(View.GONE); } } else { 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); 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. } }