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

Commit 9f550e91 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #5128639: SystemUI grows by 10MB after taking a screenshot"

parents 2efd89f7 fc8fa638

data/etc/platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ 
    <assign-permission name="android.permission.DEVICE_POWER" uid="shell" />

    <assign-permission name="android.permission.INSTALL_LOCATION_PROVIDER" uid="shell" />

    <assign-permission name="android.permission.BACKUP" uid="shell" />

    <assign-permission name="android.permission.FORCE_STOP_PACKAGES" uid="shell" />



    <assign-permission name="android.permission.MODIFY_AUDIO_SETTINGS" uid="media" />

    <assign-permission name="android.permission.ACCESS_DRM" uid="media" />

graphics/java/android/graphics/drawable/LayerDrawable.java

+10 −1
Original line number Diff line number Diff line
@@ -277,10 +277,19 @@ public class LayerDrawable extends Drawable implements Drawable.Callback { 
     */

    public boolean setDrawableByLayerId(int id, Drawable drawable) {

        final ChildDrawable[] layers = mLayerState.mChildren;

        drawable.setCallback(this);

        

        for (int i = mLayerState.mNum - 1; i >= 0; i--) {

            if (layers[i].mId == id) {

                if (layers[i].mDrawable != null) {

                    if (drawable != null) {

                        Rect bounds = layers[i].mDrawable.getBounds();

                        drawable.setBounds(bounds);

                    }

                    layers[i].mDrawable.setCallback(null);

                }

                if (drawable != null) {

                    drawable.setCallback(this);

                }

                layers[i].mDrawable = drawable;

                return true;

            }

packages/SystemUI/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
        <!-- started from PhoneWindowManager

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

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

            android:process=":screenshot"

            android:exported="false" />



        <service android:name=".LoadAverageService"

packages/SystemUI/res/drawable/recents_thumbnail_layers.xml→packages/SystemUI/res/anim/recent_appear.xml

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

<!-- Copyright (C) 2011 The Android Open Source Project

<!-- Copyright (C) 2010 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.
@@ -13,7 +13,8 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >

    <item android:drawable="@drawable/recents_thumbnail_bg" android:id="@+id/base_layer"/>

    <item android:drawable="@drawable/recents_thumbnail_overlay" android:id="@+id/overlay_layer"/>

</layer-list>
 
 No newline at end of file
 


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

    android:fromAlpha="0.0" android:toAlpha="1.0"

    android:duration="@android:integer/config_shortAnimTime"

    />

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

+10 −2
Original line number Diff line number Diff line
@@ -32,8 +32,14 @@ 
        android:layout_marginLeft="@dimen/status_bar_recents_thumbnail_left_margin"

        android:scaleType="center"

        android:clickable="true"

        android:background="@drawable/recents_thumbnail_layers"

        android:background="@drawable/recents_thumbnail_bg"

        android:foreground="@drawable/recents_thumbnail_overlay">

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

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:visibility="invisible"

        />

    </FrameLayout>



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

        android:layout_width="wrap_content"
@@ -45,6 +51,7 @@ 
        android:maxWidth="@dimen/status_bar_recents_thumbnail_max_width"

        android:maxHeight="@dimen/status_bar_recents_thumbnail_max_height"

        android:adjustViewBounds="true"

        android:visibility="invisible"

    />



    <TextView android:id="@+id/app_label"
@@ -60,6 +67,7 @@ 
        android:layout_marginLeft="@dimen/recents_thumbnail_bg_padding_left"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:visibility="invisible"

    />



    <TextView android:id="@+id/app_description"