TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-01-11 18:43:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove broken custom dialog theme

Browse Source 
Closes #3121

// FREEBIE
This commit is contained in:
Jake McGinty 2015-05-07 12:55:17 -07:00 committed by Moxie Marlinspike
parent 4011208db3
commit 2d8de5291e
3 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@ -51,7 +51,7 @@
android:value="GlideModule" /> android:value="GlideModule" />
<activity android:name=".RegistrationProblemsActivity" <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"/> android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
<activity android:name=".CountrySelectionActivity" <activity android:name=".CountrySelectionActivity"
@ -179,7 +179,7 @@
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/> android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
<activity android:name=".ReceiveKeyActivity" <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"/> android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
<activity android:name=".ApplicationPreferencesActivity" <activity android:name=".ApplicationPreferencesActivity"

28
res/values/themes.xml
View File

@ -227,32 +227,4 @@
<item name="group_members_dialog_icon">@drawable/ic_group_white_24dp</item> <item name="group_members_dialog_icon">@drawable/ic_group_white_24dp</item>
</style> </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> </resources>

1
src/org/thoughtcrime/securesms/ReceiveKeyActivity.java
View File

@ -79,7 +79,6 @@ public class ReceiveKeyActivity extends PassphraseRequiredActionBarActivity {
protected void onCreate(Bundle state, @NonNull MasterSecret masterSecret) { protected void onCreate(Bundle state, @NonNull MasterSecret masterSecret) {
this.masterSecret = masterSecret; this.masterSecret = masterSecret;
setContentView(R.layout.receive_key_activity); setContentView(R.layout.receive_key_activity);
getSupportActionBar().hide();
initializeResources(); initializeResources();