aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2015-02-05 22:40:56 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-02-05 22:40:56 +0000
commit8ab5c13b8161ecb1dab460b8b2b9020f17eef790 (patch)
treef1d698bc5542daf7f6db2027805b8736421e0748
parentad4387f29d09fd900b12435a3a45b4d5b6bb85e8 (diff)
parent48965bc07b756ae551222f270a3d3054186d5683 (diff)
downloadsdk-8ab5c13b8161ecb1dab460b8b2b9020f17eef790.zip
sdk-8ab5c13b8161ecb1dab460b8b2b9020f17eef790.tar.gz
sdk-8ab5c13b8161ecb1dab460b8b2b9020f17eef790.tar.bz2
Merge "pixel perfect: Disable controls" into studio-1.1-dev automerge: b234933 automerge: e50f48d
automerge: 48965bc * commit '48965bc07b756ae551222f270a3d3054186d5683': 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();
}