aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2015-02-03 22:46:29 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-02-03 22:46:29 +0000
commitb234933dc60c7c85db36156b74b6e2c49b2ee9a9 (patch)
tree5bf6ad68454712696664d57c98fc210cf71d6a67
parentbb341957d6e513fdcb91b8bb1fe665def0a5fe10 (diff)
parentc8bb603538d4c3d0b03bdd66408f021edb072866 (diff)
downloadsdk-b234933dc60c7c85db36156b74b6e2c49b2ee9a9.zip
sdk-b234933dc60c7c85db36156b74b6e2c49b2ee9a9.tar.gz
sdk-b234933dc60c7c85db36156b74b6e2c49b2ee9a9.tar.bz2
Merge "pixel perfect: Disable controls" into studio-1.1-dev
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/PixelPerfectLoupeView.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/PixelPerfectLoupeView.java b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/PixelPerfectLoupeView.java
index bc45ff8..93ad598 100644
--- a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/PixelPerfectLoupeView.java
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/PixelPerfectLoupeView.java
@@ -82,9 +82,11 @@ public class PixelPerfectLoupeView extends ViewPart implements IImageChangeListe
new PixelPerfectPixelPanel(pixelPerfectLoupeBorder);
pixelPerfectPixelPanel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- PixelPerfectControls pixelPerfectControls =
- new PixelPerfectControls(parent);
- pixelPerfectControls.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ // https://code.google.com/p/android/issues/detail?id=69199
+ // Disabled until accessibility issues are fixed
+ // PixelPerfectControls pixelPerfectControls =
+ // new PixelPerfectControls(parent);
+ // pixelPerfectControls.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
placeActions();
}