From 7087ae96ff42b7c9c242a0205c9f23b3b839805e Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 9 Nov 2016 08:40:17 -0800
Subject: [PATCH] cleanup: resolve diffs between AndroidManifest.xml versions

---
 .../android/XWords4-dbg/AndroidManifest.xml    | 13 ++++++-------
 xwords4/android/XWords4/AndroidManifest.xml    | 18 +-----------------
 2 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/xwords4/android/XWords4-dbg/AndroidManifest.xml b/xwords4/android/XWords4-dbg/AndroidManifest.xml
index 1a5254ce0..2f68569f2 100644
--- a/xwords4/android/XWords4-dbg/AndroidManifest.xml
+++ b/xwords4/android/XWords4-dbg/AndroidManifest.xml
@@ -6,7 +6,7 @@
      to come from a domain that you own or have control over. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.eehouse.android.xw4dbg"
-          android:versionCode="104"
+          android:versionCode="107"
           android:versionName="@string/app_version"
           >
 
@@ -32,7 +32,11 @@
   <uses-permission android:name="android.permission.BLUETOOTH" />
   <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
   <uses-permission android:name="android.permission.READ_CONTACTS" />
-  <uses-permission android:name="android.permission.READ_PHONE_STATE"/> 
+  <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+
+  <!-- Added for wifi-direct; don't ship until move to 23!!! -->
+  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+  <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
 
   <uses-feature android:name="android.hardware.telephony"
                 android:required = "false"
@@ -54,7 +58,6 @@
   <application android:icon="@drawable/icon48x48"
                android:label="@string/app_name"
                android:name=".XWApp"
-               android:debuggable="false"
                >
 
     <activity android:name="MainActivity"
@@ -74,10 +77,6 @@
       </intent-filter>
     </activity>
 
-    <activity android:name="FragActivity"
-              android:configChanges="keyboardHidden|orientation|screenSize"
-              />
-
     <activity android:name="DictsActivity"
               android:label="@string/title_dicts_list"
               android:configChanges="keyboardHidden|orientation|screenSize"
diff --git a/xwords4/android/XWords4/AndroidManifest.xml b/xwords4/android/XWords4/AndroidManifest.xml
index 26984883d..579eb73ca 100644
--- a/xwords4/android/XWords4/AndroidManifest.xml
+++ b/xwords4/android/XWords4/AndroidManifest.xml
@@ -1,20 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- -*- compile-command: "ant install"; -*- -->
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
 <!-- Declare the contents of this Android application.  The namespace
      attribute brings in the Android platform namespace, and the package
      supplies a unique name for the application.  When writing your
@@ -26,7 +10,7 @@
           android:versionName="@string/app_version"
           >
 
-  <!-- BE SURE TO MODIFY project.project AND the variable TARGET in
+  <!-- BE SURE TO MODIFY project.properties AND the variable TARGET in
        ../scripts/setup_local_props.sh if targetSdkVersion changes!!!
        -->
   <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="19" />