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

Commit cec4ff99 authored by Miranda Kephart's avatar Miranda Kephart Committed by Android (Google) Code Review
Browse files

Merge "Implement visual spec for screenshots corner flow"

parents 1d8df2ad 43c0296b

packages/SystemUI/res/drawable/action_chip_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    android:color="@color/global_screenshot_button_ripple">

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

        <shape android:shape="rectangle">

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

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

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

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

        </shape>

packages/SystemUI/res/drawable/ic_arrow_downward.xml

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

  ~ Copyright (C) 2020 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="24.0"

        android:viewportHeight="24.0"

        android:tint="?attr/colorControlNormal">

    <path

        android:pathData="M20,12l-1.41,-1.41L13,16.17V4h-2v12.17l-5.58,-5.59L4,12l8,8 8,-8z"

        android:fillColor="@android:color/white"/>

</vector>

packages/SystemUI/res/drawable/screenshot_actions_background_protection.xml

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

<!--

  ~ Copyright (C) 2020 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">

    <gradient

        android:angle="90"

        android:startColor="#1f000000"

        android:endColor="#00000000"/>

</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/screenshot_rounded_corners.xml

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

<!--

  ~ Copyright (C) 2020 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="@dimen/screenshot_button_corner_radius"/>

</shape>

packages/SystemUI/res/layout/global_screenshot.xml

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

<!-- Copyright (C) 2020 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.

<!--

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

  -->

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

             android:layout_width="match_parent"

             android:layout_height="match_parent">

    <ImageView android:id="@+id/global_screenshot_background"

    <ImageView

        android:id="@+id/global_screenshot_background"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:src="@android:color/black"

        android:visibility="gone"/>

    <ImageView android:id="@+id/global_screenshot"

    <ImageView

        android:id="@+id/global_screenshot_actions_background"

        android:layout_height="400dp"

        android:layout_width="match_parent"

        android:layout_gravity="bottom|center"

        android:src="@drawable/screenshot_actions_background_protection"

        android:alpha="0"/>

    <HorizontalScrollView

        android:id="@+id/global_screenshot_actions_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="bottom|center"

        android:elevation="3dp"

        android:fillViewport="true"

        android:layout_marginHorizontal="@dimen/screenshot_action_container_margin_horizontal"

        android:gravity="center"

        android:paddingLeft="@dimen/screenshot_action_container_padding_left"

        android:paddingRight="@dimen/screenshot_action_container_padding_right"

        android:paddingVertical="@dimen/screenshot_action_container_padding_vertical"

        android:visibility="gone"

        android:scrollbars="none"

        android:background="@drawable/action_chip_container_background">

        <LinearLayout

            android:id="@+id/global_screenshot_actions"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"/>

    </HorizontalScrollView>

    <ImageView

        android:id="@+id/global_screenshot"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:background="@drawable/screenshot_panel"

        android:elevation="8dp"

        android:visibility="gone"

        android:background="@drawable/screenshot_rounded_corners"

        android:adjustViewBounds="true"/>

    <ImageView android:id="@+id/global_screenshot_flash"

    <ImageView

        android:id="@+id/global_screenshot_flash"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:src="@android:color/white"
@@ -39,13 +71,5 @@ 
        android:layout_height="match_parent"

        android:visibility="gone"

        android:pointerIcon="crosshair"/>

    <LinearLayout

        android:id="@+id/global_screenshot_actions"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="bottom|center"

        android:gravity="center"

        android:paddingVertical="@dimen/screenshot_action_container_padding"

        android:visibility="gone"

        android:background="@drawable/action_chip_container_background"/>



</FrameLayout>