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

Commit 5cf72e11 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Accessibility support for the widgets switcher of the lock screen." into jb-mr1-dev

parents 75c48009 6526fdd7

core/res/res/layout/keyguard_multi_user_selector.xml

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ 
    android:orientation="horizontal"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_gravity="center">

    android:layout_gravity="center"

    android:contentDescription="@string/keyguard_accessibility_user_selector">



    <com.android.internal.policy.impl.keyguard.KeyguardSubdivisionLayout

        android:id="@+id/keyguard_users_grid"

core/res/res/layout/keyguard_status_view.xml

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ 
        android:orientation="vertical"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:gravity="center_horizontal">

        android:gravity="center_horizontal"

        android:contentDescription="@string/keyguard_accessibility_status">



        <com.android.internal.policy.impl.keyguard.ClockView

            android:id="@+id/clock_view"

core/res/res/layout/keyguard_transport_control_view.xml

+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ 
    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:foreground="@drawable/ic_lockscreen_player_background">

        android:foreground="@drawable/ic_lockscreen_player_background"

        android:contentDescription="@string/keygaurd_accessibility_media_controls">

        <!-- Use ImageView for its cropping features; otherwise could be android:background -->

        <ImageView

            android:id="@+id/albumart"

core/res/res/values/strings.xml

+9 −0
Original line number Diff line number Diff line
@@ -2272,6 +2272,15 @@ 
    <!-- Accessibility description sent when user completes drawing a pattern. [CHAR LIMIT=NONE] -->

    <string name="lockscreen_access_pattern_detected">Pattern completed</string>



    <!-- Accessibility description sent when user changes the current lock screen widget. [CHAR_LIMIT=none] -->

    <string name="keyguard_accessibility_widget_changed">%1$s. Widget %2$d of %3$d.</string>

    <!-- Accessibility description of the lock screen user selector widget. [CHAR_LIMIT=none] -->

    <string name="keyguard_accessibility_user_selector">User selector</string>

    <!-- Accessibility description of the lock screen status widget. [CHAR_LIMIT=none] -->

    <string name="keyguard_accessibility_status">Status</string>

    <!-- Accessibility description of the lock media control widget. [CHAR_LIMIT=none] -->

    <string name="keygaurd_accessibility_media_controls">Media controls</string>



    <!-- Password keyboard strings. Used by LockScreen and Settings --><skip />

    <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->

    <string name="password_keyboard_label_symbol_key">\?123</string>

core/res/res/values/symbols.xml

+4 −0
Original line number Diff line number Diff line
@@ -549,6 +549,10 @@ 
  <java-symbol type="string" name="keyboardview_keycode_enter" />

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

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

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

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

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

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

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

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

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