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

Commit 8de45a66 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am 1bdb7874: Make summary appear for both checked and unchecked NFC checkbox in Settings. 

Merge commit '1bdb7874' into gingerbread-plus-aosp

* commit '1bdb7874':
  Make summary appear for both checked and unchecked NFC checkbox in Settings.
parents d3c1749b 1bdb7874

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -785,7 +785,7 @@ 
    <!-- Used in the 1st-level settings screen to turn on NFC -->

    <string name="nfc_quick_toggle_title">NFC</string>

    <!-- Used in the 1st-level settings screen as the turn-on summary -->

    <string name="nfc_quick_toggle_summary">Use Near Field Communication to read Tags and exchange Tags</string>

    <string name="nfc_quick_toggle_summary">Use Near Field Communication to read and exchange tags</string>



    <!-- Wi-Fi Settings --> <skip />

    <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->

src/com/android/settings/nfc/NfcEnabler.java

+1 −6
Original line number Diff line number Diff line
@@ -91,10 +91,5 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener { 


    private void updateUi() {

        mCheckbox.setChecked(mNfcState);

        if (mNfcState) {

            mCheckbox.setSummary(null);

        } else {

            mCheckbox.setSummary(R.string.nfc_quick_toggle_summary);

        }

    }

}