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

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

Merge "Standardize screenshot naming scheme"

parents 2efca513 40fb1ffa

packages/SystemUI/res/drawable/action_chip_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<ripple

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

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

        <shape android:shape="rectangle">

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

packages/SystemUI/res/drawable/screenshot_actions_background_protection.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">

    <gradient

        android:angle="90"

        android:startColor="@color/global_screenshot_background_protection_start"

        android:startColor="@color/screenshot_background_protection_start"

        android:endColor="#00000000"/>

</shape>
 
 No newline at end of file

packages/SystemUI/res/layout/global_screenshot_legacy.xml

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

<!-- 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_legacy_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_legacy"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:background="@drawable/screenshot_panel"

        android:visibility="gone"

        android:adjustViewBounds="true" />

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

        android:layout_width="match_parent"

        android:layout_height="match_parent"

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

        android:visibility="gone" />

    <com.android.systemui.screenshot.ScreenshotSelectorView

        android:id="@+id/global_screenshot_legacy_selector"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:visibility="gone"

        android:pointerIcon="crosshair"/>

</FrameLayout>

packages/SystemUI/res/layout/global_screenshot.xml→packages/SystemUI/res/layout/screenshot.xml

+6 −6
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
  -->

<com.android.systemui.screenshot.ScreenshotView

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

    android:id="@+id/global_screenshot_frame"

    android:id="@+id/screenshot_frame"

    android:theme="@style/Screenshot"

    android:layout_width="match_parent"

    android:layout_height="match_parent"
@@ -29,25 +29,25 @@ 
        android:clickable="true"

        android:importantForAccessibility="no"/>

    <ImageView

        android:id="@+id/global_screenshot_actions_background"

        android:id="@+id/screenshot_actions_background"

        android:layout_height="@dimen/screenshot_bg_protection_height"

        android:layout_width="match_parent"

        android:layout_gravity="bottom"

        android:alpha="0.0"

        android:src="@drawable/screenshot_actions_background_protection"/>

    <ImageView

        android:id="@+id/global_screenshot_flash"

        android:id="@+id/screenshot_flash"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:visibility="gone"

        android:elevation="@dimen/screenshot_preview_elevation"

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

    <com.android.systemui.screenshot.ScreenshotSelectorView

        android:id="@+id/global_screenshot_selector"

        android:id="@+id/screenshot_selector"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:visibility="gone"

        android:pointerIcon="crosshair"/>

    <include layout="@layout/global_screenshot_static"

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

    <include layout="@layout/screenshot_static"

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

</com.android.systemui.screenshot.ScreenshotView>

packages/SystemUI/res/layout/global_screenshot_action_chip.xml→packages/SystemUI/res/layout/screenshot_action_chip.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
  -->

<com.android.systemui.screenshot.ScreenshotActionChip

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

    android:id="@+id/global_screenshot_action_chip"

    android:id="@+id/screenshot_action_chip"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_marginStart="@dimen/screenshot_action_chip_margin_start"