Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be4a1a29 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

Add a Microbenchmark for the PeopleSpace activity (2/2)

Bug: 238993727
Test: PeopleSpaceActivityTest
Change-Id: I1fcf58875f8f07c9b810870944717ae7eab31724
parent 36993538
Loading
Loading
Loading
Loading
+32 −0
Original line number Original line Diff line number Diff line
/*
 * Copyright (C) 2023 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package com.android.systemui.compose.modifiers

import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.semantics.testTagsAsResourceId

/**
 * Set a test tag on this node so that it is associated with [resId]. This node will then be
 * accessible by integration tests using `sysuiResSelector(resId)`.
 */
@OptIn(ExperimentalComposeUiApi::class)
fun Modifier.sysuiResTag(resId: String): Modifier {
    return this.semantics { testTagsAsResourceId = true }.testTag("com.android.systemui:id/$resId")
}
+4 −1
Original line number Original line Diff line number Diff line
@@ -51,6 +51,7 @@ import androidx.lifecycle.Lifecycle
import androidx.lifecycle.repeatOnLifecycle
import androidx.lifecycle.repeatOnLifecycle
import com.android.compose.theme.LocalAndroidColorScheme
import com.android.compose.theme.LocalAndroidColorScheme
import com.android.systemui.R
import com.android.systemui.R
import com.android.systemui.compose.modifiers.sysuiResTag
import com.android.systemui.people.ui.viewmodel.PeopleTileViewModel
import com.android.systemui.people.ui.viewmodel.PeopleTileViewModel
import com.android.systemui.people.ui.viewmodel.PeopleViewModel
import com.android.systemui.people.ui.viewmodel.PeopleViewModel


@@ -110,7 +111,9 @@ private fun PeopleScreenWithConversations(
    recentTiles: List<PeopleTileViewModel>,
    recentTiles: List<PeopleTileViewModel>,
    onTileClicked: (PeopleTileViewModel) -> Unit,
    onTileClicked: (PeopleTileViewModel) -> Unit,
) {
) {
    Column {
    Column(
        Modifier.sysuiResTag("top_level_with_conversations"),
    ) {
        Column(
        Column(
            Modifier.fillMaxWidth().padding(PeopleSpacePadding),
            Modifier.fillMaxWidth().padding(PeopleSpacePadding),
            horizontalAlignment = Alignment.CenterHorizontally,
            horizontalAlignment = Alignment.CenterHorizontally,
+2 −0
Original line number Original line Diff line number Diff line
@@ -68,8 +68,10 @@ public class PeopleSpaceActivity extends ComponentActivity {
        };
        };


        if (ComposeFacade.INSTANCE.isComposeAvailable()) {
        if (ComposeFacade.INSTANCE.isComposeAvailable()) {
            Log.d(TAG, "Using the Compose implementation of the PeopleSpaceActivity");
            ComposeFacade.INSTANCE.setPeopleSpaceActivityContent(this, viewModel, onResult);
            ComposeFacade.INSTANCE.setPeopleSpaceActivityContent(this, viewModel, onResult);
        } else {
        } else {
            Log.d(TAG, "Using the View implementation of the PeopleSpaceActivity");
            ViewGroup view = PeopleViewBinder.create(this);
            ViewGroup view = PeopleViewBinder.create(this);
            PeopleViewBinder.bind(view, viewModel, /* lifecycleOwner= */ this, onResult);
            PeopleViewBinder.bind(view, viewModel, /* lifecycleOwner= */ this, onResult);
            setContentView(view);
            setContentView(view);