Moving jetpack_is_mobile into a package

class.jetpack-user-agent.php

@@ -1,6 +1,6 @@
 <?php
 
-use Automattic\Jetpack\Mobile;
+use Automattic\Jetpack\Device_Detection;
 
 /**
  * Determine if the current User Agent matches the passed $kind
@@ -13,5 +13,25 @@
  *                              $return_matched_agent is true, returns the UA string
  */
 function jetpack_is_mobile( $kind = 'any', $return_matched_agent = false ) {
-	return Mobile::is_mobile( $kind, $return_matched_agent );
+	$pre = apply_filters( 'pre_jetpack_is_mobile', null, $kind, $return_matched_agent );
+	if ( $pre ) {
+		return $pre;
+	}
+
+	$return = false;
+	$device_info = Device_Detection::get_info();
+
+	if ( 'any' === $kind ) {
+		$return = $device_info['is_mobile'];
+	} elseif ( 'smart' === $kind ) {
+		$return = $device_info['is_smartphone'];
+	} elseif ( 'dumb' === $kind ) {
+		$return = $device_info['is_mobile'] && ! $device_info['is_smartphone'];
+	}
+
+	if ( $return_matched_agent && true === $return ) {
+		$return = $device_info['is_mobile_matched_ua'];
+	}
+
+	return apply_filters( 'jetpack_is_mobile', $return, $kind, $return_matched_agent );
 }

composer.json

@@ -19,10 +19,10 @@
 		"automattic/jetpack-config": "@dev",
 		"automattic/jetpack-connection": "@dev",
 		"automattic/jetpack-constants": "@dev",
+		"automattic/jetpack-device-detection": "@dev",
 		"automattic/jetpack-error": "@dev",
 		"automattic/jetpack-jitm": "@dev",
 		"automattic/jetpack-logo": "@dev",
-		"automattic/jetpack-mobile": "@dev",
 		"automattic/jetpack-options": "@dev",
 		"automattic/jetpack-partner": "@dev",
 		"automattic/jetpack-redirect": "@dev",