Merge branch 'feature/long_press_discover'

mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java

@@ -208,6 +208,9 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		}
 		getChildFragmentManager().beginTransaction().hide(fragmentForTab(currentTab)).show(newFragment).commit();
 		maybeTriggerLoading(newFragment);
+//		if(tab == currentTab && tab == R.id.tab_search){
+//			searchFragment.selectSearch();
+//		}
 		currentTab=tab;
 		((FragmentStackActivity)getActivity()).invalidateSystemBarColors(this);
 	}
@@ -235,6 +238,11 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 			new AccountSwitcherSheet(getActivity()).show();
 			return true;
 		}
+		if(tab==R.id.tab_search){
+			searchFragment.selectSearch();
+			onTabSelected(R.id.tab_search);
+		}
+
 		return false;
 	}
 

mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java

@@ -2,6 +2,8 @@ package org.joinmastodon.android.fragments.discover;
 
 import android.app.Fragment;
 import android.app.FragmentTransaction;
+import android.content.Context;
+import android.hardware.input.InputManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.Editable;
@@ -17,6 +19,7 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.GlobalUserPreferences;
@@ -358,4 +361,10 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			return position;
 		}
 	}
+
+	public void selectSearch(){
+		searchEdit.requestFocus();
+		onSearchEditFocusChanged(searchEdit, true);
+		getActivity().getSystemService(InputMethodManager.class).showSoftInput(searchEdit, 0);
+	}
 }