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

Commit 3b5555fc authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Make new ringer toggles on power menu accessible and navigable with keyboard." into ics-mr1

parents dc8cb9aa e48a160e

core/res/res/layout/global_actions_silent_mode.xml

+6 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
        android:layout_width="64dp"

        android:layout_height="match_parent"

        android:background="?android:attr/actionBarItemBackground"

        android:contentDescription="@string/silent_mode_silent"

        android:focusable="true"

        >

        <ImageView

            android:layout_width="48dp"
@@ -52,6 +54,8 @@ 
        android:layout_width="64dp"

        android:layout_height="match_parent"

        android:background="?android:attr/actionBarItemBackground"

        android:contentDescription="@string/silent_mode_vibrate"

        android:focusable="true"

        >

        <ImageView

            android:layout_width="48dp"
@@ -79,6 +83,8 @@ 
        android:layout_width="64dp"

        android:layout_height="match_parent"

        android:background="?android:attr/actionBarItemBackground"

        android:contentDescription="@string/silent_mode_ring"

        android:focusable="true"

        >

        <ImageView

            android:layout_width="48dp"

core/res/res/values/strings.xml

+7 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>

<!--

/* //device/apps/common/assets/res/any/strings.xml

**
@@ -286,6 +286,12 @@ 
    <string name="screen_lock">Screen lock</string>

    <!-- Button to turn off the phone, within the Phone Options dialog -->

    <string name="power_off">Power off</string>

    <!-- Spoken description for ringer silent option. [CHAR LIMIT=NONE] -->

    <string name="silent_mode_silent">Ringer off</string>

    <!-- Spoken description for ringer vibrate option. [CHAR LIMIT=NONE] -->

    <string name="silent_mode_vibrate">Ringer vibrate</string>

    <!-- Spoken description for ringer normal option. [CHAR LIMIT=NONE] -->

    <string name="silent_mode_ring">Ringer on</string>



    <!-- Shutdown Progress Dialog. This is shown if the user chooses to power off the phone. -->

    <string name="shutdown_progress">Shutting down\u2026</string>

policy/src/com/android/internal/policy/impl/GlobalActions.java

+1 −2
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac 
                .setInverseBackgroundForced(true);



        final AlertDialog dialog = ab.create();

        dialog.getListView().setItemsCanFocus(true);

        dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG);



        dialog.setOnDismissListener(this);
@@ -518,8 +519,6 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac 
        public View create(Context context, View convertView, ViewGroup parent,

                LayoutInflater inflater) {

            View v = inflater.inflate(R.layout.global_actions_silent_mode, parent, false);

            // Handle clicks outside the icons and ignore

            v.setOnClickListener(this);



            int selectedIndex = ringerModeToIndex(mAudioManager.getRingerMode());

            for (int i = 0; i < 3; i++) {