mirror of
https://github.com/oxen-io/session-android.git
synced 2025-01-11 22:03:54 +00:00
Move ReceiveKeyActivity back to themed dialog activity.
This commit is contained in:
parent
8d8a6ab998
commit
73bf21602a
@ -151,6 +151,7 @@
|
|||||||
|
|
||||||
<activity android:name=".ReceiveKeyActivity"
|
<activity android:name=".ReceiveKeyActivity"
|
||||||
android:label="@string/AndroidManifest__complete_key_exchange"
|
android:label="@string/AndroidManifest__complete_key_exchange"
|
||||||
|
android:theme="@style/TextSecure.Light.Dialog"
|
||||||
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
|
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
|
||||||
|
|
||||||
<activity android:name=".ApplicationPreferencesActivity"
|
<activity android:name=".ApplicationPreferencesActivity"
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
*/
|
*/
|
||||||
package org.thoughtcrime.securesms;
|
package org.thoughtcrime.securesms;
|
||||||
|
|
||||||
|
import android.app.Activity;
|
||||||
import android.app.ProgressDialog;
|
import android.app.ProgressDialog;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.os.AsyncTask;
|
import android.os.AsyncTask;
|
||||||
@ -44,7 +45,7 @@ import org.thoughtcrime.securesms.util.MemoryCleaner;
|
|||||||
* @author Moxie Marlinspike
|
* @author Moxie Marlinspike
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public class ReceiveKeyActivity extends PassphraseRequiredSherlockActivity {
|
public class ReceiveKeyActivity extends Activity {
|
||||||
|
|
||||||
private TextView descriptionText;
|
private TextView descriptionText;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user