Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
#
[versions]
agp = "8.9.1"
agp = "8.13.2"
fragmentCompose = "1.8.6"
kotlin = "2.1.10"
coreKtx = "1.17.0"
Expand Down Expand Up @@ -66,6 +66,7 @@ playServicesMlkitBarcodeScanning = "18.3.1"
protobuf = "0.9.4"
firebaseCrashlyticsBuildtools = "3.0.5"
uwb = "1.0.0-alpha10"
telecom = "1.1.0-alpha04"


[libraries]
Expand Down Expand Up @@ -99,6 +100,7 @@ coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
coil-video = { module = "io.coil-kt:coil-video", version.ref = "coil" }
kotlin-coroutines-play = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-play-services", version.ref = "coroutines" }
play-services-location = { module = "com.google.android.gms:play-services-location", version.ref = "play-services-location" }
androidx-core-telecom = { module = "androidx.core:core-telecom", version.ref = "telecom" }

# Core dependencies
android-gradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "agp" }
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
11 changes: 8 additions & 3 deletions samples/connectivity/telecom/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,14 @@ plugins {

android {
namespace = "com.example.platform.connectivity.telecom"
compileSdk = 36
compileSdk {
version = release(version = 36) {
minorApiLevel = 1
}
}

defaultConfig {
minSdk = 23
targetSdk = 35

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
Expand All @@ -39,7 +42,6 @@ android {
}

dependencies {
implementation("androidx.core:core-telecom:1.0.1")
implementation(project(mapOf("path" to ":samples:connectivity:audio")))

implementation(libs.androidx.activity.compose)
Expand All @@ -50,6 +52,9 @@ dependencies {
implementation(libs.androidx.material3)
implementation(project(":shared"))

// Sample specific dependencies
implementation(libs.androidx.core.telecom)

implementation(libs.accompanist.permissions)

androidTestImplementation(libs.androidx.test.core)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,21 @@ import android.widget.Toast
import androidx.annotation.RequiresApi
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Button
import androidx.compose.material3.Checkbox
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
Expand All @@ -44,6 +49,7 @@ import com.example.platform.connectivity.telecom.call.TelecomCallService
import com.example.platform.connectivity.telecom.model.TelecomCall
import com.example.platform.connectivity.telecom.model.TelecomCallRepository
import com.example.platform.shared.PermissionBox
import androidx.core.net.toUri

@RequiresApi(Build.VERSION_CODES.O)
@Composable
Expand Down Expand Up @@ -104,14 +110,30 @@ private fun TelecomCallOptions() {
"No active call"
}
Text(text = title, style = MaterialTheme.typography.titleLarge)

var excludeCallLogging by rememberSaveable {
mutableStateOf(false)
}
Row(
verticalAlignment = Alignment.CenterVertically
) {
Checkbox(
checked = excludeCallLogging,
onCheckedChange = { isChecked ->
excludeCallLogging = isChecked
}
)
Text("Exclude from call logs")
}
Button(
enabled = !hasOngoingCall,
onClick = {
Toast.makeText(context, "Incoming call in 2 seconds", Toast.LENGTH_SHORT).show()
context.launchCall(
action = TelecomCallService.ACTION_INCOMING_CALL,
name = "Alice",
uri = Uri.parse("tel:12345"),
uri = "tel:12345".toUri(),
excludeCallLogging
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use parameter naming here for consistency

)
},
) {
Expand All @@ -123,7 +145,8 @@ private fun TelecomCallOptions() {
context.launchCall(
action = TelecomCallService.ACTION_OUTGOING_CALL,
name = "Bob",
uri = Uri.parse("tel:54321"),
uri = "tel:54321".toUri(),
excludeCallLogging
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use parameter naming here for consistency

)
},
) {
Expand All @@ -133,12 +156,13 @@ private fun TelecomCallOptions() {
}

@RequiresApi(Build.VERSION_CODES.O)
private fun Context.launchCall(action: String, name: String, uri: Uri) {
internal fun Context.launchCall(action: String, name: String, uri: Uri, excludeCallLogging: Boolean) {
startService(
Intent(this, TelecomCallService::class.java).apply {
this.action = action
putExtra(TelecomCallService.EXTRA_NAME, name)
putExtra(TelecomCallService.EXTRA_URI, uri)
putExtra(TelecomCallService.EXTRA_EXCLUDE_CALL_LOGGING, excludeCallLogging)
},
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import android.app.KeyguardManager
import android.content.Intent
import android.os.Build
import android.os.Bundle
import android.telecom.TelecomManager
import android.util.Log
import android.view.WindowManager
import androidx.activity.ComponentActivity
Expand All @@ -31,6 +32,8 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.ui.Modifier
import androidx.core.content.getSystemService
import androidx.core.net.toUri
import com.example.platform.connectivity.telecom.launchCall
import com.example.platform.connectivity.telecom.model.TelecomCallRepository


Expand All @@ -50,6 +53,8 @@ class TelecomCallActivity : ComponentActivity() {
// Set the right flags for a call type activity.
setupCallActivity()

handleCallBack()

setContent {
MaterialTheme {
Surface(
Expand Down Expand Up @@ -78,6 +83,12 @@ class TelecomCallActivity : ComponentActivity() {
)
}

override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
setIntent(intent)
handleCallBack()
}

/**
* Enable the calling activity to be shown in the lockscreen and dismiss the keyguard to enable
* users to answer without unblocking.
Expand All @@ -94,8 +105,17 @@ class TelecomCallActivity : ComponentActivity() {
}

val keyguardManager = getSystemService<KeyguardManager>()
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && keyguardManager != null) {
keyguardManager.requestDismissKeyguard(this, null)
keyguardManager?.requestDismissKeyguard(this, null)
}

private fun handleCallBack() {
if (intent.action == TelecomManager.ACTION_CALL_BACK) {
launchCall(
action = TelecomCallService.ACTION_OUTGOING_CALL,
name = "Bob",
uri = "tel:54321".toUri(),
false
)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ class TelecomCallService : Service() {
companion object {
internal const val EXTRA_NAME: String = "extra_name"
internal const val EXTRA_URI: String = "extra_uri"
internal const val EXTRA_EXCLUDE_CALL_LOGGING = "extra_exclude_call_logging"
internal const val ACTION_INCOMING_CALL = "incoming_call"
internal const val ACTION_OUTGOING_CALL = "outgoing_call"
internal const val ACTION_UPDATE_CALL = "update_call"
Expand Down Expand Up @@ -124,6 +125,7 @@ class TelecomCallService : Service() {
@Suppress("DEPRECATION")
intent.getParcelableExtra(EXTRA_URI)!!
}
val excludeCallLogging = intent.getBooleanExtra(EXTRA_EXCLUDE_CALL_LOGGING, false)

scope.launch {
if (incoming) {
Expand All @@ -133,7 +135,7 @@ class TelecomCallService : Service() {

launch {
// Register the call with the Telecom stack
telecomRepository.registerCall(name, uri, incoming)
telecomRepository.registerCall(name, uri, excludeCallLogging, incoming)
}

if (!incoming) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,7 @@ import androidx.annotation.RequiresApi
import androidx.core.telecom.CallAttributesCompat
import androidx.core.telecom.CallControlResult
import androidx.core.telecom.CallControlScope
import androidx.core.telecom.CallException
import androidx.core.telecom.CallsManager
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
Expand Down Expand Up @@ -87,8 +83,13 @@ class TelecomCallRepository(private val callsManager: CallsManager) {
* Register a new call with the provided attributes.
* Use the [currentCall] StateFlow to receive status updates and process call related actions.
*/
suspend fun registerCall(displayName: String, address: Uri, isIncoming: Boolean) {
// For simplicity we don't support multiple calls
suspend fun registerCall(
displayName: String,
address: Uri,
excludeCallLogging: Boolean,
isIncoming: Boolean
) {
// For simplicity, we don't support multiple calls
check(_currentCall.value !is TelecomCall.Registered) {
"There cannot be more than one call at the same time."
}
Expand All @@ -97,6 +98,7 @@ class TelecomCallRepository(private val callsManager: CallsManager) {
val attributes = CallAttributesCompat(
displayName = displayName,
address = address,
isLogExcluded = excludeCallLogging,
direction = if (isIncoming) {
CallAttributesCompat.DIRECTION_INCOMING
} else {
Expand Down Expand Up @@ -221,7 +223,7 @@ class TelecomCallRepository(private val callsManager: CallsManager) {
}

is TelecomCallAction.ToggleMute -> {
// We cannot programmatically mute the telecom stack. Instead we just update
// We cannot programmatically mute the telecom stack. Instead, we just update
// the state of the call and this will start/stop audio capturing.
updateCurrentCall {
copy(isMuted = !isMuted)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/

package com.example.platform.ui.windowmanager.embedding
import android.annotation.SuppressLint
import android.content.Context
import androidx.startup.Initializer
import androidx.window.WindowSdkExtensions
Expand Down Expand Up @@ -53,6 +54,7 @@ class ExampleWindowInitializer : Initializer<RuleController> {

private val mDemoActivityEmbeddingController = DemoActivityEmbeddingController.getInstance()

@SuppressLint("RequiresWindowSdk")
override fun create(context: Context): RuleController {
SplitController.getInstance(context).apply {
if (WindowSdkExtensions.getInstance().extensionVersion >= 2) {
Expand Down
3 changes: 3 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ pluginManagement {
gradlePluginPortal()
}
}
plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this plugin has been added?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This plugin helps gradle to download JDK automatically. The project uses JDK 17 strictly. So if JDK 17 is not available in the system the project is building, the plugin will help gradle to download it automatically making the project cloning and building process seamless.

}
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
Expand Down
Loading