Skip to content

Commit 2d8de52

Browse files
mcgintymoxie0
authored andcommitted
Remove broken custom dialog theme
Closes signalapp#3121 // FREEBIE
1 parent 4011208 commit 2d8de52

File tree

3 files changed

+2
-31
lines changed

3 files changed

+2
-31
lines changed

AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
android:value="GlideModule" />
5252

5353
<activity android:name=".RegistrationProblemsActivity"
54-
android:theme="@style/TextSecure.Light.Dialog"
54+
android:theme="@style/Theme.AppCompat.Light.DialogWhenLarge"
5555
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
5656

5757
<activity android:name=".CountrySelectionActivity"
@@ -179,7 +179,7 @@
179179
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
180180

181181
<activity android:name=".ReceiveKeyActivity"
182-
android:theme="@style/TextSecure.Light.Dialog"
182+
android:theme="@style/Theme.AppCompat.Light.DialogWhenLarge"
183183
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
184184

185185
<activity android:name=".ApplicationPreferencesActivity"

res/values/themes.xml

-28
Original file line numberDiff line numberDiff line change
@@ -227,32 +227,4 @@
227227

228228
<item name="group_members_dialog_icon">@drawable/ic_group_white_24dp</item>
229229
</style>
230-
231-
<style name="TextSecure.Light.Dialog"
232-
parent="Theme.AppCompat.Light.DialogWhenLarge"
233-
tools:ignore="NewApi">
234-
<item name="android:windowFrame">@null</item>
235-
<item name="android:windowTitleStyle">@style/TextSecureDialogWindowTitle</item>
236-
<item name="android:windowBackground">@drawable/dialog_full_holo_light</item>
237-
<item name="android:windowIsFloating">true</item>
238-
<item name="android:windowContentOverlay">@null</item>
239-
<item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
240-
<item name="android:windowActionBar">false</item>
241-
<item name="android:windowTitleSize">0dp</item>
242-
<item name="android:windowActionModeOverlay">true</item>
243-
244-
<item name="android:colorBackgroundCacheHint">@null</item>
245-
246-
<item name="android:buttonBarStyle">@style/TextSecureDialogButtonBar</item>
247-
<item name="android:borderlessButtonStyle">@style/TextSecureBorderlessButtonSmall</item>
248-
<item name="android:textColor">@color/black</item>
249-
<item name="android:textSize">16sp</item>
250-
<item name="android:textStyle">normal</item>
251-
252-
<item name="android:listPreferredItemPaddingLeft">16dip</item>
253-
<item name="android:listPreferredItemPaddingRight">16dip</item>
254-
<item name="android:listPreferredItemPaddingStart">16dip</item>
255-
<item name="android:listPreferredItemPaddingEnd">16dip</item>
256-
</style>
257-
258230
</resources>

src/org/thoughtcrime/securesms/ReceiveKeyActivity.java

-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ public class ReceiveKeyActivity extends PassphraseRequiredActionBarActivity {
7979
protected void onCreate(Bundle state, @NonNull MasterSecret masterSecret) {
8080
this.masterSecret = masterSecret;
8181
setContentView(R.layout.receive_key_activity);
82-
getSupportActionBar().hide();
8382

8483
initializeResources();
8584

0 commit comments

Comments
 (0)