Merge "Update "Change keyboard" settings UI."

This commit is contained in:
Abodunrinwa Toki
2016-01-20 21:13:37 +00:00
committed by Android (Google) Code Review
2 changed files with 11 additions and 11 deletions

View File

@@ -70,24 +70,24 @@
android:orientation="vertical"
android:paddingBottom="5dp"
android:paddingStart="?attr/listPreferredItemPaddingStart"
android:paddingEnd="0dp"
android:paddingTop="5dp" >
android:paddingEnd="16dp"
android:paddingTop="16dp" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/hardware"
android:textAppearance="?attr/textAppearanceMedium"
android:textColor="?attr/textColorAlertDialogListItem" />
android:textAppearance="?attr/textAppearanceListItem"
android:ellipsize="marquee" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:maxLines="10"
android:text="@string/show_ime"
android:textAppearance="?attr/textAppearanceSmall"
android:textColor="?attr/textColorAlertDialogListItem" />
android:textAppearance="?attr/textAppearanceListItemSecondary"
android:textColor="?attr/textColorSecondary" />
</LinearLayout>
<Switch

View File

@@ -2919,10 +2919,10 @@
<!-- Title of a button to open the settings to enable or disable keyboards, also known as input methods [CHAR LIMIT=30] -->
<string name="configure_input_methods">Choose keyboards</string>
<!-- Summary text of a toggle switch to enable/disable use of the IME while a physical
keyboard is connected[CHAR LIMIT=25] -->
<string name="show_ime">Show input method</string>
<!-- Title of the physical keyboard category in the input method selector [CHAR LIMIT=10] -->
<string name="hardware">Hardware</string>
keyboard is connected -->
<string name="show_ime">Keep it on screen while physical keyboard is active</string>
<!-- Title of the physical keyboard category in the input method selector [CHAR LIMIT=30] -->
<string name="hardware">Show virtual keyboard</string>
<!-- Title of the notification to prompt the user to select a keyboard layout. -->
<string name="select_keyboard_layout_notification_title">Select keyboard layout</string>