aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2015-02-05 22:54:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-05 22:54:43 +0000
commitb7118cebc3d489f17178dde1e8d3a799506551db (patch)
treea8bdd20587ea115d9c186de685adafa80f70080d
parent95da5f4b8b24daee1b30ea531e9308871a92dd91 (diff)
parent8ab5c13b8161ecb1dab460b8b2b9020f17eef790 (diff)
downloadsdk-b7118cebc3d489f17178dde1e8d3a799506551db.zip
sdk-b7118cebc3d489f17178dde1e8d3a799506551db.tar.gz
sdk-b7118cebc3d489f17178dde1e8d3a799506551db.tar.bz2
am 8ab5c13b: Merge "pixel perfect: Disable controls" into studio-1.1-dev automerge: b234933 automerge: e50f48d automerge: 48965bc
* commit '8ab5c13b8161ecb1dab460b8b2b9020f17eef790': pixel perfect: Disable controls
-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();
}