diff options
Diffstat (limited to 'java/com/android/contacts/common/res/layout')
-rw-r--r-- | java/com/android/contacts/common/res/layout/default_account_checkbox.xml | 42 | ||||
-rw-r--r-- | java/com/android/contacts/common/res/layout/select_account_list_item.xml | 70 |
2 files changed, 69 insertions, 43 deletions
diff --git a/java/com/android/contacts/common/res/layout/default_account_checkbox.xml b/java/com/android/contacts/common/res/layout/default_account_checkbox.xml index b7c0cf644..1e76b74f5 100644 --- a/java/com/android/contacts/common/res/layout/default_account_checkbox.xml +++ b/java/com/android/contacts/common/res/layout/default_account_checkbox.xml @@ -15,22 +15,36 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/default_account_checkbox_layout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="4dp" - android:orientation="vertical"> - <CheckBox - android:id="@+id/default_account_checkbox_view" + android:id="@+id/default_account_checkbox_layout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="20dip" - android:layout_marginLeft="13dip" - android:paddingStart="15dip" + android:padding="4dp" + android:paddingStart="0dp" + android:paddingEnd="24dp" android:gravity="center" - android:text="@string/set_default_account" - android:textAlignment="viewStart" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="@color/dialer_secondary_text_color" + android:minHeight="56dp" + android:orientation="horizontal" + android:focusable="true"> + <FrameLayout + android:layout_width="72dp" + android:layout_height="wrap_content"> + <CheckBox + android:id="@+id/default_account_checkbox_view" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:checked="false"/> /> + </FrameLayout> + <TextView + android:id="@+id/default_account_checkbox_text" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/set_default_account" + android:textAlignment="viewStart" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="@color/dialer_secondary_text_color" + /> + </LinearLayout> diff --git a/java/com/android/contacts/common/res/layout/select_account_list_item.xml b/java/com/android/contacts/common/res/layout/select_account_list_item.xml index fbd31e573..8f7cc7017 100644 --- a/java/com/android/contacts/common/res/layout/select_account_list_item.xml +++ b/java/com/android/contacts/common/res/layout/select_account_list_item.xml @@ -16,41 +16,53 @@ <!-- Layout of a single item in the InCallUI Account Chooser Dialog. --> <com.android.contacts.common.widget.ActivityTouchLinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="8dp" - android:orientation="horizontal"> + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="64dp" + android:padding="8dp" + android:paddingStart="24dp" + android:paddingEnd="24dp" + android:orientation="horizontal" + android:gravity="center"> <ImageView - android:id="@+id/icon" - android:layout_width="48dp" - android:layout_height="48dp" - android:scaleType="center"/> + android:id="@+id/icon" + android:layout_width="24dp" + android:layout_height="24dp" + android:scaleType="center"/> <LinearLayout - android:id="@+id/text" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_marginStart="8dp" - android:gravity="start|center_vertical" - android:orientation="vertical"> - <TextView - android:id="@+id/label" - android:layout_width="match_parent" + android:id="@+id/text" + android:layout_width="0dp" android:layout_height="wrap_content" - android:includeFontPadding="false" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="@color/dialer_primary_text_color"/> + android:layout_weight="1" + android:paddingStart="24dp" + android:gravity="start|center_vertical" + android:orientation="vertical"> <TextView - android:id="@+id/number" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:includeFontPadding="false" - android:maxLines="1" - android:textAppearance="?android:attr/textAppearanceSmall" - android:visibility="gone"/> + android:id="@+id/label" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:includeFontPadding="false" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="@color/dialer_primary_text_color"/> + <TextView + android:id="@+id/number" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:includeFontPadding="false" + android:maxLines="1" + android:textAppearance="?android:attr/textAppearanceSmall" + android:visibility="gone"/> + <TextView + android:id="@+id/hint" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:includeFontPadding="false" + android:maxLines="1" + android:textAppearance="?android:attr/textAppearanceSmall" + android:visibility="gone"/> </LinearLayout> </com.android.contacts.common.widget.ActivityTouchLinearLayout> |