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

Commit e5f5aaac authored by Galia Peycheva's avatar Galia Peycheva Committed by Automerger Merge Worker
Browse files

Merge "Set TvBottomSheetActivity as unrestricted keep-clear area" into tm-dev... 

Merge "Set TvBottomSheetActivity as unrestricted keep-clear area" into tm-dev am: 7a662cfb am: 976817a2 am: ce5fce29

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18177605



Change-Id: I1859cd387768068c4f39de21d444116b68ab5653
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 18e80ec7 ce5fce29

data/etc/com.android.systemui.xml

+1 −0
Original line number Diff line number Diff line
@@ -80,5 +80,6 @@ 
        <permission name="android.permission.READ_COMPAT_CHANGE_CONFIG" />

        <permission name="android.permission.READ_DEVICE_CONFIG" />

        <permission name="android.permission.READ_SAFETY_CENTER_STATUS" />

        <permission name="android.permission.SET_UNRESTRICTED_KEEP_CLEAR_AREAS" />

    </privapp-permissions>

</permissions>

packages/SystemUI/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -323,6 +323,8 @@ 
    <!-- To read safety center status -->

    <uses-permission android:name="android.permission.READ_SAFETY_CENTER_STATUS" />



    <uses-permission android:name="android.permission.SET_UNRESTRICTED_KEEP_CLEAR_AREAS" />



    <protected-broadcast android:name="com.android.settingslib.action.REGISTER_SLICE_RECEIVER" />

    <protected-broadcast android:name="com.android.settingslib.action.UNREGISTER_SLICE_RECEIVER" />

    <protected-broadcast android:name="com.android.settings.flashlight.action.FLASHLIGHT_CHANGED" />

packages/SystemUI/src/com/android/systemui/tv/TvBottomSheetActivity.java

+9 −0
Original line number Diff line number Diff line
@@ -18,15 +18,18 @@ package com.android.systemui.tv; 


import android.app.Activity;

import android.graphics.PixelFormat;

import android.graphics.Rect;

import android.graphics.drawable.Drawable;

import android.os.Bundle;

import android.util.DisplayMetrics;

import android.util.Log;

import android.view.Gravity;

import android.view.View;

import android.view.WindowManager;



import com.android.systemui.R;



import java.util.Collections;

import java.util.function.Consumer;



/**
@@ -75,6 +78,12 @@ public abstract class TvBottomSheetActivity extends Activity { 
        getWindow().setElevation(getWindow().getElevation() + 5);

        getWindow().setBackgroundBlurRadius(getResources().getDimensionPixelSize(

                R.dimen.bottom_sheet_background_blur_radius));



        final View rootView = findViewById(R.id.bottom_sheet);

        rootView.addOnLayoutChangeListener((view, l, t, r, b, oldL, oldT, oldR, oldB) -> {

            rootView.setUnrestrictedPreferKeepClearRects(

                    Collections.singletonList(new Rect(0, 0, r - l, b - t)));

        });

    }



    @Override