am 0eda0765: am 43bdc5cd: am 10fb4f80: Merge "Fix theme for empty activity" into lmp-mr1-dev

* commit '0eda07657aad4a05d50896410ab56b48570e7d57':
  Fix theme for empty activity
This commit is contained in:
Amith Yamasani
2015-01-05 21:10:11 +00:00
committed by Android Git Automerger

View File

@@ -1113,7 +1113,8 @@
<!-- Lock screen settings --> <!-- Lock screen settings -->
<activity android:name="ConfirmDeviceCredentialActivity" <activity android:name="ConfirmDeviceCredentialActivity"
android:exported="true"> android:exported="true"
android:theme="@style/Transparent">
<intent-filter> <intent-filter>
<action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" /> <action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />