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

Commit 40030c8d authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Binding Pwr+VolDown to take screenshot."

parents a4ad22a5 9112ec30

packages/SystemUI/AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -25,6 +25,11 @@ 
            android:exported="true"

            />



        <!-- started from PhoneWindowManager

             TODO: Should have an android:permission attribute -->

        <service android:name=".screenshot.TakeScreenshotService"

            android:exported="false" />



        <activity android:name=".usb.UsbPreferenceActivity"

             android:theme="@*android:style/Theme.Holo.Dialog.Alert"

             android:excludeFromRecents="true">

packages/SystemUI/res/drawable-hdpi/global_screenshot_background.9.png

0 → 100644
+358 B
Loading image diff...

packages/SystemUI/res/drawable-mdpi/global_screenshot_background.9.png

0 → 100644
+358 B
Loading image diff...

packages/SystemUI/res/layout/global_screenshot.xml

0 → 100644
+40 −0
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_background"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="#FF000000"

        android:visibility="gone" />

    <FrameLayout

        android:id="@+id/global_screenshot_container"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:background="@drawable/global_screenshot_background"

        android:visibility="gone">

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:adjustViewBounds="true" />

    </FrameLayout>

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

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="#FFFFFFFF"

        android:visibility="gone" />

</FrameLayout>

packages/SystemUI/res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -165,4 +165,9 @@ 
    <string name="use_ptp_button_title">Mount as a camera (PTP)</string>

    <!-- Label for the installer CD image option in UsbPreferenceActivity. [CHAR LIMIT=50] -->

    <string name="installer_cd_button_title">Install Android File Transfer application for Mac</string>



    <!-- toast message displayed when a screenshot is saved to the Gallery. -->

    <string name="screenshot_saving_toast">Screenshot saved to Gallery</string>

    <!-- toast message displayed when we fail to take a screenshot. -->

    <string name="screenshot_failed_toast">Could not save screenshot</string>

</resources>