Fix post-rebase issues

facebook · Dec 8, 2017 · 0c361d8 · 0c361d8
1 parent e2317c6
commit 0c361d8
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 13 deletions.
diff --git a/Libraries/Components/Button.js b/Libraries/Components/Button.js
@@ -90,12 +90,6 @@ class Button extends React.Component<{
      * Used to locate this view in end-to-end tests.
      */
     testID: PropTypes.string,
-    /**
-     * *(Apple TV only)* TV preferred focus (see documentation for the View component).
-     *
-     * @platform ios
-     */
-    hasTVPreferredFocus: PropTypes.bool,
   };
 
   render() {
@@ -106,7 +100,6 @@ class Button extends React.Component<{
       title,
       hasTVPreferredFocus,
       disabled,
-      hasTVPreferredFocus,
       testID,
     } = this.props;
     const buttonStyles = [styles.button];
@@ -138,7 +131,6 @@ class Button extends React.Component<{
         hasTVPreferredFocus={hasTVPreferredFocus}
         testID={testID}
         disabled={disabled}
-        hasTVPreferredFocus={hasTVPreferredFocus}
         onPress={onPress}>
         <View style={buttonStyles}>
           <Text style={textStyles} disabled={disabled}>{formattedTitle}</Text>

diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java
@@ -79,11 +79,6 @@ protected void onCreate(Bundle savedInstanceState) {
     mDoubleTapReloadRecognizer = new DoubleTapReloadRecognizer();
   }
 
-  private boolean canHandleIntent(Intent intent) {
-    PackageManager packageManager = getContext().getPackageManager();
-    return intent.resolveActivity(packageManager) != null;
-  }
-
   protected void loadApp(String appKey) {
     if (mReactRootView != null) {
       throw new IllegalStateException("Cannot loadApp while app is already running.");