make the order of file type selectors on search the same as in android
Merge branch 'master' into dproxy