From 1e095d17feeee407df22b2b63e362b7f9a22c569 Mon Sep 17 00:00:00 2001 From: Suphon Thanakornpakapong Date: Sat, 5 Jun 2021 09:18:39 +0700 Subject: [PATCH] Use android.R.string.cancel instead --- lawnchair/res/values/strings.xml | 1 - .../src/app/lawnchair/gestures/handlers/SleepGestureHandler.kt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lawnchair/res/values/strings.xml b/lawnchair/res/values/strings.xml index ea1eafe7c0..967542d9ad 100644 --- a/lawnchair/res/values/strings.xml +++ b/lawnchair/res/values/strings.xml @@ -89,5 +89,4 @@ Open Settings Show Feed Feed is not available - Cancel diff --git a/lawnchair/src/app/lawnchair/gestures/handlers/SleepGestureHandler.kt b/lawnchair/src/app/lawnchair/gestures/handlers/SleepGestureHandler.kt index a779ba36c6..ca3d4b6353 100644 --- a/lawnchair/src/app/lawnchair/gestures/handlers/SleepGestureHandler.kt +++ b/lawnchair/src/app/lawnchair/gestures/handlers/SleepGestureHandler.kt @@ -156,7 +156,7 @@ fun ServiceWarningDialog( scope.launch { sheetState.hide() } } ) { - Text(text = stringResource(id = R.string.cancel)) + Text(text = stringResource(id = android.R.string.cancel)) } Spacer(modifier = Modifier.requiredWidth(16.dp)) Button(