jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/366739 )
Change subject: Fix: Crash when opening settings
......................................................................
Fix: Crash when opening settings
A recent change introduced a crash when opening the app settings. This
was because of a newly added v21 AppTheme style which was intended to
supplement the main AppTheme style but instead was overriding it. The
v21 AppTheme lacked a preferenceTheme attribute, which would cause the
app to crash with an IllegalStateException when opening the settings.
Change-Id: I29680bee09021d9d4de6277dfcd72751ba56f67f
---
D app/src/main/res/values-v21/styles.xml
M app/src/main/res/values/styles.xml
2 files changed, 2 insertions(+), 9 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/res/values-v21/styles.xml
b/app/src/main/res/values-v21/styles.xml
deleted file mode 100644
index c2072ad..0000000
--- a/app/src/main/res/values-v21/styles.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
- <style name="AppTheme" parent="Theme.Light">
- <item name="android:windowActivityTransitions">true</item>
- <item name="android:windowContentTransitions">true</item>
- </style>
-
-</resources>
diff --git a/app/src/main/res/values/styles.xml
b/app/src/main/res/values/styles.xml
index 2c72592..970b56d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -9,6 +9,8 @@
<item name="intPreferenceStyle">@style/IntPreference</item>
<item name="android:buttonStyle">@style/App.Button</item>
<item name="android:windowBackground">@drawable/splash_bg</item>
+ <item name="android:windowActivityTransitions" tools:targetApi="21"
>true</item>
+ <item name="android:windowContentTransitions" tools:targetApi="21"
>true</item>
</style>
<style name="PageTheme" parent="AppTheme">
--
To view, visit https://gerrit.wikimedia.org/r/366739
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I29680bee09021d9d4de6277dfcd72751ba56f67f
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
