diff --git a/res/layout/android_beam.xml b/res/layout/android_beam.xml deleted file mode 100644 index 7780b31434e..00000000000 --- a/res/layout/android_beam.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java index 4e90680aac9..48780df2a90 100644 --- a/src/com/android/settings/nfc/AndroidBeam.java +++ b/src/com/android/settings/nfc/AndroidBeam.java @@ -25,7 +25,9 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.ImageView; import android.widget.Switch; +import android.widget.TextView; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; @@ -75,7 +77,13 @@ public class AndroidBeam extends InstrumentedFragment mBeamDisallowedByOnlyAdmin = true; return new View(getContext()); } - mView = inflater.inflate(R.layout.android_beam, container, false); + mView = inflater.inflate(R.layout.preference_footer, container, false); + + ImageView iconInfo = mView.findViewById(android.R.id.icon); + iconInfo.setImageResource(R.drawable.ic_info_outline_24dp); + TextView textInfo = mView.findViewById(android.R.id.title); + textInfo.setText(R.string.android_beam_explained); + return mView; }