Merge branch 'main' into wakelock_snippets

Author: asolovay

.github/workflows/build.yml

@@ -37,17 +37,7 @@ jobs:
       with:
         distribution: 'zulu'
         java-version: '17'
-    - name: Build Compose
-      run: ./gradlew :compose:snippets:build
-    - name: Build recompose snippets
-      run: ./gradlew :compose:recomposehighlighter:build
-    - name: Build kotlin snippets
-      run: ./gradlew :kotlin:build
-    - name: Build Wear snippets
-      run: ./gradlew :wear:build
-    - name: Build misc snippets
-      run: ./gradlew :misc:build
-    - name: Build XR snippets
-      run: ./gradlew :xr:build
+    - name: Build All
+      run: ./gradlew build --stacktrace
     - name: Build Watch Face Push validation snippets
-      run: ./gradlew :watchfacepush:validator:run 
+      run: ./gradlew :watchfacepush:validator:run --stacktrace

bluetoothle/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.sample.android.bluetoothle">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
     <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
@@ -23,6 +22,6 @@
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
 
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-
 </manifest>

bluetoothle/src/main/java/com/sample/android/bluetoothle/java/MainActivity.java

@@ -1,13 +1,15 @@
 package com.sample.android.bluetoothle.java;
 
-import androidx.appcompat.app.AppCompatActivity;
-
+import android.Manifest;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothManager;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 
+import androidx.annotation.RequiresPermission;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.sample.android.bluetoothle.R;
 
 public class MainActivity extends AppCompatActivity {
@@ -19,6 +21,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
     }
 
+    @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT)
     private void setUpBLE() {
         // [START get_bluetooth_adapter]
         // Initializes Bluetooth adapter.

bluetoothle/src/main/java/com/sample/android/bluetoothle/kotlin/DeviceScanActivity.kt

@@ -16,11 +16,13 @@
 
 package com.sample.android.bluetoothle.kotlin
 
+import android.Manifest
 import android.app.ListActivity
 import android.bluetooth.BluetoothAdapter
 import android.bluetooth.le.ScanCallback
 import android.bluetooth.le.ScanResult
 import android.os.Handler
+import androidx.annotation.RequiresPermission
 import com.sample.android.bluetoothle.java.LeDeviceListAdapter
 
 /**
@@ -47,6 +49,7 @@ class DeviceScanActivity : ListActivity() {
     // Stops scanning after 10 seconds.
     private val SCAN_PERIOD: Long = 10000
 
+    @RequiresPermission(Manifest.permission.BLUETOOTH_SCAN)
     private fun scanLeDevice() {
         if (!mScanning) { // Stops scanning after a pre-defined scan period.
             handler.postDelayed({

bluetoothle/src/main/java/com/sample/android/bluetoothle/kotlin/MainActivity.kt

@@ -16,11 +16,13 @@
 
 package com.sample.android.bluetoothle.kotlin
 
+import android.Manifest
 import android.bluetooth.BluetoothAdapter
 import android.bluetooth.BluetoothManager
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import androidx.annotation.RequiresPermission
 import androidx.appcompat.app.AppCompatActivity
 
 class MainActivity : AppCompatActivity() {
@@ -31,6 +33,7 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
     }
 
+    @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT)
     private fun setUpBLE() {
         // [START get_bluetooth_adapter]
         // Initializes Bluetooth adapter.

identity/credentialmanager/src/main/AndroidManifest.xml

@@ -45,7 +45,7 @@
             android:enabled="true"
             android:exported="true"
             android:label="My Credential Provider"
-            android:icon="<any drawable icon>"
+            android:icon="@mipmap/ic_launcher"
             android:permission="android.permission.BIND_CREDENTIAL_PROVIDER_SERVICE"
             tools:targetApi="upside_down_cake">
             <intent-filter>

misc/src/androidTest/java/com/example/snippets/DeviceCompatibilityModeTestJavaSnippets.java

@@ -16,6 +16,7 @@
 
 package com.example.snippets;
 
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.test.core.app.ActivityScenario;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import org.junit.Rule;
@@ -33,16 +34,18 @@ public void activity_launched_notLetterBoxed() {
         try (ActivityScenario<MainActivity> scenario =
             ActivityScenario.launch(MainActivity.class)) {
                 scenario.onActivity( activity -> {
-                    assertFalse(isLetterboxed(activity));
+                    assertFalse(activity.isLetterboxed());
                 });
             }
     }
     // [END android_device_compatibility_mode_assert_isLetterboxed_java]
 
 
-    // Method used by snippets.
-    public boolean isLetterboxed(MainActivity activity) {
-        return true;
-    }
+    // Class used by snippets.
 
+    class MainActivity extends AppCompatActivity {
+        public boolean isLetterboxed() {
+            return true;
+        }
+    }
 }

misc/src/androidTest/java/com/example/snippets/DeviceCompatibilityModeTestKotlinSnippets.kt

@@ -36,10 +36,9 @@ class DeviceCompatibilityModeTestKotlinSnippets {
     }
     // [END android_device_compatibility_mode_assert_isLetterboxed_kotlin]
 
-    // Classes used by snippets.
+    // Class used by snippets.
 
     class MainActivity : AppCompatActivity() {
-
         fun isLetterboxed(): Boolean {
             return true
         }

xr/build.gradle.kts

@@ -19,8 +19,8 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
     buildFeatures {
         compose = true