diff options
author | Martijn Coenen <maco@google.com> | 2015-08-24 10:05:55 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-24 10:05:55 +0000 |
commit | aea1b9246ac749aba111785b49a12799a29abc35 (patch) | |
tree | a5de18e3238d4e20ffeb50b1e8e9aae47bea8f9d | |
parent | fb015c0d8129c15e3a4e5c54fad9a767650b76f0 (diff) | |
parent | ac4db9ce8aa24e99737782b57f924f7ddb9bb45f (diff) | |
download | android_packages_apps_Nfc-aea1b9246ac749aba111785b49a12799a29abc35.tar.gz android_packages_apps_Nfc-aea1b9246ac749aba111785b49a12799a29abc35.tar.bz2 android_packages_apps_Nfc-aea1b9246ac749aba111785b49a12799a29abc35.zip |
am ac4db9ce: am 9f289d60: am 14687fef: Fix crash when invoking Beam with NFC off.
* commit 'ac4db9ce8aa24e99737782b57f924f7ddb9bb45f':
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"> |