Enable/disable a few things in debuggable builds

- Feature flag dashboard is now only ON in debuggable builds
- Draw overlay is enabled in debuggable builds for a11y testing

Fixes: 129060539
Fixes: 129041251
Test: robotests
Change-Id: Ic799101c8ca6cbcd26fe02b6a567f223800805ab
This commit is contained in:
Fan Zhang
2019-03-26 11:39:47 -07:00
parent cd0b74d730
commit d151c40eea
4 changed files with 41 additions and 6 deletions

View File

@@ -22,9 +22,11 @@ import static androidx.lifecycle.Lifecycle.Event.ON_START;
import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
import android.app.Activity;
import android.os.Build;
import android.view.Window;
import android.view.WindowManager;
import androidx.annotation.VisibleForTesting;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
@@ -41,9 +43,14 @@ public class HideNonSystemOverlayMixin implements LifecycleObserver {
mActivity = activity;
}
@VisibleForTesting
boolean isEnabled() {
return !Build.IS_DEBUGGABLE;
}
@OnLifecycleEvent(ON_START)
public void onStart() {
if (mActivity == null) {
if (mActivity == null || !isEnabled()) {
return;
}
mActivity.getWindow().addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
@@ -53,7 +60,7 @@ public class HideNonSystemOverlayMixin implements LifecycleObserver {
@OnLifecycleEvent(ON_STOP)
public void onStop() {
if (mActivity == null) {
if (mActivity == null || !isEnabled()) {
return;
}
final Window window = mActivity.getWindow();

View File

@@ -17,6 +17,7 @@
package com.android.settings.development.featureflags;
import android.content.Context;
import android.os.Build;
import android.util.FeatureFlagUtils;
import androidx.preference.PreferenceGroup;
@@ -39,7 +40,7 @@ public class FeatureFlagsPreferenceController extends BasePreferenceController
@Override
public int getAvailabilityStatus() {
return AVAILABLE;
return Build.IS_DEBUGGABLE ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override