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

Commit 17cab722 authored by Xiaoqian (Daisy) Dai's avatar Xiaoqian (Daisy) Dai Committed by Android (Google) Code Review
Browse files

Merge "Large screen capture: adding settings menu" into main

parents c7039561 0a0dd951

packages/SystemUI/multivalentTests/src/com/android/systemui/screencapture/record/domain/interactor/ScreenCaptureRecordParametersModelInteractorTest.kt

+13 −0
Original line number Diff line number Diff line
@@ -73,4 +73,17 @@ class ScreenCaptureRecordParametersModelInteractorTest : SysuiTestCase() { 


            assertThat(shouldShowTaps).isEqualTo(newShouldShowTaps)

        }



    @Test

    fun testChangingShouldShowFrontCamera() =

        kosmos.runTest {

            val newShouldShowFrontCamera = true

            val shouldShowFrontCamera by

                collectLastValue(underTest.parameters.map { it.shouldShowFrontCamera })

            assertThat(shouldShowFrontCamera).isNotEqualTo(newShouldShowFrontCamera)



            underTest.setShouldShowFrontCamera(newShouldShowFrontCamera)



            assertThat(shouldShowFrontCamera).isEqualTo(newShouldShowFrontCamera)

        }

}

packages/SystemUI/res/drawable/ic_person_filled.xml

0 → 100644
+19 −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="24dp" android:height="24dp" android:viewportWidth="960" android:viewportHeight="960" android:tint="?attr/colorControlNormal">

    <path android:fillColor="@android:color/white" android:pathData="M480,480Q414,480 367,433Q320,386 320,320Q320,254 367,207Q414,160 480,160Q546,160 593,207Q640,254 640,320Q640,386 593,433Q546,480 480,480ZM160,720L160,688Q160,654 177.5,625.5Q195,597 224,582Q286,551 350,535.5Q414,520 480,520Q546,520 610,535.5Q674,551 736,582Q765,597 782.5,625.5Q800,654 800,688L800,720Q800,753 776.5,776.5Q753,800 720,800L240,800Q207,800 183.5,776.5Q160,753 160,720Z"/>

</vector>
 
 No newline at end of file

packages/SystemUI/res/drawable/ic_speaker_rounded.xml

0 → 100644
+19 −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="24dp" android:height="24dp" android:viewportWidth="960" android:viewportHeight="960" android:tint="?attr/colorControlNormal">

    <path android:fillColor="@android:color/white" android:pathData="M680,880L280,880Q247,880 223.5,856.5Q200,833 200,800L200,160Q200,127 223.5,103.5Q247,80 280,80L680,80Q713,80 736.5,103.5Q760,127 760,160L760,800Q760,833 736.5,856.5Q713,880 680,880ZM680,800Q680,800 680,800Q680,800 680,800L680,160Q680,160 680,160Q680,160 680,160L280,160Q280,160 280,160Q280,160 280,160L280,800Q280,800 280,800Q280,800 280,800L680,800ZM480,360Q513,360 536.5,336.5Q560,313 560,280Q560,247 536.5,223.5Q513,200 480,200Q447,200 423.5,223.5Q400,247 400,280Q400,313 423.5,336.5Q447,360 480,360ZM480,760Q546,760 593,713Q640,666 640,600Q640,534 593,487Q546,440 480,440Q414,440 367,487Q320,534 320,600Q320,666 367,713Q414,760 480,760ZM480,680Q447,680 423.5,656.5Q400,633 400,600Q400,567 423.5,543.5Q447,520 480,520Q513,520 536.5,543.5Q560,567 560,600Q560,633 536.5,656.5Q513,680 480,680ZM280,160L280,160Q280,160 280,160Q280,160 280,160L280,800Q280,800 280,800Q280,800 280,800L280,800Q280,800 280,800Q280,800 280,800L280,160Q280,160 280,160Q280,160 280,160Z"/>

</vector>

packages/SystemUI/res/drawable/ic_web_traffic.xml

0 → 100644
+19 −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="24dp" android:height="24dp" android:viewportWidth="960" android:viewportHeight="960" android:tint="?attr/colorControlNormal">

    <path android:fillColor="@android:color/white" android:pathData="M120,400L160,400Q177,400 188.5,411.5Q200,423 200,440Q200,457 188.5,468.5Q177,480 160,480L120,480Q103,480 91.5,468.5Q80,457 80,440Q80,423 91.5,411.5Q103,400 120,400ZM188,616L216,588Q228,576 244,576.5Q260,577 272,588Q284,600 284.5,616.5Q285,633 273,645L245,673Q233,685 216.5,684.5Q200,684 188,672Q177,660 176.5,644Q176,628 188,616ZM216,292L188,264Q176,252 176.5,236Q177,220 188,208Q200,196 216.5,195.5Q233,195 245,207L273,235Q285,247 284.5,263.5Q284,280 272,292Q260,303 244,303.5Q228,304 216,292ZM692,772L530,610L500,700Q498,707 492.5,710.5Q487,714 481,714Q475,714 469.5,710Q464,706 462,699L376,413Q374,405 376.5,397Q379,389 384,384Q389,379 397,376.5Q405,374 413,376L701,462Q708,464 711.5,469.5Q715,475 715,481Q715,487 712,492.5Q709,498 702,500L612,532L772,692Q784,704 784,720Q784,736 772,748L748,772Q736,784 720,784Q704,784 692,772ZM400,200L400,160Q400,143 411.5,131.5Q423,120 440,120Q457,120 468.5,131.5Q480,143 480,160L480,200Q480,217 468.5,228.5Q457,240 440,240Q423,240 411.5,228.5Q400,217 400,200ZM607,235L636,206Q647,195 663.5,194.5Q680,194 692,206Q703,217 703.5,233.5Q704,250 693,262L664,292Q653,304 636.5,303.5Q620,303 608,292Q596,280 595.5,263.5Q595,247 607,235Z"/>

</vector>
 
 No newline at end of file

packages/SystemUI/res/values/strings.xml

+9 −0
Original line number Diff line number Diff line
@@ -421,6 +421,15 @@ 
    <!-- Content description for the settings button in the toolbar. [CHAR LIMIT=NONE] -->

    <string name="screen_capture_toolbar_settings_button_a11y">Screen capture settings</string>



    <!-- Screen capture setting to show clicks and keys when recording [CHAR LIMIT=35] -->

    <string name="screen_capture_show_clicks_and_keys">Show clicks and keys</string>

    <!-- Screen capture setting to capture device audio when recording [CHAR LIMIT=35] -->

    <string name="screen_capture_device_audio">Device audio</string>

    <!-- Screen capture setting to capture microphone audio when recording [CHAR LIMIT=35] -->

    <string name="screen_capture_microphone_audio">Microphone</string>

    <!-- Screen capture setting to include the front camera when recording [CHAR LIMIT=35] -->

    <string name="screen_capture_front_camera">Front camera</string>



    <!-- Text shown beneath partial screenshot region displaying the dimensions (width and height) of the area to be captured. [CHAR LIMIT=NONE] [SCREENSHOT=screen/7ytguTQdu3cEn4f] -->

    <string name="screen_capture_region_dimensions"><xliff:g example="210" id="width">%1$d</xliff:g> x <xliff:g example="129" id="height">%2$d</xliff:g></string>