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

Commit 2e195e44 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Screen capture: Reorganize components into common and largescreen" into main

parents 84c6f07c d4678a22

packages/SystemUI/src/com/android/systemui/screencapture/ui/compose/PrimaryButton.kt→packages/SystemUI/src/com/android/systemui/screencapture/common/ui/compose/PrimaryButton.kt

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.systemui.screencapture.ui.compose

package com.android.systemui.screencapture.common.ui.compose



import androidx.compose.foundation.layout.Spacer

import androidx.compose.foundation.layout.size

packages/SystemUI/src/com/android/systemui/screencapture/ui/compose/RadioButtonGroup.kt→packages/SystemUI/src/com/android/systemui/screencapture/common/ui/compose/RadioButtonGroup.kt

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


@file:OptIn(ExperimentalMaterial3ExpressiveApi::class)



package com.android.systemui.screencapture.ui.compose

package com.android.systemui.screencapture.common.ui.compose



import androidx.compose.foundation.layout.Arrangement

import androidx.compose.foundation.layout.Row

packages/SystemUI/src/com/android/systemui/screencapture/ui/compose/Toolbar.kt→packages/SystemUI/src/com/android/systemui/screencapture/common/ui/compose/Toolbar.kt

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


@file:OptIn(ExperimentalMaterial3ExpressiveApi::class)



package com.android.systemui.screencapture.ui.compose

package com.android.systemui.screencapture.common.ui.compose



import androidx.compose.foundation.layout.RowScope

import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi

packages/SystemUI/src/com/android/systemui/screencapture/ui/compose/PreCaptureToolbar.kt→packages/SystemUI/src/com/android/systemui/screencapture/record/largescreen/ui/compose/PreCaptureToolbar.kt

+4 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.systemui.screencapture.ui.compose

package com.android.systemui.screencapture.record.largescreen.ui.compose



import androidx.compose.foundation.layout.Row

import androidx.compose.foundation.layout.Spacer
@@ -26,6 +26,9 @@ import androidx.compose.runtime.Composable 
import androidx.compose.ui.Modifier

import androidx.compose.ui.unit.dp

import com.android.systemui.common.ui.compose.Icon

import com.android.systemui.screencapture.common.ui.compose.RadioButtonGroup

import com.android.systemui.screencapture.common.ui.compose.RadioButtonGroupItem

import com.android.systemui.screencapture.common.ui.compose.Toolbar

import com.android.systemui.screencapture.ui.viewmodel.ScreenCaptureViewModel



@OptIn(ExperimentalMaterial3ExpressiveApi::class)

packages/SystemUI/src/com/android/systemui/screencapture/ui/compose/PreCaptureUI.kt→packages/SystemUI/src/com/android/systemui/screencapture/record/largescreen/ui/compose/PreCaptureUI.kt

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.systemui.screencapture.ui.compose

package com.android.systemui.screencapture.record.largescreen.ui.compose



import androidx.compose.runtime.Composable

import com.android.systemui.lifecycle.rememberViewModel