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

Commit 0148b28e authored by Miranda Kephart's avatar Miranda Kephart
Browse files

Add action chips to corner screenshot flow 

In the corner screenshot flow, add a LinearLayout with action chips
(share/edit/scroll) that pops up once the actions are available.

Note that the 'scroll' button currently does nothing.

Bug: 144918886
Test: manual; tested that 'edit' and 'share' chips open the
appropriate apps and make the screenshot disappear; tested that
current notification flow is unchanged.

Change-Id: I6952b76aa3bb479c49b1905275d5fcdc0eeaf2df
parent b4391346

packages/SystemUI/res/drawable/action_chip_background.xml

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

<!--

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

  -->

<ripple

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

    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"/>

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

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

        </shape>

    </item>

</ripple>
 
 No newline at end of file

packages/SystemUI/res/drawable/action_chip_container_background.xml

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

<!--

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

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

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

</shape>
 
 No newline at end of file

packages/SystemUI/res/layout/global_screenshot.xml

+9 −0
Original line number Diff line number Diff line
@@ -39,4 +39,13 @@ 
        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>

packages/SystemUI/res/layout/global_screenshot_action_chip.xml

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

<!--

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

  -->

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

          android:id="@+id/global_screenshot_action_chip"

          android:layout_width="wrap_content"

          android:layout_height="wrap_content"

          android:layout_marginHorizontal="@dimen/screenshot_action_chip_margin_horizontal"

          android:paddingVertical="@dimen/screenshot_action_chip_padding_vertical"

          android:paddingHorizontal="@dimen/screenshot_action_chip_padding_horizontal"

          android:background="@drawable/action_chip_background"

          android:textColor="@color/global_screenshot_button_text"/>

packages/SystemUI/res/values-night/colors.xml

+5 −0
Original line number Diff line number Diff line
@@ -78,6 +78,11 @@ 
    <!-- The color of the text in the Global Actions menu -->

    <color name="global_actions_alert_text">@color/GM2_red_300</color>



    <!-- Global screenshot actions -->

    <color name="global_screenshot_button_background">@color/GM2_grey_900</color>

    <color name="global_screenshot_button_ripple">#42FFFFFF</color>

    <color name="global_screenshot_button_text">@color/GM2_blue_300</color>



    <!-- Biometric dialog colors -->

    <color name="biometric_dialog_gray">#ff888888</color>

    <color name="biometric_dialog_accent">#ff80cbc4</color> <!-- light teal -->