Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d847b03 authored by Phil Weaver's avatar Phil Weaver
Browse files

Use accessibility pane API in keyguard 

Using the new accessibility pane title API
to identify the pattern, pin, and password unlock
screens.

Bug: 73131182
Test: Verified that accessibility events are properly
sent when unlocking the phone with each of the lock
methods.
Change-Id: I32594f4736b503e7f9e3be96e9f77a84ffcadc54
parent 92ab9f1c

core/java/android/view/View.java

+1 −1
Original line number Diff line number Diff line
@@ -7309,7 +7309,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
    }















    private boolean isAccessibilityPane() {













        return !TextUtils.isEmpty(mAccessibilityPaneTitle);













        return mAccessibilityPaneTitle != null;















    }





























    /**

























core/res/res/values/strings.xml



+4
−0




























Original line number
Diff line number
Diff line








@@ -2104,6 +2104,10 @@













    <string name="keyguard_accessibility_face_unlock">Face unlock.</string>















    <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->















    <string name="keyguard_accessibility_pin_unlock">Pin unlock.</string>













    <!-- Accessibility description of the sim pin lock. [CHAR_LIMIT=none] -->













    <string name="keyguard_accessibility_sim_pin_unlock">Sim Pin unlock.</string>













    <!-- Accessibility description of the sim puk lock. [CHAR_LIMIT=none] -->













    <string name="keyguard_accessibility_sim_puk_unlock">Sim Puk unlock.</string>















    <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->















    <string name="keyguard_accessibility_password_unlock">Password unlock.</string>















    <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->

































core/res/res/values/symbols.xml



+5
−0




























Original line number
Diff line number
Diff line








@@ -3226,6 +3226,11 @@













  <java-symbol type="string" name="unsupported_compile_sdk_check_update" />































  <java-symbol type="string" name="battery_saver_warning_title" />













  <java-symbol type="string" name="keyguard_accessibility_pattern_unlock" />













  <java-symbol type="string" name="keyguard_accessibility_pin_unlock" />













  <java-symbol type="string" name="keyguard_accessibility_sim_pin_unlock" />













  <java-symbol type="string" name="keyguard_accessibility_sim_puk_unlock" />













  <java-symbol type="string" name="keyguard_accessibility_password_unlock" />































  <java-symbol type="string" name="global_action_logout" />















  <java-symbol type="string" name="config_mainBuiltInDisplayCutout" />

































packages/SystemUI/src/com/android/keyguard/KeyguardHostView.java



+4
−10




























Original line number
Diff line number
Diff line








@@ -197,16 +197,6 @@ public class KeyguardHostView extends FrameLayout implements SecurityCallback {













        return false;















    }





























    @Override













    public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {













        if (event.getEventType() == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED) {













            event.getText().add(mSecurityContainer.getCurrentSecurityModeContentDescription());













            return true;













        } else {













            return super.dispatchPopulateAccessibilityEvent(event);













        }













    }





























    protected KeyguardSecurityContainer getSecurityContainer() {















        return mSecurityContainer;















    }










@@ -255,6 +245,10 @@ public class KeyguardHostView extends FrameLayout implements SecurityCallback {













        }















    }





























    public CharSequence getAccessibilityTitleForCurrentMode() {













        return mSecurityContainer.getTitle();













    }





























    public void userActivity() {















        if (mViewMediatorCallback != null) {















            mViewMediatorCallback.userActivity();

































packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java



+6
−0




























Original line number
Diff line number
Diff line








@@ -361,4 +361,10 @@ public class KeyguardPasswordView extends KeyguardAbsKeyInputView













        }















        return false;















    }



























    @Override













    public CharSequence getTitle() {













        return getContext().getString(













                com.android.internal.R.string.keyguard_accessibility_password_unlock);













    }















}