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

Commit 68ef6737 authored by Mark Renouf's avatar Mark Renouf Committed by Android (Google) Code Review
Browse files

Merge "Demo: show scroll chip and capture tall screenshot when tapped"

parents f7019ee0 1bf86b5e

packages/SystemUI/res/drawable/ic_screenshot_scroll.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.

  -->

<!-- ic_unfold_more_24px.xml -->

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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M12,5.83L15.17,9l1.41,-1.41L12,3 7.41,7.59 8.83,9 12,5.83zM12,18.17L8.83,15l-1.41,1.41L12,21l4.59,-4.59L15.17,15 12,18.17z"/>

</vector>

packages/SystemUI/res/layout-land/global_screenshot_preview.xml

+1 −1
Original line number Diff line number Diff line
@@ -28,6 +28,6 @@ 
    android:visibility="gone"

    android:background="@drawable/screenshot_rounded_corners"

    android:adjustViewBounds="true"

    android:contentDescription="@string/screenshot_edit"

    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/layout/global_screenshot.xml

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
        android:layout_height="@dimen/screenshot_dismiss_button_tappable_size"

        android:elevation="7dp"

        android:visibility="gone"

        android:contentDescription="@string/screenshot_dismiss_ui_description">

        android:contentDescription="@string/screenshot_dismiss_description">

        <ImageView

            android:id="@+id/global_screenshot_dismiss_image"

            android:layout_width="match_parent"

packages/SystemUI/res/layout/global_screenshot_preview.xml

+1 −1
Original line number Diff line number Diff line
@@ -28,6 +28,6 @@ 
    android:visibility="gone"

    android:background="@drawable/screenshot_rounded_corners"

    android:adjustViewBounds="true"

    android:contentDescription="@string/screenshot_edit"

    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/layout/global_screenshot_static.xml

+3 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ 
                     android:id="@+id/screenshot_share_chip"/>

            <include layout="@layout/global_screenshot_action_chip"

                     android:id="@+id/screenshot_edit_chip"/>

            <include layout="@layout/global_screenshot_action_chip"

                     android:id="@+id/screenshot_scroll_chip"

                     android:visibility="gone" />

        </LinearLayout>

    </HorizontalScrollView>

    <include layout="@layout/global_screenshot_preview"/>