From 956077675efc3c24651e7a0409c25e759347df4e Mon Sep 17 00:00:00 2001
From: Rick Hanlon <rickhanlonii@fb.com>
Date: Mon, 27 May 2019 11:47:05 -0700
Subject: [PATCH] Fix for ActivityIndicator on Android

Summary: Fixes an issue that was including the view config native component verification function even when the native component wasn't included (e.g. on android)

Reviewed By: mdvacca

Differential Revision: D15513535

fbshipit-source-id: 9b615689c0d64757eeb3d66862e5b1902ea79b20
---
 .../ActivityIndicator/ActivityIndicator.js    | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/Libraries/Components/ActivityIndicator/ActivityIndicator.js b/Libraries/Components/ActivityIndicator/ActivityIndicator.js
index f6ffe500edf..70f73db0ce0 100644
--- a/Libraries/Components/ActivityIndicator/ActivityIndicator.js
+++ b/Libraries/Components/ActivityIndicator/ActivityIndicator.js
@@ -15,12 +15,13 @@ const React = require('react');
 const StyleSheet = require('../../StyleSheet/StyleSheet');
 const View = require('../View/View');
 
-const ActivityIndicatorViewNativeComponent = require('./ActivityIndicatorViewNativeComponent');
-
 import type {NativeComponent} from '../../Renderer/shims/ReactNative';
 import type {ViewProps} from '../View/ViewPropTypes';
 
-const ProgressBarAndroid = require('../ProgressBarAndroid/ProgressBarAndroid');
+const PlatformActivityIndicator =
+  Platform.OS === 'android'
+    ? require('../ProgressBarAndroid/ProgressBarAndroid')
+    : require('./ActivityIndicatorViewNativeComponent');
 
 const GRAY = '#999999';
 
@@ -92,6 +93,11 @@ const ActivityIndicator = (props: Props, forwardedRef?: any) => {
     size: sizeProp,
   };
 
+  const androidProps = {
+    styleAttr: 'Normal',
+    indeterminate: true,
+  };
+
   return (
     <View
       onLayout={onLayout}
@@ -99,12 +105,11 @@ const ActivityIndicator = (props: Props, forwardedRef?: any) => {
         styles.container,
         style,
       )}>
-      {/* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was
-       * found when making Flow check .android.js files. */}
       {Platform.OS === 'android' ? (
-        <ProgressBarAndroid {...nativeProps} styleAttr="Normal" indeterminate />
+        // $FlowFixMe Flow doesn't know when this is the android component
+        <PlatformActivityIndicator {...nativeProps} {...androidProps} />
       ) : (
-        <ActivityIndicatorViewNativeComponent {...nativeProps} />
+        <PlatformActivityIndicator {...nativeProps} />
       )}
     </View>
   );