PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 40d172c1: am 303f621e: Merge "Send correctly populated Accessibility event on Launcher state change." into jb-mr1-dev

Browse Source 
* commit '40d172c1b5ba885797a7f9ea7aa4488e8721ea83':
  Send correctly populated Accessibility event on Launcher state change.
This commit is contained in:
Svetoslav Ganov
2012-10-19 14:27:51 -07:00
committed by Android Git Automerger
parent a3505bfe99 40d172c1b5
commit bb608246b4
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/Launcher.java
+12 -5
View File
@@ -2784,8 +2784,9 @@ public final class Launcher extends Activity
mUserPresent = true; mUserPresent = true;
updateRunning(); updateRunning();
// send an accessibility event to announce the context change // Send an accessibility event to announce the context change
getWindow().getDecorView().sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED); getWindow().getDecorView()
.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
} }
void showAllApps(boolean animated) { void showAllApps(boolean animated) {
@@ -2803,7 +2804,8 @@ public final class Launcher extends Activity
closeFolder(); closeFolder();
// Send an accessibility event to announce the context change // Send an accessibility event to announce the context change
getWindow().getDecorView().sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED); getWindow().getDecorView()
.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
} }
void enterSpringLoadedDragMode() { void enterSpringLoadedDragMode() {
@@ -3177,10 +3179,15 @@ public final class Launcher extends Activity
@Override @Override
public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) { public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
boolean result = super.dispatchPopulateAccessibilityEvent(event); final boolean result = super.dispatchPopulateAccessibilityEvent(event);
final List<CharSequence> text = event.getText(); final List<CharSequence> text = event.getText();
text.clear(); text.clear();
text.add(getString(R.string.home)); // Populate event with a fake title based on the current state.
if (mState == State.APPS_CUSTOMIZE) {
text.add(getString(R.string.all_apps_button_label));
} else {
text.add(getString(R.string.all_apps_home_button_label));
}
return result; return result;
} }