diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e8d5599d06..728b34e53d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -51,7 +51,7 @@ android:value="GlideModule" /> <activity android:name=".RegistrationProblemsActivity" - android:theme="@style/TextSecure.Light.Dialog" + android:theme="@style/Theme.AppCompat.Light.DialogWhenLarge" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/> <activity android:name=".CountrySelectionActivity" @@ -179,7 +179,7 @@ android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/> <activity android:name=".ReceiveKeyActivity" - android:theme="@style/TextSecure.Light.Dialog" + android:theme="@style/Theme.AppCompat.Light.DialogWhenLarge" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/> <activity android:name=".ApplicationPreferencesActivity" diff --git a/res/values/themes.xml b/res/values/themes.xml index 360d8ad73c..6c73153140 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -227,32 +227,4 @@ <item name="group_members_dialog_icon">@drawable/ic_group_white_24dp</item> </style> - - <style name="TextSecure.Light.Dialog" - parent="Theme.AppCompat.Light.DialogWhenLarge" - tools:ignore="NewApi"> - <item name="android:windowFrame">@null</item> - <item name="android:windowTitleStyle">@style/TextSecureDialogWindowTitle</item> - <item name="android:windowBackground">@drawable/dialog_full_holo_light</item> - <item name="android:windowIsFloating">true</item> - <item name="android:windowContentOverlay">@null</item> - <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item> - <item name="android:windowActionBar">false</item> - <item name="android:windowTitleSize">0dp</item> - <item name="android:windowActionModeOverlay">true</item> - - <item name="android:colorBackgroundCacheHint">@null</item> - - <item name="android:buttonBarStyle">@style/TextSecureDialogButtonBar</item> - <item name="android:borderlessButtonStyle">@style/TextSecureBorderlessButtonSmall</item> - <item name="android:textColor">@color/black</item> - <item name="android:textSize">16sp</item> - <item name="android:textStyle">normal</item> - - <item name="android:listPreferredItemPaddingLeft">16dip</item> - <item name="android:listPreferredItemPaddingRight">16dip</item> - <item name="android:listPreferredItemPaddingStart">16dip</item> - <item name="android:listPreferredItemPaddingEnd">16dip</item> - </style> - </resources> diff --git a/src/org/thoughtcrime/securesms/ReceiveKeyActivity.java b/src/org/thoughtcrime/securesms/ReceiveKeyActivity.java index e300feb463..419cd35ee5 100644 --- a/src/org/thoughtcrime/securesms/ReceiveKeyActivity.java +++ b/src/org/thoughtcrime/securesms/ReceiveKeyActivity.java @@ -79,7 +79,6 @@ public class ReceiveKeyActivity extends PassphraseRequiredActionBarActivity { protected void onCreate(Bundle state, @NonNull MasterSecret masterSecret) { this.masterSecret = masterSecret; setContentView(R.layout.receive_key_activity); - getSupportActionBar().hide(); initializeResources();