Merge branch 'master' into default

# Conflicts: # app/build.gradle # app/src/main/java/rectangledbmi/com/pittsburghrealtimetracker/ui/MainActivity.java
rectangle-dbmi · May 24, 2017 · 3499e72 · 3499e72
2 parents 5cbd559 + 7bdcce5
commit 3499e72
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/app/src/main/java/rectangledbmi/com/pittsburghrealtimetracker/ui/map/BusMapFragment.java b/app/src/main/java/rectangledbmi/com/pittsburghrealtimetracker/ui/map/BusMapFragment.java
@@ -288,7 +288,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
     @Override
     public void onResume() {
         super.onResume();
-        ServerDownDialogFragment.newInstance().show(getFragmentManager(), getString(R.string.servers_down_title));
+//        ServerDownDialogFragment.newInstance().show(getFragmentManager(), getString(R.string.servers_down_title));
         Timber.d("resuming map fragment");
         if (mapView != null) {
             mapView.onResume();

diff --git a/...a/rectangledbmi/com/pittsburghrealtimetracker/ui/serverdown/ServerDownDialogFragment.java b/...a/rectangledbmi/com/pittsburghrealtimetracker/ui/serverdown/ServerDownDialogFragment.java
@@ -18,6 +18,7 @@
 
 public class ServerDownDialogFragment extends AppCompatDialogFragment {
 
+    @SuppressWarnings("unused")
     public static ServerDownDialogFragment newInstance() {
         return new ServerDownDialogFragment();
     }

diff --git a/app/src/main/res/menu/select_transit.xml b/app/src/main/res/menu/select_transit.xml
@@ -28,5 +28,10 @@
         android:title="@string/action_about"
         android:orderInCategory="600"
         appcompat:showAsAction="never" />
+    <item android:id="@+id/no_buses"
+        android:title="@string/servers_down_title"
+        android:orderInCategory="500"
+        appcompat:showAsAction="never"
+        android:onClick="onClickNoBuses"/>
 
 </menu>