drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Amith Yamasani
2011-12-07 16:54:31 -08:00
committed by Android (Google) Code Review
parent dc8cb9aa7e e48a160e57
commit 3b5555fc44
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/res/res/layout/global_actions_silent_mode.xml
View File

@ -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"

8
core/res/res/values/strings.xml
View File

@ -1,4 +1,4 @@
<?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>

3
policy/src/com/android/internal/policy/impl/GlobalActions.java
View File

@ -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++) {