r42 - in trunk: . src/fr/ifremer/wlo - Wlo-commits

30 Jan 2014

Author: kmorin
Date: 2014-01-30 14:59:11 +0100 (Thu, 30 Jan 2014)
New Revision: 42

Url: http://forge.codelutin.com/projects/wlo/repository/revisions/42

Log:
fixes #4206 G?\195?\169rer le changement d'orientation

Modified:
   trunk/AndroidManifest.xml
   trunk/src/fr/ifremer/wlo/ScientificSpeciesActivity.java
   trunk/src/fr/ifremer/wlo/WloBaseListActivity.java

Modified: trunk/AndroidManifest.xml
===================================================================

--- trunk/AndroidManifest.xml	2014-01-30 10:34:36 UTC (rev 41)
+++ trunk/AndroidManifest.xml	2014-01-30 13:59:11 UTC (rev 42)
@@ -30,28 +30,9 @@
 
       <service android:name=".BigFinCommunicationService" />
 
-      <!--<activity android:name=".Home"-->
-                  <!--android:label="@string/app_name"-->
-                  <!--android:configChanges="orientation|keyboardHidden">-->
-            <!--<intent-filter>-->
-                <!--<action android:name="android.intent.action.MAIN" />-->
-                <!--<category android:name="android.intent.category.LAUNCHER" />-->
-            <!--</intent-filter>-->
-        <!--</activity>-->
-
-      <activity android:name=".measurement.MeasurementActivity"
-                android:label="@string/measurement_title"
-                android:configChanges="orientation|keyboardHidden"
-                android:screenOrientation="landscape"/>
-
-      <activity android:name=".measurement.GraphActivity"
-                android:label="@string/app_name"
-                android:configChanges="orientation|keyboardHidden"
-                android:screenOrientation="landscape"/>
-
       <activity android:name=".MainActivity"
                 android:label="@string/app_name"
-                android:configChanges="orientation|keyboardHidden"
+                android:configChanges="orientation|screenSize|keyboardHidden"
                 android:launchMode="singleInstance">
         <intent-filter>
           <action android:name="android.intent.action.MAIN"/>
@@ -59,70 +40,80 @@
         </intent-filter>
       </activity>
 
+      <activity android:name=".measurement.MeasurementActivity"
+                android:label="@string/measurement_title"
+                android:configChanges="orientation|screenSize|keyboardHidden"
+                android:screenOrientation="landscape"/>
+
+      <activity android:name=".measurement.GraphActivity"
+                android:label="@string/app_name"
+                android:configChanges="orientation|screenSize|keyboardHidden"
+                android:screenOrientation="landscape"/>
+
       <activity android:name=".DeviceListActivity"
                 android:label="@string/devices_title"
-                android:configChanges="orientation|keyboardHidden" />
+                android:configChanges="orientation|screenSize|keyboardHidden" />
 
       <activity android:name=".ContextsActivity"
                 android:label="@string/contexts_title"
-                android:configChanges="orientation|keyboardHidden"/>
+                android:configChanges="orientation|screenSize|keyboardHidden"/>
 
       <activity android:name=".ContextFormActivity"
                 android:label="@string/new_context_title"
                 android:noHistory="true"
-                android:configChanges="orientation|keyboardHidden"/>
+                android:configChanges="orientation|screenSize|keyboardHidden"/>
 
       <activity android:name=".LocationsActivity"
                 android:label="@string/locations_title"
-                android:configChanges="orientation|keyboardHidden"/>
+                android:configChanges="orientation|screenSize|keyboardHidden"/>
 
       <activity android:name=".LocationFormActivity"
                 android:label="@string/new_location_title"
                 android:noHistory="true"
-                android:configChanges="orientation|keyboardHidden"/>
+                android:configChanges="orientation|screenSize|keyboardHidden"/>
 
       <activity android:name=".VesselsActivity"
                 android:label="@string/vessels_title"
-                android:configChanges="orientation|keyboardHidden"/>
+                android:configChanges="orientation|screenSize|keyboardHidden"/>
 
       <activity android:name=".VesselFormActivity"
                 android:label="@string/new_vessel_title"
                 android:noHistory="true"
-                android:configChanges="orientation|keyboardHidden"/>
+                android:configChanges="orientation|screenSize|keyboardHidden"/>
 
       <activity android:name=".MetiersActivity"
                 android:label="@string/metiers_title"
-                android:configChanges="orientation|keyboardHidden"/>
+                android:configChanges="orientation|screenSize|keyboardHidden"/>
 
       <activity android:name=".MetierFormActivity"
                 android:label="@string/new_metier_title"
                 android:noHistory="true"
-                android:configChanges="orientation|keyboardHidden"/>
+                android:configChanges="orientation|screenSize|keyboardHidden"/>
 
       <activity android:name=".CommercialSpeciesActivity"
                 android:label="@string/commercial_species_title"
-                android:configChanges="orientation|keyboardHidden"/>
+                android:configChanges="orientation|screenSize|keyboardHidden"/>
 
       <activity android:name=".CommercialSpeciesFormActivity"
                 android:label="@string/new_commercial_species_title"
                 android:noHistory="true"
-                android:configChanges="orientation|keyboardHidden"/>
+                android:configChanges="orientation|screenSize|keyboardHidden"/>
 
       <activity android:name=".ScientificSpeciesActivity"
                 android:label="@string/scientific_species_title"
-                android:configChanges="orientation|keyboardHidden"/>
+                android:configChanges="orientation|screenSize|keyboardHidden"/>
 
       <activity android:name=".ScientificSpeciesFormActivity"
                 android:label="@string/new_scientific_species_title"
                 android:noHistory="true"
-                android:configChanges="orientation|keyboardHidden"/>
+                android:configChanges="orientation|screenSize|keyboardHidden"/>
 
       <activity android:name=".preferences.SettingsActivity"
                 android:label="@string/main_settings"
-                android:configChanges="orientation|keyboardHidden"/>
+                android:configChanges="orientation|screenSize|keyboardHidden"/>
 
       <activity android:name=".utils.filechooser.FileDialog"
-                android:configChanges="orientation|keyboardHidden"/>
+                android:configChanges="orientation|screenSize|keyboardHidden"/>
 
     </application>
 </manifest>

Modified: trunk/src/fr/ifremer/wlo/ScientificSpeciesActivity.java
===================================================================
--- trunk/src/fr/ifremer/wlo/ScientificSpeciesActivity.java	2014-01-30 10:34:36 UTC (rev 41)
+++ trunk/src/fr/ifremer/wlo/ScientificSpeciesActivity.java	2014-01-30 13:59:11 UTC (rev 42)
@@ -58,8 +58,7 @@
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         CommercialSpeciesModel parent = (CommercialSpeciesModel) parentModel;
-        //TODO handle npe
-        if (parent == null || parent.isSpeciesMix() || adapter.getCount() == 0) {
+        if (parent.isSpeciesMix() || adapter.getCount() == 0) {
             MenuInflater inflater = getMenuInflater();
             inflater.inflate(R.menu.model_list_menu, menu);
         }

Modified: trunk/src/fr/ifremer/wlo/WloBaseListActivity.java
===================================================================
--- trunk/src/fr/ifremer/wlo/WloBaseListActivity.java	2014-01-30 10:34:36 UTC (rev 41)
+++ trunk/src/fr/ifremer/wlo/WloBaseListActivity.java	2014-01-30 13:59:11 UTC (rev 42)
@@ -42,6 +42,7 @@
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.res.Configuration;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.os.Handler;
@@ -310,7 +311,8 @@
     @Override
     public Intent getSupportParentActivityIntent() {
         Intent intent = super.getSupportParentActivityIntent();
-        if (intent != null && parentModel != null && HierarchicalModel.class.isAssignableFrom(parentModel.getClass())) {
+        if (intent != null && parentModel != null
+                && HierarchicalModel.class.isAssignableFrom(parentModel.getClass())) {
             HierarchicalModel hParentModel = (HierarchicalModel) parentModel;
             intent.putExtra(WloBaseListActivity.INTENT_EXTRA_PARENT_MODEL, hParentModel.getParent());
         }

    

r42 - in trunk: . src/fr/ifremer/wlo

kmorin＠users.forge.codelutin.com

tags

participants (1)