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

Commit e85ae8cb authored by Anton Potapov's avatar Anton Potapov Committed by Android (Google) Code Review
Browse files

Merge "Add postrecording flow" into main

parents 28b7f414 2b66031a

packages/SystemUI/AndroidManifest.xml

+8 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
 */

-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    package="com.android.systemui"

    android:sharedUserId="android.uid.systemui"

    xmlns:tools="http://schemas.android.com/tools"
@@ -548,6 +547,14 @@ 
            android:showForAllUsers="true"

            android:theme="@style/ScreenCapture" />



        <activity

            android:name=".screencapture.record.smallscreen.ui.SmallScreenPostRecordingActivity"

            android:excludeFromRecents="true"

            android:exported="false"

            android:finishOnCloseSystemDialogs="true"

            android:showForAllUsers="true"

            android:theme="@style/ScreenCapture.PostRecord" />



        <service android:name=".screenrecord.service.ScreenRecordingService" />



        <service android:name=".screenrecord.RecordingService"

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/screenrecord/domain/interactor/ScreenRecordTileUserActionInteractorTest.kt

+0 −2
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import com.android.systemui.plugins.activityStarter 
import com.android.systemui.qs.pipeline.domain.interactor.PanelInteractor

import com.android.systemui.qs.tiles.base.domain.model.QSTileInputTestKtx

import com.android.systemui.res.R

import com.android.systemui.screencapture.record.domain.interactor.screenCaptureRecordFeaturesInteractor

import com.android.systemui.screenrecord.ScreenRecordUxController

import com.android.systemui.screenrecord.data.model.ScreenRecordModel

import com.android.systemui.screenrecord.data.repository.ScreenRecordRepositoryImpl
@@ -84,7 +83,6 @@ class ScreenRecordTileUserActionInteractorTest : SysuiTestCase() { 
            keyguardDismissUtil,

            dialogTransitionAnimator,

            panelInteractor,

            kosmos.screenCaptureRecordFeaturesInteractor,

            mock<MediaProjectionMetricsLogger>(),

        )

    }

packages/SystemUI/res/drawable/ic_edit_square.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2025 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.

  -->



<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="21dp"

    android:height="20dp"

    android:viewportWidth="21"

    android:viewportHeight="20">

  <group>

    <clip-path

        android:pathData="M0.5,0h20v20h-20z"/>

    <path

        android:pathData="M5,17C4.583,17 4.229,16.854 3.938,16.563C3.646,16.271 3.5,15.917 3.5,15.5V4.5C3.5,4.083 3.646,3.729 3.938,3.438C4.229,3.132 4.583,2.986 5,3H12.208L10.708,4.5H5V15.5H16V9.792L17.5,8.292V15.5C17.5,15.917 17.354,16.271 17.063,16.563C16.771,16.854 16.417,17 16,17H5ZM8.5,12V8.813L15.875,1.438C16.028,1.285 16.194,1.174 16.375,1.104C16.556,1.035 16.736,1 16.917,1C17.125,1 17.319,1.035 17.5,1.104C17.681,1.174 17.847,1.285 18,1.438L19.063,2.5C19.215,2.653 19.326,2.819 19.396,3C19.465,3.181 19.5,3.368 19.5,3.563C19.5,3.757 19.465,3.944 19.396,4.125C19.326,4.306 19.215,4.472 19.063,4.625L11.688,12H8.5ZM18,3.563L16.938,2.5L18,3.563ZM10,10.5H11.063L15.875,5.688L15.354,5.146L14.813,4.625L10,9.438V10.5ZM15.354,5.146L14.813,4.625L15.354,5.146L15.875,5.688L15.354,5.146Z"

        android:fillColor="#ffffff"/>

  </group>

</vector>

packages/SystemUI/res/drawable/ic_sync_saved_locally.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2025 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.

  -->



<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="16dp"

    android:height="12dp"

    android:viewportHeight="12"

    android:viewportWidth="16">

    <path

        android:fillColor="#ffffff"

        android:pathData="M7.283,7.3L10.967,3.617L10.05,2.717L7.283,5.483L5.933,4.133L5.017,5.033L7.283,7.3ZM0.8,11.6V10.4H15.2V11.6H0.8ZM2.8,9.6C2.467,9.6 2.183,9.483 1.95,9.25C1.717,9.017 1.6,8.733 1.6,8.4V1.6C1.6,1.267 1.717,0.983 1.95,0.75C2.183,0.517 2.467,0.4 2.8,0.4H13.2C13.533,0.4 13.817,0.517 14.05,0.75C14.283,0.983 14.4,1.267 14.4,1.6V8.4C14.4,8.733 14.283,9.017 14.05,9.25C13.817,9.483 13.533,9.6 13.2,9.6H2.8ZM2.8,8.4H13.2V1.6H2.8V8.4ZM2.8,8.4V1.6V8.4Z" />

</vector>

packages/SystemUI/res/values-land/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -58,4 +58,7 @@ 


    <!-- Whether to show bottom sheets edge to edge -->

    <bool name="config_edgeToEdgeBottomSheetDialog">false</bool>



    <!-- Indicates post recording flow to use flat bottom bar to save vertical space -->

    <bool name="screen_record_post_recording_flat_bottom_bar">true</bool>

</resources>