Skip to content

Commit c4842c1

Browse files
committed
Accessibility support for the lockscreen - phone.
Change-Id: Idc99f1322a1d635dd07e1f5efa1665a4676267c2
1 parent c8dc8eb commit c4842c1

30 files changed

+138
-68
lines changed

core/java/android/appwidget/AppWidgetHostView.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ public void setAppWidget(int appWidgetId, AppWidgetProviderInfo info) {
144144
// We add padding to the AppWidgetHostView if necessary
145145
Rect padding = getDefaultPaddingForWidget(mContext, info.provider, null);
146146
setPadding(padding.left, padding.top, padding.right, padding.bottom);
147+
setContentDescription(info.label);
147148
}
148149
}
149150

core/java/com/android/internal/widget/LockPatternView.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919

2020
import android.content.Context;
21-
import android.content.res.Resources;
2221
import android.content.res.TypedArray;
2322
import android.graphics.Bitmap;
2423
import android.graphics.BitmapFactory;
@@ -33,11 +32,9 @@
3332
import android.os.Parcelable;
3433
import android.os.SystemClock;
3534
import android.util.AttributeSet;
36-
import android.util.Log;
3735
import android.view.HapticFeedbackConstants;
3836
import android.view.MotionEvent;
3937
import android.view.View;
40-
import android.view.accessibility.AccessibilityEvent;
4138
import android.view.accessibility.AccessibilityManager;
4239

4340
import com.android.internal.R;
@@ -657,9 +654,11 @@ public boolean onTouchEvent(MotionEvent event) {
657654
handleActionMove(event);
658655
return true;
659656
case MotionEvent.ACTION_CANCEL:
660-
resetPattern();
661-
mPatternInProgress = false;
662-
notifyPatternCleared();
657+
if (mPatternInProgress) {
658+
mPatternInProgress = false;
659+
resetPattern();
660+
notifyPatternCleared();
661+
}
663662
if (PROFILE_DRAWING) {
664663
if (mDrawingProfilingStarted) {
665664
Debug.stopMethodTracing();
@@ -826,7 +825,7 @@ private void handleActionDown(MotionEvent event) {
826825
mPatternInProgress = true;
827826
mPatternDisplayMode = DisplayMode.Correct;
828827
notifyPatternStarted();
829-
} else {
828+
} else if (mPatternInProgress) {
830829
mPatternInProgress = false;
831830
notifyPatternCleared();
832831
}
2.32 KB
Loading
2.63 KB
Loading
1.72 KB
Loading
1.53 KB
Loading
1.85 KB
Loading
1.32 KB
Loading
3.2 KB
Loading
3.43 KB
Loading

0 commit comments

Comments
 (0)