diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 968aed7d04..d5bb0dc0d0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -91,14 +91,6 @@ - - - - - diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 45a831f954..e102b1e129 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -3445,50 +3445,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun bottomPages(): List = sessionBottomPages(BottomPageActions( takeScreenshot = ::captureScreenshot, fps = { if (::hud.isInitialized) hud.liveFps else null }, - openSettings = ::openSettingsBelow, runningGame = { gestureGame }, )) - private fun openSettingsBelow(intent: android.content.Intent, done: () -> Boolean) { - val presentation = secondScreenPresentation - if (presentation == null) { - if (!bottomOutputActive) return - listOf(intent, android.content.Intent(android.provider.Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS)).any { - runCatching { startActivity(android.content.Intent(it)) } - .onFailure { e -> Log.w(TAG, "could not open ${it.action}", e) } - .isSuccess - } - return - } - val options = android.app.ActivityOptions.makeBasic().setLaunchDisplayId(presentation.display.displayId) - val opened = listOf(intent, android.content.Intent(android.provider.Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS)).any { - runCatching { startActivity(android.content.Intent(it).addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK), options.toBundle()) } - .onFailure { e -> Log.w(TAG, "could not open ${it.action} on display ${presentation.display.displayId}", e) } - .isSuccess - } - if (!opened) return - presentation.hide() - var checks = 0 - fun showAgain() { - try { - presentation.show() - } catch (e: Exception) { - Log.w(TAG, "could not show the dashboard again", e) - if (secondScreenPresentation === presentation) closeSecondScreen(reset = true) - } - } - uiHandler.postDelayed(object : Runnable { - override fun run() { - if (secondScreenPresentation !== presentation || presentation.isShowing) return - if (done()) { - showAgain() - return - } - if (++checks < SETTINGS_WATCH_CHECKS) uiHandler.postDelayed(this, SETTINGS_WATCH_MS) else showAgain() - } - }, SETTINGS_WATCH_MS) - } - private fun captureScreenshot(onDone: (Boolean) -> Unit) { val source = if (glassesOutputActive) glassesScreen?.surfaceView else if (bottomOutputActive) bottomGame?.surfaceView else if (::surfaceView.isInitialized) surfaceView else null @@ -5470,8 +5429,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private const val TEXT_FIELD_TAP_MS = 1_000L private const val PAUSED_FRAME_MAX_EDGE = 1920f private const val PAUSED_FRAME_REDRAW_MS = 150L - private const val SETTINGS_WATCH_MS = 1_000L - private const val SETTINGS_WATCH_CHECKS = 600 private const val BOTTOM_RECOVERY_MS = 1_000L private const val BOTTOM_RECOVERY_TRIES = 3 private const val TAG = "SessionActivity" diff --git a/app/src/main/java/com/droiddeck/launcher/session/BottomNotifications.kt b/app/src/main/java/com/droiddeck/launcher/session/BottomNotifications.kt deleted file mode 100644 index 45e0890c52..0000000000 --- a/app/src/main/java/com/droiddeck/launcher/session/BottomNotifications.kt +++ /dev/null @@ -1,60 +0,0 @@ -package com.droiddeck.launcher.session - -import android.app.Notification -import android.content.Context -import android.service.notification.NotificationListenerService -import android.service.notification.StatusBarNotification -import androidx.compose.runtime.mutableStateListOf -import androidx.core.app.NotificationManagerCompat - -data class BottomNotification(val key: String, val app: String, val title: String, val text: String, val postedAt: Long) - -object BottomNotifications { - val items = mutableStateListOf() - - fun granted(context: Context): Boolean = - context.packageName in NotificationManagerCompat.getEnabledListenerPackages(context) - - internal fun keep(own: String, pkg: String, ongoing: Boolean, groupSummary: Boolean, title: String, text: String): Boolean = - pkg != own && !ongoing && !groupSummary && (title.isNotBlank() || text.isNotBlank()) - - internal fun add(list: MutableList, item: BottomNotification) { - list.removeAll { it.key == item.key } - list.add(0, item) - while (list.size > MAX_ITEMS) list.removeAt(list.lastIndex) - } - - fun clear() = items.clear() - - internal fun post(context: Context, sbn: StatusBarNotification) { - val n = sbn.notification ?: return - val extras = n.extras - val title = extras?.getCharSequence(Notification.EXTRA_TITLE)?.toString().orEmpty() - val text = (extras?.getCharSequence(Notification.EXTRA_BIG_TEXT) ?: extras?.getCharSequence(Notification.EXTRA_TEXT))?.toString().orEmpty() - if (!keep(context.packageName, sbn.packageName, sbn.isOngoing, (n.flags and Notification.FLAG_GROUP_SUMMARY) != 0, title, text)) return - val app = runCatching { - val pm = context.packageManager - pm.getApplicationLabel(pm.getApplicationInfo(sbn.packageName, 0)).toString() - }.getOrDefault(sbn.packageName) - add(items, BottomNotification(sbn.key, app, title, text, sbn.postTime)) - } - - internal fun remove(key: String) { - items.removeAll { it.key == key } - } - - private const val MAX_ITEMS = 30 -} - -class BottomNotificationListener : NotificationListenerService() { - override fun onListenerConnected() { - BottomNotifications.clear() - runCatching { activeNotifications }.getOrNull()?.sortedBy { it.postTime }?.forEach { BottomNotifications.post(this, it) } - } - - override fun onNotificationPosted(sbn: StatusBarNotification) = BottomNotifications.post(this, sbn) - - override fun onNotificationRemoved(sbn: StatusBarNotification) = BottomNotifications.remove(sbn.key) - - override fun onListenerDisconnected() = BottomNotifications.clear() -} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomNotificationsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomNotificationsPage.kt deleted file mode 100644 index 266cb5a592..0000000000 --- a/app/src/main/java/com/droiddeck/launcher/ui/BottomNotificationsPage.kt +++ /dev/null @@ -1,116 +0,0 @@ -package com.droiddeck.launcher.ui - -import android.content.Intent -import android.provider.Settings -import androidx.compose.foundation.background -import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.foundation.lazy.items -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip -import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.platform.testTag -import androidx.compose.ui.res.stringResource -import androidx.compose.ui.semantics.Role -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.text.style.TextOverflow -import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp -import com.droiddeck.launcher.R -import com.droiddeck.launcher.session.BottomNotifications -import kotlinx.coroutines.delay - -internal fun notificationAccessIntent(context: android.content.Context): Intent = - if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R) { - Intent(Settings.ACTION_NOTIFICATION_LISTENER_DETAIL_SETTINGS).putExtra( - Settings.EXTRA_NOTIFICATION_LISTENER_COMPONENT_NAME, - android.content.ComponentName(context, com.droiddeck.launcher.session.BottomNotificationListener::class.java).flattenToString(), - ) - } else Intent(Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS) - -@Composable -fun BottomNotificationsPage(openSettings: ((Intent, () -> Boolean) -> Unit)?) { - val context = LocalContext.current - val colors = MaterialTheme.colorScheme - val pal = LocalPalette.current - var granted by remember { mutableStateOf(BottomNotifications.granted(context)) } - LaunchedEffect(Unit) { - while (true) { - granted = BottomNotifications.granted(context) - delay(2_000L) - } - } - if (!granted) { - Column(Modifier.fillMaxSize().padding(24.dp), horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.spacedBy(16.dp, Alignment.CenterVertically)) { - Text(stringResource(R.string.bottom_notifications_why), fontSize = 15.sp, color = colors.onBackground, textAlign = TextAlign.Center) - BottomPillButton(stringResource(R.string.bottom_notifications_allow), "bottom-notifications-allow") { - val intent = notificationAccessIntent(context) - if (openSettings != null) openSettings(intent) { BottomNotifications.granted(context) } - else runCatching { context.startActivity(intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) } - } - } - return - } - val shown = BottomNotifications.items - if (shown.isEmpty()) { - Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { - Text(stringResource(R.string.bottom_notifications_none), fontSize = 15.sp, color = colors.onSurfaceVariant) - } - return - } - val timeFormat = remember { android.text.format.DateFormat.getTimeFormat(context) } - Column(Modifier.fillMaxSize(), verticalArrangement = Arrangement.spacedBy(8.dp)) { - Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { - Text(stringResource(R.string.bottom_notifications_count, shown.size), fontSize = 13.sp, color = colors.onSurfaceVariant, - modifier = Modifier.weight(1f)) - BottomPillButton(stringResource(R.string.bottom_notifications_clear), "bottom-notifications-clear") { BottomNotifications.clear() } - } - LazyColumn(Modifier.weight(1f).fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(8.dp)) { - items(shown.toList(), key = { it.key }) { n -> - Column(Modifier.fillMaxWidth().clip(RoundedCornerShape(14.dp)).background(pal.surface).padding(horizontal = 14.dp, vertical = 10.dp), - verticalArrangement = Arrangement.spacedBy(4.dp)) { - Row(verticalAlignment = Alignment.CenterVertically) { - Text(n.app, fontSize = 12.sp, fontWeight = FontWeight.SemiBold, color = pal.signal, maxLines = 1, - overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) - Text(timeFormat.format(java.util.Date(n.postedAt)), fontSize = 12.sp, color = colors.onSurfaceVariant) - } - if (n.title.isNotBlank()) Text(n.title, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, - maxLines = 1, overflow = TextOverflow.Ellipsis) - if (n.text.isNotBlank()) Text(n.text, fontSize = 14.sp, color = colors.onBackground, maxLines = 4, overflow = TextOverflow.Ellipsis) - } - } - } - } -} - -@Composable -internal fun BottomPillButton(label: String, tag: String, onClick: () -> Unit) { - val pal = LocalPalette.current - Box( - Modifier.height(40.dp).clip(RoundedCornerShape(20.dp)).background(pal.signal.copy(alpha = 0.16f)) - .clickable(role = Role.Button, onClick = onClick).testTag(tag).padding(horizontal = 16.dp), - contentAlignment = Alignment.Center, - ) { - Text(label, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = pal.signal, maxLines = 1) - } -} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomPages.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomPages.kt index a8884fdec7..2d2e401fa7 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BottomPages.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomPages.kt @@ -1,17 +1,31 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Download import androidx.compose.material.icons.outlined.Forum import androidx.compose.material.icons.outlined.Speed -import androidx.compose.material.icons.outlined.Notifications import androidx.compose.material.icons.outlined.PhotoLibrary +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import com.droiddeck.launcher.R class BottomPageActions( val takeScreenshot: ((onDone: (Boolean) -> Unit) -> Unit)? = null, val fps: () -> Float? = { null }, - val openSettings: ((intent: android.content.Intent, done: () -> Boolean) -> Unit)? = null, val runningGame: () -> String? = { null }, ) @@ -20,7 +34,18 @@ internal const val BOTTOM_PAGE_TELEMETRY = "telemetry" fun sessionBottomPages(actions: BottomPageActions): List = listOf( BottomPage(BOTTOM_PAGE_TELEMETRY, R.string.bottom_page_telemetry, Icons.Outlined.Speed) { BottomTelemetryPage(actions.fps, actions.runningGame) }, BottomPage("downloads", R.string.bottom_page_downloads, Icons.Outlined.Download) { BottomDownloadsPage() }, - BottomPage("notifications", R.string.bottom_page_notifications, Icons.Outlined.Notifications) { BottomNotificationsPage(actions.openSettings) }, BottomPage("screenshots", R.string.bottom_page_screenshots, Icons.Outlined.PhotoLibrary) { BottomScreenshotsPage(actions.takeScreenshot) }, BottomPage("chat", R.string.bottom_page_chat, Icons.Outlined.Forum) { BottomChatPage() }, ) + +@Composable +internal fun BottomPillButton(label: String, tag: String, onClick: () -> Unit) { + val pal = LocalPalette.current + Box( + Modifier.height(40.dp).clip(RoundedCornerShape(20.dp)).background(pal.signal.copy(alpha = 0.16f)) + .clickable(role = Role.Button, onClick = onClick).testTag(tag).padding(horizontal = 16.dp), + contentAlignment = Alignment.Center, + ) { + Text(label, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = pal.signal, maxLines = 1) + } +} diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 86335b1cac..d6a881d86f 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -1873,13 +1873,6 @@ جارٍ تنزيل ذاكرة المظلِّلات المؤقتة متوقف مؤقتًا بانتظار البدء - الإشعارات - الشاشة السفلية لـ DroidDeck - اعرض الرسائل والإشعارات الأخرى هنا أثناء اللعب. تبقى على هذه الشاشة فقط ولا تُحفظ. يطلب Android الإذن مرة واحدة: تُفتح صفحة الوصول إلى الإشعارات على هذه الشاشة؛ فعِّل DroidDeck هناك وستعود هذه الصفحة تلقائيًا. - السماح بالوصول إلى الإشعارات - لا توجد إشعارات. - الإشعارات: %1$d - مسح لقطات الشاشة يتطلب FPS تشغيل واجهة الأداء السرعة diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 29cefed940..d59c5e43c3 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -1865,13 +1865,6 @@ Descargando caché de shaders En pausa Esperando para empezar - Notificaciones - DroidDeck – pantalla inferior - Muestra aquí los mensajes y otras notificaciones mientras juegas. Solo permanecen en esta pantalla y no se guardan. Android lo pregunta una vez: su página de acceso a notificaciones se abre en esta pantalla; activa DroidDeck ahí y esta página volverá sola. - Permitir acceso a notificaciones - No hay notificaciones. - %1$d notificaciones - Borrar Capturas de pantalla Los FPS requieren el HUD activado Velocidad diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index be31cce01f..977de45c92 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1777,13 +1777,6 @@ Изтегляне на кеша на шейдърите На пауза Изчаква стартиране - Известия - Долен екран на DroidDeck - Показвайте тук съобщения и други известия, докато играете. Те остават само на този екран и не се запазват. Android пита веднъж: страницата за достъп до известията се отваря на този екран; включете DroidDeck там и тази страница ще се върне сама. - Разрешаване на достъпа до известията - Няма известия. - Известия: %1$d - Изчисти Екранни снимки За FPS трябва HUD да е включен Скорост diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 1c5f845fa2..cb16b5439c 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1825,13 +1825,6 @@ Stahování mezipaměti shaderů Pozastaveno Čeká na spuštění - Oznámení - Spodní obrazovka DroidDeck - Zobrazujte zde zprávy a další oznámení během hraní. Zůstávají jen na této obrazovce a neukládají se. Android se zeptá jednou: na této obrazovce se otevře jeho stránka přístupu k oznámením; zapněte tam DroidDeck a tato stránka se sama vrátí. - Povolit přístup k oznámením - Žádná oznámení. - Oznámení: %1$d - Vymazat Snímky obrazovky FPS vyžaduje zapnutý HUD Rychlost diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 366cccbcc1..aa31a9c5ab 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -1777,13 +1777,6 @@ Downloader shader-cache På pause Venter på at starte - Notifikationer - DroidDecks nederste skærm - Vis beskeder og andre notifikationer her, mens du spiller. De bliver kun på denne skærm og gemmes ikke. Android spørger én gang: siden for notifikationsadgang åbnes på denne skærm; slå DroidDeck til der, så vender denne side selv tilbage. - Tillad notifikationsadgang - Ingen notifikationer. - %1$d notifikationer - Ryd Skærmbilleder FPS kræver, at HUD er slået til Hastighed diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 053e9ec662..a7e1fa0329 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1769,13 +1769,6 @@ Shader-Cache wird heruntergeladen Pausiert Wartet auf Start - Benachrichtigungen - DroidDeck – unterer Bildschirm - Zeigt Nachrichten und andere Benachrichtigungen hier an, während du spielst. Sie bleiben nur auf diesem Bildschirm und werden nicht gespeichert. Android fragt einmal: Die Seite für den Benachrichtigungszugriff öffnet sich auf diesem Bildschirm; aktiviere dort DroidDeck, dann kehrt diese Seite von selbst zurück. - Benachrichtigungszugriff erlauben - Keine Benachrichtigungen. - %1$d Benachrichtigungen - Löschen Screenshots FPS benötigt das aktive HUD Geschwindigkeit diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 50cac5c805..38aeb85ee6 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1777,13 +1777,6 @@ Λήψη cache shader Σε παύση Αναμονή για έναρξη - Ειδοποιήσεις - DroidDeck – κάτω οθόνη - Εμφάνιση μηνυμάτων και άλλων ειδοποιήσεων εδώ ενώ παίζετε. Παραμένουν μόνο σε αυτή την οθόνη και δεν αποθηκεύονται. Το Android ρωτά μία φορά: η σελίδα πρόσβασης ειδοποιήσεων ανοίγει σε αυτή την οθόνη· ενεργοποιήστε εκεί το DroidDeck και αυτή η σελίδα επιστρέφει μόνη της. - Αποδοχή πρόσβασης ειδοποιήσεων - Δεν υπάρχουν ειδοποιήσεις. - %1$d ειδοποιήσεις - Απαλοιφή Στιγμιότυπα οθόνης Τα FPS απαιτούν ενεργό HUD Ταχύτητα diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 76f1b99657..af9618bdea 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1801,13 +1801,6 @@ Descargando caché de shaders En pausa Esperando para empezar - Notificaciones - DroidDeck – pantalla inferior - Muestra aquí los mensajes y otras notificaciones mientras juegas. Solo permanecen en esta pantalla y no se guardan. Android lo pregunta una vez: su página de acceso a notificaciones se abre en esta pantalla; activa DroidDeck ahí y esta página volverá sola. - Permitir acceso a notificaciones - No hay notificaciones. - %1$d notificaciones - Borrar Capturas de pantalla Los FPS requieren el HUD activado Velocidad diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 7f14a6785b..364725062f 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -1777,13 +1777,6 @@ Ladataan sävytinvälimuistia Keskeytetty Odottaa alkamista - Ilmoitukset - DroidDeckin alanäyttö - Näytä viestit ja muut ilmoitukset täällä pelatessasi. Ne näkyvät vain tällä näytöllä, eikä niitä tallenneta. Android kysyy kerran: sen ilmoitusten käyttöoikeussivu avautuu tälle näytölle; kytke DroidDeck siellä päälle, niin tämä sivu palaa itsestään. - Salli ilmoitusten käyttö - Ei ilmoituksia. - Ilmoituksia: %1$d - Tyhjennä Kuvakaappaukset FPS vaatii HUD:n päälle Nopeus diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 474c555146..57cf1c900d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1801,13 +1801,6 @@ Téléchargement du cache de shaders En pause En attente de démarrage - Notifications - Écran inférieur DroidDeck - Affichez ici les messages et autres notifications pendant que vous jouez. Ils restent uniquement sur cet écran et ne sont pas enregistrés. Android ne le demande qu\'une fois : sa page d\'accès aux notifications s\'ouvre sur cet écran ; activez-y DroidDeck et cette page reviendra d\'elle-même. - Autoriser l\'accès aux notifications - Aucune notification. - %1$d notifications - Effacer Captures d\'écran Les FPS nécessitent d\'activer le HUD Vitesse diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 8aa4f18a4d..491de8723d 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -1777,13 +1777,6 @@ शेडर कैश डाउनलोड हो रहा है रुका हुआ शुरू होने का इंतज़ार - नोटिफ़िकेशन - DroidDeck नीचे की स्क्रीन - खेलते समय मैसेज और अन्य नोटिफ़िकेशन यहां दिखाएं। वे सिर्फ़ इसी स्क्रीन पर रहते हैं और सेव नहीं होते। Android एक बार पूछता है: उसका नोटिफ़िकेशन ऐक्सेस पेज इसी स्क्रीन पर खुलता है; वहां DroidDeck चालू करें और यह पेज अपने-आप वापस आ जाएगा। - नोटिफ़िकेशन ऐक्सेस की अनुमति दें - कोई नोटिफ़िकेशन नहीं। - %1$d नोटिफ़िकेशन - साफ़ करें स्क्रीनशॉट FPS के लिए HUD चालू होना चाहिए स्पीड diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 718dc4cec1..e0f3a2e1a7 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1777,13 +1777,6 @@ Shader-gyorsítótár letöltése Szüneteltetve Indításra vár - Értesítések - DroidDeck alsó képernyő - Itt jelenítheti meg az üzeneteket és más értesítéseket játék közben. Csak ezen a képernyőn láthatók, és nem kerülnek mentésre. Az Android egyszer kérdez rá: az értesítési hozzáférés oldala ezen a képernyőn nyílik meg; kapcsolja be ott a DroidDecket, és ez az oldal magától visszatér. - Értesítési hozzáférés engedélyezése - Nincsenek értesítések. - %1$d értesítés - Törlés Képernyőképek Az FPS-hez be kell kapcsolni a HUD-ot Sebesség diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index d5b27181ad..65290c5f15 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1753,13 +1753,6 @@ Mengunduh cache shader Dijeda Menunggu dimulai - Notifikasi - Layar bawah DroidDeck - Tampilkan pesan dan notifikasi lain di sini saat Anda bermain. Notifikasi hanya muncul di layar ini dan tidak disimpan. Android hanya meminta sekali: halaman akses notifikasinya terbuka di layar ini; aktifkan DroidDeck di sana dan halaman ini akan kembali dengan sendirinya. - Izinkan akses notifikasi - Tidak ada notifikasi. - %1$d notifikasi - Hapus Tangkapan layar FPS memerlukan HUD aktif Kecepatan diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d1cb231a9c..62503c51de 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1793,13 +1793,6 @@ Download della cache degli shader In pausa In attesa di avvio - Notifiche - Schermo inferiore DroidDeck - Mostra qui messaggi e altre notifiche mentre giochi. Restano solo su questo schermo e non vengono salvate. Android lo chiede una sola volta: la sua pagina di accesso alle notifiche si apre su questo schermo; attiva DroidDeck lì e questa pagina torna da sola. - Consenti accesso alle notifiche - Nessuna notifica. - %1$d notifiche - Cancella Screenshot Gli FPS richiedono l\'HUD attivo Velocità diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index bc6e951db1..2c9db1526b 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1753,13 +1753,6 @@ シェーダーキャッシュをダウンロード中 一時停止中 開始待ち - 通知 - DroidDeck下部画面 - プレイ中、メッセージなどの通知をここに表示します。通知はこの画面にのみ表示され、保存されません。Androidによる確認は一度だけです。この画面に通知へのアクセスのページが開くので、そこでDroidDeckをオンにすると、このページに自動的に戻ります。 - 通知へのアクセスを許可 - 通知はありません。 - %1$d件の通知 - クリア スクリーンショット FPSの表示にはHUDをオンにする必要があります 速度 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 1276d4fee4..1efb8cfc94 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1753,13 +1753,6 @@ 셰이더 캐시 다운로드 중 일시 중지됨 시작 대기 중 - 알림 - DroidDeck 하단 화면 - 플레이하는 동안 메시지와 기타 알림을 여기에 표시합니다. 알림은 이 화면에만 표시되며 저장되지 않습니다. Android에서 한 번만 묻습니다. 이 화면에 알림 접근 권한 페이지가 열리면 DroidDeck을 켜세요. 그러면 이 페이지로 자동으로 돌아옵니다. - 알림 접근 허용 - 알림이 없습니다. - 알림 %1$d개 - 지우기 스크린샷 FPS를 보려면 HUD를 켜야 합니다 속도 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index ca2a29f59f..185b46704f 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -1753,13 +1753,6 @@ Memuat turun cache shader Dijeda Menunggu untuk bermula - Pemberitahuan - Skrin bawah DroidDeck - Paparkan mesej dan pemberitahuan lain di sini semasa anda bermain. Ia hanya kekal pada skrin ini dan tidak disimpan. Android bertanya sekali sahaja: halaman akses pemberitahuannya dibuka pada skrin ini; hidupkan DroidDeck di sana dan halaman ini akan kembali dengan sendirinya. - Benarkan akses pemberitahuan - Tiada pemberitahuan. - %1$d pemberitahuan - Kosongkan Tangkapan skrin FPS memerlukan HUD dihidupkan Kelajuan diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 7f63bd9fe1..a805b2d637 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -1777,13 +1777,6 @@ Laster ned shaderbuffer Pauset Venter på å starte - Varslinger - DroidDeck nedre skjerm - Vis meldinger og andre varslinger her mens du spiller. De vises bare på denne skjermen og lagres ikke. Android spør én gang: siden for varseltilgang åpnes på denne skjermen; slå på DroidDeck der, så kommer denne siden tilbake av seg selv. - Tillat varseltilgang - Ingen varslinger. - %1$d varslinger - Fjern Skjermbilder FPS krever at HUD-en er på Fart diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 2be322aa32..e998849486 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1777,13 +1777,6 @@ Shadercache downloaden Gepauzeerd Wacht om te starten - Meldingen - DroidDeck onderste scherm - Toon berichten en andere meldingen hier terwijl je speelt. Ze blijven alleen op dit scherm en worden niet opgeslagen. Android vraagt dit één keer: de pagina voor meldingstoegang opent op dit scherm; zet DroidDeck daar aan en deze pagina komt vanzelf terug. - Meldingstoegang toestaan - Geen meldingen. - %1$d meldingen - Wissen Screenshots Voor FPS moet de HUD aan staan Snelheid diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 15ae33c698..29eef5dd3c 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1825,13 +1825,6 @@ Pobieranie pamięci podręcznej shaderów Wstrzymano Oczekuje na rozpoczęcie - Powiadomienia - Dolny ekran DroidDeck - Wyświetlaj tu wiadomości i inne powiadomienia podczas gry. Pozostają tylko na tym ekranie i nie są zapisywane. Android zapyta raz: na tym ekranie otworzy się jego strona dostępu do powiadomień; włącz tam DroidDeck, a ta strona wróci sama. - Zezwól na dostęp do powiadomień - Brak powiadomień. - Powiadomienia: %1$d - Wyczyść Zrzuty ekranu FPS wymaga włączonego HUD Prędkość diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 49d0d83fb5..562f659d60 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1793,13 +1793,6 @@ A transferir a cache de shaders Em pausa A aguardar início - Notificações - Ecrã inferior do DroidDeck - Mostre aqui mensagens e outras notificações enquanto joga. Ficam apenas neste ecrã e não são guardadas. O Android pergunta uma vez: a página de acesso às notificações abre neste ecrã; ative lá o DroidDeck e esta página volta automaticamente. - Permitir acesso às notificações - Sem notificações. - %1$d notificações - Limpar Capturas de ecrã O FPS requer o HUD ativado Velocidade diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 246f8d91e5..b90660bb21 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1793,13 +1793,6 @@ Baixando o cache de shaders Pausado Aguardando para começar - Notificações - Tela inferior do DroidDeck - Mostre aqui mensagens e outras notificações enquanto você joga. Elas ficam só nesta tela e não são salvas. O Android pergunta uma vez: a página de acesso a notificações dele abre nesta tela; ative o DroidDeck lá e esta página volta sozinha. - Permitir acesso a notificações - Nenhuma notificação. - %1$d notificações - Limpar Capturas de tela O FPS precisa do HUD ativado Velocidade diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 210bc01b27..f39ab16a8d 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1801,13 +1801,6 @@ Se descarcă cache-ul de shadere Întrerupt Așteaptă să înceapă - Notificări - Ecranul de jos DroidDeck - Afișează aici mesajele și alte notificări în timp ce te joci. Rămân doar pe acest ecran și nu sunt salvate. Android întreabă o singură dată: pagina sa de acces la notificări se deschide pe acest ecran; activează DroidDeck acolo, iar această pagină revine singură. - Permite accesul la notificări - Nicio notificare. - Notificări: %1$d - Șterge Capturi de ecran FPS necesită HUD-ul activat Viteză diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index da56412f39..009fb80bd4 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1888,13 +1888,6 @@ Загрузка кэша шейдеров Приостановлено Ожидает начала - Уведомления - Нижний экран DroidDeck - Показывает сообщения и другие уведомления здесь, пока вы играете. Они отображаются только на этом экране и не сохраняются. Android спросит один раз: на этом экране откроется страница доступа к уведомлениям; включите там DroidDeck, и эта страница вернется сама. - Разрешить доступ к уведомлениям - Нет уведомлений. - Уведомлений: %1$d - Очистить Скриншоты Для FPS нужно включить HUD Скорость diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index a7eaaadac4..61d0ef03e8 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -1777,13 +1777,6 @@ Laddar ned shadercache Pausad Väntar på att starta - Aviseringar - DroidDecks nedre skärm - Visa meddelanden och andra aviseringar här medan du spelar. De visas bara på den här skärmen och sparas inte. Android frågar en gång: sidan för aviseringsåtkomst öppnas på den här skärmen; slå på DroidDeck där så kommer den här sidan tillbaka av sig själv. - Tillåt aviseringsåtkomst - Inga aviseringar. - %1$d aviseringar - Rensa Skärmbilder FPS kräver att HUD:en är på Hastighet diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 3fe86755b8..232654afe4 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -1753,13 +1753,6 @@ กำลังดาวน์โหลดแคชเชเดอร์ หยุดชั่วคราว กำลังรอเริ่ม - การแจ้งเตือน - หน้าจอล่างของ DroidDeck - แสดงข้อความและการแจ้งเตือนอื่นๆ ที่นี่ขณะที่คุณเล่น การแจ้งเตือนจะแสดงบนหน้าจอนี้เท่านั้นและจะไม่ถูกบันทึก Android จะถามเพียงครั้งเดียว: หน้าการเข้าถึงการแจ้งเตือนจะเปิดขึ้นบนหน้าจอนี้ เปิด DroidDeck ที่นั่น แล้วหน้านี้จะกลับมาเอง - อนุญาตการเข้าถึงการแจ้งเตือน - ไม่มีการแจ้งเตือน - การแจ้งเตือน %1$d รายการ - ล้าง ภาพหน้าจอ ต้องเปิด HUD เพื่อแสดง FPS ความเร็ว diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index ea31f6fae3..a76a2c4342 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1769,13 +1769,6 @@ Gölgelendirici önbelleği indiriliyor Duraklatıldı Başlamayı bekliyor - Bildirimler - DroidDeck alt ekranı - Oynarken mesajları ve diğer bildirimleri burada görün. Yalnızca bu ekranda kalırlar ve kaydedilmezler. Android bunu bir kez sorar: bildirim erişimi sayfası bu ekranda açılır; orada DroidDeck\'i açın, bu sayfa kendiliğinden geri gelir. - Bildirim erişimine izin ver - Bildirim yok. - %1$d bildirim - Temizle Ekran görüntüleri FPS için HUD açık olmalı Hız diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index cc0c3d72e8..d7058b2225 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1825,13 +1825,6 @@ Завантаження кешу шейдерів Призупинено Очікує початку - Сповіщення - Нижній екран DroidDeck - Показуйте тут повідомлення та інші сповіщення під час гри. Вони лишаються лише на цьому екрані й не зберігаються. Android запитає один раз: сторінка доступу до сповіщень відкриється на цьому екрані; увімкніть там DroidDeck, і ця сторінка повернеться сама. - Дозволити доступ до сповіщень - Немає сповіщень. - Сповіщень: %1$d - Очистити Знімки екрана Для FPS потрібно ввімкнути HUD Швидкість diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 1efb2844cd..9146f9834b 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1753,13 +1753,6 @@ Đang tải bộ nhớ đệm shader Đã tạm dừng Đang chờ bắt đầu - Thông báo - Màn hình dưới DroidDeck - Hiển thị tin nhắn và các thông báo khác ở đây khi bạn chơi. Chúng chỉ ở trên màn hình này và không được lưu. Android chỉ hỏi một lần: trang quyền truy cập thông báo sẽ mở trên màn hình này; hãy bật DroidDeck ở đó và trang này sẽ tự quay lại. - Cho phép truy cập thông báo - Không có thông báo. - %1$d thông báo - Xóa Ảnh chụp màn hình Cần bật HUD để xem FPS Tốc độ diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 458a3c83c9..337c239ae0 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1831,13 +1831,6 @@ 正在下载着色器缓存 已暂停 等待开始 - 通知 - DroidDeck 底部屏幕 - 在游戏时于此处显示消息和其他通知。通知只显示在此屏幕上,不会被保存。Android 只会询问一次:其通知使用权页面会在此屏幕上打开,在那里开启 DroidDeck 后,会自动返回此页面。 - 允许通知使用权 - 没有通知。 - %1$d 条通知 - 清除 截图 显示 FPS 需要开启 HUD 速度 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index ebb3580c05..3069520371 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1753,13 +1753,6 @@ 正在下載著色器快取 已暫停 等待開始 - 通知 - DroidDeck 下方螢幕 - 在遊玩時於此處顯示訊息和其他通知。通知只會顯示在這個螢幕上,不會儲存。Android 只會詢問一次:通知存取權頁面會在這個螢幕上開啟,在那裡開啟 DroidDeck 後,就會自動回到此頁面。 - 允許通知存取權 - 沒有通知。 - %1$d 則通知 - 清除 螢幕截圖 顯示 FPS 需要開啟 HUD 速度 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 0ebcdccd90..cd7c439674 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1753,13 +1753,6 @@ 正在下載著色器快取 已暫停 等待開始 - 通知 - DroidDeck 底部螢幕 - 在遊玩時於此處顯示訊息和其他通知。通知只會顯示在這個螢幕上,不會儲存。Android 只會詢問一次:通知存取權頁面會在這個螢幕上開啟,在那裡開啟 DroidDeck 後,就會自動回到此頁面。 - 允許通知存取權 - 沒有通知。 - %1$d 則通知 - 清除 螢幕擷取畫面 顯示 FPS 需要開啟 HUD 速度 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a6abf2eff5..b5e0867752 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1965,13 +1965,6 @@ Downloading shader cache Paused Waiting to start - Notifications - DroidDeck bottom screen - Show messages and other notifications here while you play. They stay on this screen only and are not saved. Android asks once: its notification access page opens on this screen; turn DroidDeck on there and this page comes back by itself. - Allow notification access - No notifications. - %1$d notifications - Clear Screenshots FPS needs the HUD on Speed diff --git a/app/src/test/java/com/droiddeck/launcher/session/BottomNotificationsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/BottomNotificationsTest.kt deleted file mode 100644 index 19046dc27b..0000000000 --- a/app/src/test/java/com/droiddeck/launcher/session/BottomNotificationsTest.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.droiddeck.launcher.session - -import org.junit.Assert.assertEquals -import org.junit.Assert.assertFalse -import org.junit.Assert.assertTrue -import org.junit.Test - -class BottomNotificationsTest { - private val own = "com.droiddeck.launcher" - - @Test fun messagesFromOtherAppsAreKept() { - assertTrue(BottomNotifications.keep(own, "com.discord", ongoing = false, groupSummary = false, title = "Kurt", text = "ready?")) - } - - @Test fun ownOngoingSummaryAndEmptyNotificationsAreSkipped() { - assertFalse(BottomNotifications.keep(own, own, ongoing = false, groupSummary = false, title = "Session", text = "running")) - assertFalse(BottomNotifications.keep(own, "com.spotify", ongoing = true, groupSummary = false, title = "Song", text = "Artist")) - assertFalse(BottomNotifications.keep(own, "com.discord", ongoing = false, groupSummary = true, title = "2 messages", text = "")) - assertFalse(BottomNotifications.keep(own, "com.discord", ongoing = false, groupSummary = false, title = " ", text = "")) - } - - @Test fun anUpdatedNotificationMovesToTheTopOnce() { - val list = mutableListOf( - BottomNotification("a", "App", "one", "", 1L), - BottomNotification("b", "App", "two", "", 2L), - ) - BottomNotifications.add(list, BottomNotification("b", "App", "two again", "", 3L)) - assertEquals(listOf("b", "a"), list.map { it.key }) - assertEquals("two again", list.first().title) - } - - @Test fun theListKeepsTheNewestThirty() { - val list = mutableListOf() - repeat(35) { BottomNotifications.add(list, BottomNotification("k$it", "App", "t$it", "", it.toLong())) } - assertEquals(30, list.size) - assertEquals("k34", list.first().key) - } -} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/BottomDashboardTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/BottomDashboardTest.kt index 90f39c2c5a..4598643681 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/BottomDashboardTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/BottomDashboardTest.kt @@ -16,7 +16,7 @@ class BottomDashboardTest { } @Test fun withNothingPickedTheStatsOpen() { - val ids = listOf("telemetry", "downloads", "notifications", "screenshots", "chat") + val ids = listOf("telemetry", "downloads", "screenshots", "chat") assertEquals("telemetry", pickBottomPage(null, ids)) assertEquals("telemetry", pickBottomPage("gone", ids)) assertEquals("chat", pickBottomPage("chat", ids)) diff --git a/tools/tests/test_memory_pressure.py b/tools/tests/test_memory_pressure.py index 2c852a7af5..13f9e2f8d3 100644 --- a/tools/tests/test_memory_pressure.py +++ b/tools/tests/test_memory_pressure.py @@ -32,7 +32,7 @@ step() { :; } bl_zram_usage() { _bl_rss=$rss _bl_swap=$client_swap; } bl_zram_send() { echo "send:$1:$3"; rss=$((rss - reclaimed)); _bl_pageout_complete=${pageout_complete:-1}; } ''' + functions + '\nbl_memory_read\n' + body - result = run_bash(harness) + result = run_bash('NOW=0\n' + harness.replace('SECONDS', 'NOW')) self.assertEqual(0, result.returncode, result.stderr) self.assertEqual('', result.stderr) return result.stdout.splitlines() @@ -168,7 +168,7 @@ bl_session_others() { _bl_session=(321 654); } bl_zram_usage() { _bl_rss=$rss _bl_swap=$swap; } bl_zram_send() { echo "send:$1:$3"; rss=$((rss - pushed)); swap=$((swap + pushed)); _bl_pageout_complete=$complete; } ''' + functions + '\nbl_memory_read\n' + body - result = run_bash(harness) + result = run_bash('NOW=0\n' + harness.replace('SECONDS', 'NOW')) self.assertEqual(0, result.returncode, result.stderr) self.assertEqual('', result.stderr) return result.stdout.splitlines()