Merge pull request #371 from alabiaga/main

Fix merge manifest issue causing platform samples not to build

Author: alabiaga

app/src/main/AndroidManifest.xml

@@ -14,14 +14,24 @@
   ~ limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <!--
+      Modules/samples below use a lib that requires a minSdk higher than that of the.
+      main app. Rather than updating the main app's minSdk, override those libraries minSdk.
+      Removing this would otherwise cause a Manifest merger issue.
+      See https://developer.android.com/build/manage-manifests#merge_conflict_heuristics
+    -->
+    <uses-sdk tools:overrideLibrary="com.example.platform.storage, androidx.photopicker.compose, com.example.platform.connectivity.uwb" />
 
     <application
         android:enableOnBackInvokedCallback="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher"
         android:supportsRtl="true">
+
         <activity
             android:name=".app.MainActivity"
             android:exported="true"

app/src/main/java/com/example/platform/app/ApiSurface.kt

@@ -120,7 +120,10 @@ val PrivacyTransparencyApiSurface = ApiSurface(
 val StorageApiSurface = ApiSurface(
     "storage",
     "Storage",
-    "Android photo library access capabilities.\nPhoto Picker for unified device and cloud photo access, and MediaStore for detailed local media querying",
+    """Android photo library access capabilities.
+              Photo Picker for unified device and cloud photo access, and MediaStore for detailed local media querying.
+              
+              WARNING: These samples only work on devices with Android 14 or higher.""".trimMargin()
 )
 
 val UserInterfaceAppWidgetsApiSurface = ApiSurface(