fixed app crash when the battery extra info view is enabled on the phone layout in portrait mode.

Author: m4gr3d

Android/src/org/droidplanner/android/fragments/SettingsFragment.java

@@ -53,8 +53,8 @@
 /**
  * Implements the application settings screen.
  */
-public class SettingsFragment extends PreferenceFragment implements
-        OnSharedPreferenceChangeListener, DroidPlannerApp.ApiListener {
+public class SettingsFragment extends PreferenceFragment implements OnSharedPreferenceChangeListener,
+        DroidPlannerApp.ApiListener {
 
     /**
      * Used as tag for logging.
@@ -67,8 +67,7 @@ public class SettingsFragment extends PreferenceFragment implements
      * Action used to broadcast updates to the period for the spoken status
      * summary.
      */
-    public static final String ACTION_UPDATED_STATUS_PERIOD = PACKAGE_NAME + ""
-            + ".ACTION_UPDATED_STATUS_PERIOD";
+    public static final String ACTION_UPDATED_STATUS_PERIOD = PACKAGE_NAME + ".ACTION_UPDATED_STATUS_PERIOD";
 
     /**
      * Used to retrieve the new period for the spoken status summary.

Android/src/org/droidplanner/android/widgets/actionProviders/InfoBarItem.java

@@ -292,7 +292,7 @@ public static class BatteryInfo extends InfoBarItem {
 		/**
 		 * This popup is used to show additional signal info.
 		 */
-		private PopupWindow mPopup;
+		protected PopupWindow mPopup;
 
 
 		private TextView currentView;
@@ -594,7 +594,7 @@ protected void initItemView(Context context, View parentView, Drone drone) {
 
 			mExtraInfoBarItems = new InfoBarItem[] { new HomeInfo(context, popupView, drone),
 					new GpsInfo(context, popupView, drone),
-					new BatteryInfo(context, popupView, drone),
+					new ExtraBatteryInfo(context, popupView, drone, mItemView),
 					new ExtraFlightTimeInfo(context, popupView, drone, mItemView),
 					new ExtraSignalInfo(context, popupView, drone, mItemView) };
 
@@ -622,6 +622,34 @@ public void updateItemView(final Context context, final Drone drone) {
 			}
 		}
 
+        private static class ExtraBatteryInfo extends BatteryInfo {
+
+            private final View mWindowView;
+
+            public ExtraBatteryInfo(Context context, View parentView, Drone drone, View windowView) {
+                super(context, parentView, drone);
+                mWindowView = windowView;
+            }
+
+            @Override
+            protected void initItemView(Context context, final View parentView, Drone drone){
+                super.initItemView(context, parentView, drone);
+                if(mItemView == null)
+                    return;
+
+                mItemView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        if(mPopup == null)
+                            return;
+
+                        int yLoc = mWindowView.getBottom() + mItemView.getBottom();
+                        mPopup.showAtLocation(mWindowView, Gravity.RIGHT | Gravity.TOP, 0, yLoc);
+                    }
+                });
+            }
+        }
+
 		private static class ExtraFlightTimeInfo extends FlightTimeInfo {
 
 			/**