Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
diff --git a/src/com/android/settings/development/qstile/DevelopmentTiles.java b/src/com/android/settings/development/qstile/DevelopmentTiles.java
index bb5216c..3b6c646 100644
--- a/src/com/android/settings/development/qstile/DevelopmentTiles.java
+++ b/src/com/android/settings/development/qstile/DevelopmentTiles.java
@@ -212,6 +212,7 @@
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 @@
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 @@
}
}
+ 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();
}