Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6f61fc8 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by android-build-merger
Browse files

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

am: 205d10bb

* commit '205d10bb':
  Fix additional summary of RestrictedSwitchPreference.

Change-Id: I8c16ff47a743a17f31c2db1f88c810aba74823d2
parents dbc5727b 205d10bb

packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -94,10 +94,10 @@ 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 {

                } else {

                    additionalSummaryView.setVisibility(View.GONE);

                    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);

            if (summaryView != null) {

            if (summaryView != null) {
@@ -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.

        }

        }

    }

    }