always show the search icon on android

Author: hawkrives

source/views/components/searchbar/index.android.js

@@ -28,6 +28,7 @@ export class SearchBar extends React.Component<Props> {
 	static defaultProps = {
 		active: false,
 		backButtonAndroid: true,
+		androidIcon: null,
 		onCancel: () => {},
 		onChange: () => {},
 		onFocus: () => {},
@@ -41,17 +42,18 @@ export class SearchBar extends React.Component<Props> {
 	}
 
 	render() {
+		let {backButtonAndroid} = this.props
 		let backButton = this.props.active ? backIcon : searchIcon
 
 		return (
 			<NativeSearchBar
 				ref={this.handleRef}
 				autoCorrect={false}
-				backButton={backButton}
+				backButton={backButtonAndroid === 'search' ? searchIcon : backButton}
 				closeButton={this.props.active ? closeIcon : null}
 				focusOnLayout={false}
 				handleChangeText={this.props.onChange}
-				hideBack={!this.props.backButtonAndroid}
+				hideBack={!backButtonAndroid}
 				hideClose={!this.props.active}
 				input={this.props.value}
 				onBack={this.props.onCancel}

source/views/components/searchbar/types.js

@@ -3,7 +3,7 @@
 export type Props = {
 	getRef?: any,
 	active?: boolean,
-	backButtonAndroid?: boolean,
+	backButtonAndroid?: "search" | boolean,
 	backgroundColor?: string,
 	onCancel: () => any,
 	onChange: string => any,

source/views/sis/components/animated-searchbox.js

@@ -118,7 +118,7 @@ export class AnimatedSearchbox extends React.Component<Props> {
 							<Animated.View style={searchStyle}>
 								<SearchBar
 									active={this.props.active}
-									backButtonAndroid={false}
+									backButtonAndroid="search"
 									onCancel={this.handleCancel}
 									onChange={this.props.onChange}
 									onFocus={this.handleFocus}