diff options
| author | hjchangliao <hjchangliao@google.com> | 2018-05-25 14:43:33 +0800 |
|---|---|---|
| committer | hjchangliao <hjchangliao@google.com> | 2018-05-28 11:27:26 +0800 |
| commit | 51ea41a541cd3ef0d96dcf9d7a5f31615986a8f0 (patch) | |
| tree | 2e8d247101689b7bf987b10247512d9b5b06235e /src/com/android/settings/nfc | |
| parent | 1c7ae169ac4a1b10a409f3ba39eee92a2d65e27f (diff) | |
| download | packages_apps_Settings-51ea41a541cd3ef0d96dcf9d7a5f31615986a8f0.tar.gz packages_apps_Settings-51ea41a541cd3ef0d96dcf9d7a5f31615986a8f0.tar.bz2 packages_apps_Settings-51ea41a541cd3ef0d96dcf9d7a5f31615986a8f0.zip | |
Update Android Beam screen layout
Use preference footer layout to replace
the old layout android_beam.
Change-Id: I878333ecc001631020706cb02edde48496859dcb
Fixes: 80085332
Test: Manual test
Diffstat (limited to 'src/com/android/settings/nfc')
| -rw-r--r-- | src/com/android/settings/nfc/AndroidBeam.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java index 4e90680aac..48780df2a9 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; } |