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

Commit dbeccdc0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove code that break androidx build." into main am: 3067440a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3197416



Change-Id: Icd466993fb7eb6fe77f32a77f3c059ed71ba7b38
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 525a3735 3067440a

libs/bufferstreams/examples/app/java/com/android/graphics/bufferstreamsdemoapp/BufferDemosAppBar.kt

+5 −6
Original line number Diff line number Diff line 
package com.android.graphics.bufferstreamsdemoapp



import androidx.compose.material.icons.Icons

import androidx.compose.material.icons.automirrored.filled.ArrowBack

import androidx.compose.material3.Icon

import androidx.compose.material3.IconButton

import androidx.compose.material3.MaterialTheme
@@ -29,10 +27,11 @@ fun BufferDemosAppBar( 
            navigationIcon = {

                if (canNavigateBack) {

                    IconButton(onClick = navigateUp) {

                        Icon(

                                imageVector = Icons.AutoMirrored.Filled.ArrowBack,

                                contentDescription = stringResource(R.string.back_button)

                        )

                        // b/355293776

                        // Icon(

                        //     imageVector = Icons.AutoMirrored.Filled.ArrowBack,

                        //     contentDescription = stringResource(R.string.back_button)

                        // )

                    }

                }

            }