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

Commit 98d219cd authored by Stefan Andonian's avatar Stefan Andonian Committed by Automerger Merge Worker
Browse files

Merge "Move ViewCapture On/Off controls to QuickSettings Tile." into tm-qpr-dev am: d0e6bddb 

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



Change-Id: I9b0c01eee4861a1ca9e1ffb35bb54bb3e8cec473
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 789071c8 d0e6bddb

src/com/android/settings/development/qstile/DevelopmentTiles.java

+20 −1
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ public abstract class DevelopmentTiles extends TileService { 
        static final int SURFACE_FLINGER_LAYER_TRACE_CONTROL_CODE = 1025;

        @VisibleForTesting

        static final int SURFACE_FLINGER_LAYER_TRACE_STATUS_CODE = 1026;

        private static final String VIEW_CAPTURE_ENABLED = "view_capture_enabled";

        private IBinder mSurfaceFlinger;

        private IWindowManager mWindowManager;

        private ImeTracing mImeTracing;
@@ -279,10 +280,19 @@ public abstract class DevelopmentTiles extends TileService { 
            return mImeTracing.isEnabled();

        }



        private boolean isViewCaptureEnabled() {

            // Add null checking to avoid test case failure.

            if (getApplicationContext() != null) {

                return Settings.Global.getInt(getApplicationContext().getContentResolver(),

                    VIEW_CAPTURE_ENABLED, 0) != 0;

            }

            return false;

        }



        @Override

        protected boolean isEnabled() {

            return isWindowTraceEnabled() || isLayerTraceEnabled() || isSystemUiTracingEnabled()

                    || isImeTraceEnabled();

                    || isImeTraceEnabled() || isViewCaptureEnabled();

        }



        private void setWindowTraceEnabled(boolean isEnabled) {
@@ -340,12 +350,21 @@ public abstract class DevelopmentTiles extends TileService { 
            }

        }



        private void setViewCaptureEnabled(boolean isEnabled) {

            // Add null checking to avoid test case failure.

            if (getApplicationContext() != null) {

                Settings.Global.putInt(getApplicationContext()

                        .getContentResolver(), VIEW_CAPTURE_ENABLED, isEnabled ? 1 : 0);

            }

        }



        @Override

        protected void setIsEnabled(boolean isEnabled) {

            setWindowTraceEnabled(isEnabled);

            setLayerTraceEnabled(isEnabled);

            setSystemUiTracing(isEnabled);

            setImeTraceEnabled(isEnabled);

            setViewCaptureEnabled(isEnabled);

            if (!isEnabled) {

                mToast.show();

            }