From f88b438a8190a41a707a207b7b0f8b52ad9ad1f4 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 18 Apr 2017 06:47:53 -0700
Subject: [PATCH] get rid of configChanges altogether

Recent recommendations are not to attempt to handle it myself, so don't
and we'll see how it goes. And unify notions of tablet and enabling
dual-pane: a device that isn't dual-pane should not be using the new
single-activity stuff at all.
---
 xwords4/android/app/src/main/AndroidManifest.xml   | 14 --------------
 .../java/org/eehouse/android/xw4/MainActivity.java |  2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/xwords4/android/app/src/main/AndroidManifest.xml b/xwords4/android/app/src/main/AndroidManifest.xml
index a6a98bcb5..5f605cca3 100644
--- a/xwords4/android/app/src/main/AndroidManifest.xml
+++ b/xwords4/android/app/src/main/AndroidManifest.xml
@@ -78,30 +78,24 @@
 
     <activity android:name="DictsActivity"
               android:label="@string/title_dicts_list"
-              android:configChanges="keyboardHidden|orientation|screenSize"
           />
     
     <activity android:name="BTInviteActivity"
 			  android:label="@string/bt_invite_title"
-              android:configChanges="keyboardHidden|orientation|screenSize"
               />
     <activity android:name="SMSInviteActivity"
 			  android:label="@string/sms_invite_title"
-              android:configChanges="keyboardHidden|orientation|screenSize"
               android:screenOrientation="sensor"
               />
     <activity android:name="RelayInviteActivity"
 			  android:label="@string/relay_invite_title"
-              android:configChanges="keyboardHidden|orientation|screenSize"
               />
     <activity android:name="WiDirInviteActivity"
 			  android:label="@string/p2p_invite_title"
-              android:configChanges="keyboardHidden|orientation|screenSize"
               />
 
     <activity android:name="GameConfigActivity"
               android:screenOrientation="sensor"
-              android:configChanges="keyboardHidden|orientation|screenSize"
               android:windowSoftInputMode="stateAlwaysHidden"
               >
       <intent-filter>
@@ -112,17 +106,14 @@
     <activity android:name="PrefsActivity"
               android:label="@string/title_prefs"
               android:screenOrientation="sensor"
-              android:configChanges="keyboardHidden|orientation|screenSize"
               />
 
     <activity android:name="BoardActivity"
               android:screenOrientation="portrait"
-              android:configChanges="keyboardHidden|orientation|screenSize"
               android:windowSoftInputMode="stateAlwaysHidden|adjustPan"
               />
 
     <activity android:name="StudyListActivity"
-              android:configChanges="keyboardHidden|orientation|screenSize"
               />
 
     <receiver android:name="OnBootReceiver">
@@ -170,7 +161,6 @@
     <activity android:name=".DwnldActivity"
               android:label="@string/app_name"
               android:theme="@android:style/Theme.Dialog"
-              android:configChanges="keyboardHidden|orientation|screenSize"
               >
       <intent-filter>
         <action android:name="android.intent.action.VIEW"></action>
@@ -186,16 +176,12 @@
     </activity>
 
     <activity android:name="DictBrowseActivity"
-              android:configChanges="keyboardHidden|orientation|screenSize"
               />
     <activity android:name="ChatActivity"
-              android:configChanges="keyboardHidden|orientation|screenSize"
               />
     <activity android:name=".loc.LocActivity"
-              android:configChanges="keyboardHidden|orientation|screenSize"
               />
     <activity android:name=".loc.LocItemEditActivity"
-              android:configChanges="keyboardHidden|orientation|screenSize"
               />
 
     <service android:name="RelayService"/>
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MainActivity.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MainActivity.java
index 91ff5a72a..3627ab10f 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MainActivity.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MainActivity.java
@@ -65,7 +65,7 @@ public class MainActivity extends XWActivity
     @Override
     protected void onCreate( Bundle savedInstanceState )
     {
-        m_dpEnabled = XWPrefs.dualpaneEnabled( this );
+        m_dpEnabled = XWPrefs.dualpaneEnabled( this ) && XWPrefs.getIsTablet( this );
 
         m_dlgt = m_dpEnabled ? new DualpaneDelegate( this, savedInstanceState )
             : new GamesListDelegate( this, savedInstanceState );