diff options
author | Michael Jurka <mikejurka@google.com> | 2012-10-08 13:28:37 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-08 13:28:38 -0700 |
commit | 6c5679e5ddbac06d555f1242a2cf082deb71de21 (patch) | |
tree | 697d10b63919712c6c6109ad16aed5607f7b4ea7 /src/com/android/launcher2 | |
parent | ec437d0e7e95420213abcebcb832eb10e8196a20 (diff) | |
parent | 22143131770f7e90be4181e88ced0cb1d7158306 (diff) | |
download | android_packages_apps_Trebuchet-6c5679e5ddbac06d555f1242a2cf082deb71de21.tar.gz android_packages_apps_Trebuchet-6c5679e5ddbac06d555f1242a2cf082deb71de21.tar.bz2 android_packages_apps_Trebuchet-6c5679e5ddbac06d555f1242a2cf082deb71de21.zip |
Merge "Fix bug 6886990: cling accessibility" into jb-mr1-dev
Diffstat (limited to 'src/com/android/launcher2')
-rw-r--r-- | src/com/android/launcher2/HideFromAccessibilityHelper.java | 113 | ||||
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 21 |
2 files changed, 132 insertions, 2 deletions
diff --git a/src/com/android/launcher2/HideFromAccessibilityHelper.java b/src/com/android/launcher2/HideFromAccessibilityHelper.java new file mode 100644 index 000000000..0b2ce5ba6 --- /dev/null +++ b/src/com/android/launcher2/HideFromAccessibilityHelper.java @@ -0,0 +1,113 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.launcher2; + +import android.view.View; +import android.view.ViewGroup; +import android.view.ViewGroup.OnHierarchyChangeListener; + +import java.util.HashMap; + +public class HideFromAccessibilityHelper implements OnHierarchyChangeListener { + private HashMap<View, Integer> mPreviousValues; + boolean mHide; + boolean mOnlyAllApps; + + public HideFromAccessibilityHelper() { + mPreviousValues = new HashMap<View, Integer>(); + mHide = false; + } + + public void setImportantForAccessibilityToNo(View v, boolean onlyAllApps) { + mOnlyAllApps = onlyAllApps; + setImportantForAccessibilityToNoHelper(v); + mHide = true; + } + + private void setImportantForAccessibilityToNoHelper(View v) { + mPreviousValues.put(v, v.getImportantForAccessibility()); + v.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO); + + // Call method on children recursively + if (v instanceof ViewGroup) { + ViewGroup vg = (ViewGroup) v; + vg.setOnHierarchyChangeListener(this); + for (int i = 0; i < vg.getChildCount(); i++) { + View child = vg.getChildAt(i); + + if (includeView(child)) { + setImportantForAccessibilityToNoHelper(child); + } + } + } + } + + public void restoreImportantForAccessibility(View v) { + if (mHide) { + restoreImportantForAccessibilityHelper(v); + } + mHide = false; + } + + private void restoreImportantForAccessibilityHelper(View v) { + v.setImportantForAccessibility(mPreviousValues.get(v)); + mPreviousValues.remove(v); + + // Call method on children recursively + if (v instanceof ViewGroup) { + ViewGroup vg = (ViewGroup) v; + + // We assume if a class implements OnHierarchyChangeListener, it listens + // to changes to any of its children (happens to be the case in Launcher) + if (vg instanceof OnHierarchyChangeListener) { + vg.setOnHierarchyChangeListener((OnHierarchyChangeListener) vg); + } else { + vg.setOnHierarchyChangeListener(null); + } + for (int i = 0; i < vg.getChildCount(); i++) { + View child = vg.getChildAt(i); + if (includeView(child)) { + restoreImportantForAccessibilityHelper(child); + } + } + } + } + + public void onChildViewAdded(View parent, View child) { + if (mHide && includeView(child)) { + setImportantForAccessibilityToNoHelper(child); + } + } + + public void onChildViewRemoved(View parent, View child) { + if (mHide && includeView(child)) { + restoreImportantForAccessibilityHelper(child); + } + } + + private boolean includeView(View v) { + return !hasAncestorOfType(v, Cling.class) && + (!mOnlyAllApps || hasAncestorOfType(v, AppsCustomizeTabHost.class)); + } + + private boolean hasAncestorOfType(View v, Class c) { + return v != null && + (v.getClass().equals(c) || + (v.getParent() instanceof ViewGroup && + hasAncestorOfType((ViewGroup) v.getParent(), c))); + } +}
\ No newline at end of file diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index e31df56b3..a48740da3 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -300,6 +300,9 @@ public final class Launcher extends Activity private BubbleTextView mWaitingForResume; + private HideFromAccessibilityHelper mHideFromAccessibilityHelper + = new HideFromAccessibilityHelper(); + private Runnable mBuildLayersRunnable = new Runnable() { public void run() { if (mWorkspace != null) { @@ -3661,8 +3664,9 @@ public final class Launcher extends Activity return true; } + private Cling initCling(int clingId, int[] positionData, boolean animate, int delay) { - Cling cling = (Cling) findViewById(clingId); + final Cling cling = (Cling) findViewById(clingId); if (cling != null) { cling.init(this, positionData); cling.setVisibility(View.VISIBLE); @@ -3679,11 +3683,21 @@ public final class Launcher extends Activity } else { cling.setAlpha(1f); } + cling.setFocusableInTouchMode(true); + cling.post(new Runnable() { + public void run() { + cling.setFocusable(true); + cling.requestFocus(); + } + }); + mHideFromAccessibilityHelper.setImportantForAccessibilityToNo( + mDragLayer, clingId == R.id.all_apps_cling); } return cling; } + private void dismissCling(final Cling cling, final String flag, int duration) { - if (cling != null) { + if (cling != null && cling.getVisibility() == View.VISIBLE) { ObjectAnimator anim = LauncherAnimUtils.ofFloat(cling, "alpha", 0f); anim.setDuration(duration); anim.addListener(new AnimatorListenerAdapter() { @@ -3701,8 +3715,10 @@ public final class Launcher extends Activity }; }); anim.start(); + mHideFromAccessibilityHelper.restoreImportantForAccessibility(mDragLayer); } } + private void removeCling(int id) { final View cling = findViewById(id); if (cling != null) { @@ -3713,6 +3729,7 @@ public final class Launcher extends Activity parent.removeView(cling); } }); + mHideFromAccessibilityHelper.restoreImportantForAccessibility(mDragLayer); } } |