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

Commit 29e6eb05 authored by Mehdi Alizadeh's avatar Mehdi Alizadeh Committed by Automerger Merge Worker
Browse files

Merge "Allows IndicatorView to have a different size than Settings Activity"... 

Merge "Allows IndicatorView to have a different size than Settings Activity" into rvc-dev am: b50512b6 am: eab29335

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11835166

Change-Id: I5e603aa831d709daa4de6a886b2e607410023c48
parents eebf47cd eab29335

AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ 
    <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL" />

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

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

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

    

    <application android:label="@string/settings_label"

            android:icon="@drawable/ic_launcher_settings"

src/com/android/settings/gestures/BackGestureIndicatorView.java

+1 −3
Original line number Diff line number Diff line
@@ -92,9 +92,7 @@ public class BackGestureIndicatorView extends LinearLayout { 
        int copiedFlags = (parentWindowAttributes.flags

                & WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);

        final WindowManager.LayoutParams lp = new WindowManager.LayoutParams(

                ViewGroup.LayoutParams.MATCH_PARENT,

                ViewGroup.LayoutParams.MATCH_PARENT,

                WindowManager.LayoutParams.TYPE_APPLICATION,

                WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY,

                WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED

                        | WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE

                        | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE