diff options
| author | Martijn Coenen <maco@google.com> | 2015-08-24 10:00:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-24 10:00:21 +0000 |
| commit | ac4db9ce8aa24e99737782b57f924f7ddb9bb45f (patch) | |
| tree | 806cfe25f23bc00a5d70c61a6c00ae7b7516747b | |
| parent | e66316f6bdcd8932019a08019aa7283bb6a89f29 (diff) | |
| parent | 9f289d60c3e8de8a01ec8efc409735eadba784ad (diff) | |
| download | android_packages_apps_Nfc-ac4db9ce8aa24e99737782b57f924f7ddb9bb45f.tar.gz android_packages_apps_Nfc-ac4db9ce8aa24e99737782b57f924f7ddb9bb45f.tar.bz2 android_packages_apps_Nfc-ac4db9ce8aa24e99737782b57f924f7ddb9bb45f.zip | |
am 9f289d60: am 14687fef: Fix crash when invoking Beam with NFC off.
* commit '9f289d60c3e8de8a01ec8efc409735eadba784ad':
Fix crash when invoking Beam with NFC off.
| -rwxr-xr-x | AndroidManifest.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 1cb5e5a4..9941c53e 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -106,7 +106,7 @@ <activity android:name=".BeamShareActivity" android:finishOnCloseSystemDialogs="true" - android:theme="@android:style/Theme.NoDisplay" + android:theme="@android:style/Theme.Translucent" android:label="@string/android_beam" android:noHistory="true" android:excludeFromRecents="true"> |