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

Commit e908aba2 authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

Merge changes Ie07be0c7,Ice010963 into sc-dev am: 42a6c3bb am: 0b3f413e am: 0e3863f6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14680110

Change-Id: I67ab439f13d491cc60a2a3c87491bfd05845cd1e
parents 7727c3bb 0e3863f6

packages/SystemUI/res/drawable/action_chip_background.xml

+3 −3
Original line number Original line Diff line number Diff line
@@ -16,11 +16,11 @@ 
  -->

  -->

<ripple

<ripple

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

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

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

    android:color="@color/global_screenshot_button_ripple">

    android:color="@color/global_screenshot_button_ripple">

    <item android:id="@android:id/background">

    <item android:id="@android:id/background">

        <shape android:shape="rectangle">

        <shape android:shape="rectangle">

            <stroke android:width="1dp" android:color="@color/global_screenshot_button_border"/>

            <solid android:color="?androidprv:attr/colorAccentSecondary"/>

            <solid android:color="@color/global_screenshot_button_background"/>

            <corners android:radius="@dimen/screenshot_button_corner_radius"/>

            <corners android:radius="@dimen/screenshot_button_corner_radius"/>

        </shape>

        </shape>

    </item>

    </item>

packages/SystemUI/res/drawable/action_chip_container_background.xml

+6 −4
Original line number Original line Diff line number Diff line
@@ -14,8 +14,10 @@ 
  ~ See the License for the specific language governing permissions and

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  ~ limitations under the License.

  -->

  -->

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

<shape

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

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

    android:shape="rectangle">

    android:shape="rectangle">

    <solid android:color="@color/global_screenshot_button_background"/>

    <solid android:color="?androidprv:attr/colorSurface"/>

    <corners android:radius="@dimen/screenshot_action_container_corner_radius"/>

    <corners android:radius="@dimen/screenshot_action_container_corner_radius"/>

</shape>
 
</shape>

packages/SystemUI/res/layout/global_screenshot_preview.xml→packages/SystemUI/res/drawable/screenshot_border.xml

+23 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>

<!--

<!--

  ~ Copyright (C) 2011 The Android Open Source Project

  ~ Copyright (C) 2021 The Android Open Source Project

  ~

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ you may not use this file except in compliance with the License.
@@ -14,20 +14,10 @@ 
  ~ See the License for the specific language governing permissions and

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  ~ limitations under the License.

  -->

  -->

<ImageView

<shape

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

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

    xmlns:app="http://schemas.android.com/apk/res-auto"

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

    android:id="@+id/global_screenshot_preview"

    android:shape="rectangle">

    android:layout_width="@dimen/global_screenshot_x_scale"

    <solid android:color="?androidprv:attr/colorSurface"/>

    android:layout_height="wrap_content"

    <corners android:radius="20dp"/>

    android:layout_gravity="center"

</shape>
 
    android:layout_marginStart="@dimen/screenshot_offset_x"

    android:layout_marginBottom="@dimen/screenshot_offset_y"

    android:scaleType="fitEnd"

    android:elevation="@dimen/screenshot_preview_elevation"

    android:visibility="invisible"

    android:background="@drawable/screenshot_rounded_corners"

    android:adjustViewBounds="true"

    android:contentDescription="@string/screenshot_edit_label"

    app:layout_constraintBottom_toBottomOf="parent"

    app:layout_constraintStart_toStartOf="parent"/>
 
 No newline at end of file

packages/SystemUI/res/drawable/screenshot_cancel.xml

+8 −7
Original line number Original line Diff line number Diff line
@@ -15,14 +15,15 @@ 
  ~ limitations under the License.

  ~ limitations under the License.

  -->

  -->

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

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

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

        android:width="48dp"

        android:width="48dp"

        android:height="48dp"

        android:height="48dp"

        android:viewportWidth="48.0"

        android:viewportWidth="32.0"

        android:viewportHeight="48.0">

        android:viewportHeight="32.0">

    <path

    <path

        android:fillColor="@color/global_screenshot_dismiss_background"

        android:fillColor="?androidprv:attr/colorAccentSecondary"

        android:pathData="M24,24m-16,0a16,16 0,1 1,32 0a16,16 0,1 1,-32 0"/>

        android:pathData="M16,16m-16,0a16,16 0,1 1,32 0a16,16 0,1 1,-32 0"/>

    <path

    <path

        android:fillColor="@color/global_screenshot_dismiss_foreground"

        android:fillColor="?android:attr/textColorPrimary"

        android:pathData="M31,18.41L29.59,17 24,22.59 18.41,17 17,18.41 22.59,24 17,29.59 18.41,31 24,25.41 29.59,31 31,29.59 25.41,24z"/>

        android:pathData="M23,10.41L21.59,9 16,14.59 10.41,9 9,10.41 14.59,16 9,21.59 10.41,23 16,17.41 21.59,23 23,21.59 17.41,16z"/>

</vector>
 
</vector>

packages/SystemUI/res/drawable/screenshot_preview_background.xml

0 → 100644
+21 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

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

  -->

<shape

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

    android:shape="rectangle">

    <corners android:radius="20dp"/>

</shape>