Merge "Wrap bluetooth edit content in a scrollview." into nyc-mr1-dev
This commit is contained in:
@@ -14,48 +14,56 @@
|
|||||||
limitations under the License.
|
limitations under the License.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<LinearLayout
|
<ScrollView
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:paddingStart="25dp"
|
android:paddingStart="25dp"
|
||||||
android:orientation="vertical">
|
android:paddingEnd="25dp">
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/bluetooth_preference_paired_dialog_name_label"
|
|
||||||
android:textAppearance="@android:style/TextAppearance.Material.Body1"
|
|
||||||
android:textColor="?android:attr/textColorSecondary"
|
|
||||||
android:textDirection="locale"
|
|
||||||
android:paddingTop="16dp"
|
|
||||||
style="@style/bt_item_label" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/name"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:inputType="textNoSuggestions"
|
|
||||||
android:maxLength="@integer/bluetooth_name_length"
|
|
||||||
android:singleLine="true"
|
|
||||||
android:paddingBottom="@dimen/bluetooth_dialog_padding"
|
|
||||||
android:textDirection="locale"
|
|
||||||
style="@style/bt_item_edit_content" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/profiles_label"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:paddingTop="16dp"
|
|
||||||
android:paddingBottom="4dp"
|
|
||||||
android:text="@string/bluetooth_device_advanced_profile_header_title"
|
|
||||||
android:textAppearance="@android:style/TextAppearance.Material.Body1"
|
|
||||||
android:textColor="?android:attr/textColorSecondary" />
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/profiles_section"
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
</LinearLayout>
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/bluetooth_preference_paired_dialog_name_label"
|
||||||
|
android:textAppearance="@android:style/TextAppearance.Material.Body1"
|
||||||
|
android:textColor="?android:attr/textColorSecondary"
|
||||||
|
android:textDirection="locale"
|
||||||
|
android:paddingTop="16dp"
|
||||||
|
style="@style/bt_item_label"/>
|
||||||
|
|
||||||
|
<EditText
|
||||||
|
android:id="@+id/name"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:inputType="textNoSuggestions"
|
||||||
|
android:maxLength="@integer/bluetooth_name_length"
|
||||||
|
android:singleLine="true"
|
||||||
|
android:paddingBottom="@dimen/bluetooth_dialog_padding"
|
||||||
|
android:textDirection="locale"
|
||||||
|
style="@style/bt_item_edit_content"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/profiles_label"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:paddingTop="16dp"
|
||||||
|
android:paddingBottom="4dp"
|
||||||
|
android:text="@string/bluetooth_device_advanced_profile_header_title"
|
||||||
|
android:textAppearance="@android:style/TextAppearance.Material.Body1"
|
||||||
|
android:textColor="?android:attr/textColorSecondary"/>
|
||||||
|
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/profiles_section"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</ScrollView>
|
||||||
|
Reference in New Issue
Block a user