diff options
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/blocked_number_footer.xml | 23 | ||||
-rw-r--r-- | res/layout/blocked_number_header.xml | 149 | ||||
-rw-r--r-- | res/layout/blocked_number_item.xml | 21 |
3 files changed, 100 insertions, 93 deletions
diff --git a/res/layout/blocked_number_footer.xml b/res/layout/blocked_number_footer.xml index cdb3ead1b..17425c840 100644 --- a/res/layout/blocked_number_footer.xml +++ b/res/layout/blocked_number_footer.xml @@ -14,27 +14,24 @@ limitations under the License. --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:card_view="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:focusable="false"> <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:layout_marginBottom="8dp" - android:padding="16dp" - android:background="@android:color/white" - android:focusable="true"> - - <TextView android:id="@+id/blocked_number_footer_textview" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textColor="@color/blocked_number_secondary_text_color" - android:textSize="@dimen/blocked_number_primary_text_size" - android:text="@string/block_number_footer_message_vvm" /> + android:orientation="vertical" + android:padding="@dimen/blocked_number_container_padding" + android:background="@android:color/white" + android:focusable="true"> + <TextView android:id="@+id/blocked_number_footer_textview" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="@color/blocked_number_secondary_text_color" + android:textSize="@dimen/blocked_number_settings_description_text_size" + android:text="@string/block_number_footer_message_vvm"/> </LinearLayout> </LinearLayout> diff --git a/res/layout/blocked_number_header.xml b/res/layout/blocked_number_header.xml index 685c4efd8..0af942943 100644 --- a/res/layout/blocked_number_header.xml +++ b/res/layout/blocked_number_header.xml @@ -17,31 +17,34 @@ xmlns:card_view="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:focusable="false"> + android:focusable="false" + android:orientation="vertical"> - <LinearLayout android:id="@+id/blocked_numbers_disabled_for_emergency" + <LinearLayout + android:id="@+id/blocked_numbers_disabled_for_emergency" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:layout_marginBottom="8dp" - android:padding="16dp" + android:paddingTop="27dp" + android:paddingBottom="29dp" + android:paddingStart="@dimen/blocked_number_container_padding" + android:paddingEnd="44dp" + android:background="@color/blocked_number_disabled_emergency_background_color" android:focusable="true" + android:orientation="vertical" android:visibility="gone"> <TextView + style="@style/BlockedNumbersDescriptionTextStyle" + android:textStyle="bold" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/blocked_numbers_disabled_emergency_header_label" - android:textStyle="bold" - android:textColor="@color/blocked_number_disabled_emergency_header_color" - style="@style/BlockedNumbersDescriptionTextStyle" /> + android:text="@string/blocked_numbers_disabled_emergency_header_label"/> <TextView + style="@style/BlockedNumbersDescriptionTextStyle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/blocked_numbers_disabled_emergency_desc" - style="@style/BlockedNumbersDescriptionTextStyle" /> + android:text="@string/blocked_numbers_disabled_emergency_desc"/> </LinearLayout> @@ -53,94 +56,104 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" android:background="@android:color/white" - android:focusable="true"> + android:focusable="true" + android:orientation="vertical"> - <TextView android:id="@+id/textView" + <TextView + android:id="@+id/textView" + style="@android:style/TextAppearance.Material.Subhead" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="48dp" + android:paddingStart="@dimen/blocked_number_container_padding" + android:gravity="center_vertical" android:text="@string/block_list" - android:textColor="@color/blocked_number_header_color" - android:padding="@dimen/blocked_number_container_padding" - style="@android:style/TextAppearance.Material.Subhead" /> + android:textColor="@color/blocked_number_header_color"/> - <RelativeLayout android:id="@+id/import_settings" + <RelativeLayout + android:id="@+id/import_settings" android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="gone"> - <TextView android:id="@+id/import_description" + <TextView + android:id="@+id/import_description" + style="@style/BlockedNumbersDescriptionTextStyle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/blocked_call_settings_import_description" - android:textSize="@dimen/blocked_number_settings_description_text_size" + android:paddingTop="11dp" + android:paddingBottom="27dp" android:paddingStart="@dimen/blocked_number_container_padding" android:paddingEnd="@dimen/blocked_number_container_padding" - style="@style/BlockedNumbersDescriptionTextStyle" /> + android:text="@string/blocked_call_settings_import_description" + android:textColor="@color/secondary_text_color" + android:textSize="@dimen/blocked_number_settings_description_text_size"/> - <Button android:id="@+id/import_button" + <Button + android:id="@+id/import_button" + style="@style/DialerFlatButtonStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_below="@id/import_description" - android:layout_alignParentEnd="true" android:layout_marginEnd="@dimen/blocked_number_container_padding" - android:text="@string/blocked_call_settings_import_button" - style="@style/DialerFlatButtonStyle" /> + android:layout_alignParentEnd="true" + android:layout_below="@id/import_description" + android:text="@string/blocked_call_settings_import_button"/> - <Button android:id="@+id/view_numbers_button" + <Button + android:id="@+id/view_numbers_button" + style="@style/DialerFlatButtonStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginEnd="8dp" android:layout_below="@id/import_description" - android:layout_toLeftOf="@id/import_button" - android:text="@string/blocked_call_settings_view_numbers_button" - style="@style/DialerFlatButtonStyle" /> + android:layout_toStartOf="@id/import_button" + android:text="@string/blocked_call_settings_view_numbers_button"/> <View android:layout_width="match_parent" android:layout_height="1dp" + android:layout_marginTop="8dp" android:layout_below="@id/import_button" - android:background="@color/divider_line_color" - android:layout_marginTop="8dp" /> + android:background="@color/divider_line_color"/> </RelativeLayout> <LinearLayout - android:id="@+id/add_number_linear_layout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingStart="@dimen/blocked_number_horizontal_margin" - android:paddingTop="@dimen/blocked_number_top_margin" - android:paddingBottom="@dimen/blocked_number_bottom_margin" - android:baselineAligned="false" - android:gravity="center_vertical" - android:orientation="horizontal" - android:focusable="true" - android:clickable="true" - android:background="?android:attr/selectableItemBackground" - android:contentDescription="@string/addBlockedNumber"> + android:id="@+id/add_number_linear_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="@dimen/blocked_number_add_top_margin" + android:paddingBottom="@dimen/blocked_number_add_bottom_margin" + android:paddingStart="@dimen/blocked_number_horizontal_margin" + android:background="?android:attr/selectableItemBackground" + android:baselineAligned="false" + android:clickable="true" + android:contentDescription="@string/addBlockedNumber" + android:focusable="true" + android:gravity="center_vertical" + android:orientation="horizontal"> <ImageView - android:id="@+id/add_number_icon" - android:layout_width="@dimen/contact_photo_size" - android:layout_height="@dimen/contact_photo_size" - android:importantForAccessibility="no" /> + android:id="@+id/add_number_icon" + android:layout_width="@dimen/contact_photo_size" + android:layout_height="@dimen/contact_photo_size" + android:importantForAccessibility="no"/> <LinearLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:orientation="vertical" - android:gravity="center_vertical" - android:layout_marginStart="@dimen/blocked_number_horizontal_margin"> - - <TextView android:id="@+id/add_number_textview" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textColor="@color/blocked_number_primary_text_color" - android:textSize="@dimen/blocked_number_primary_text_size" - android:includeFontPadding="false" - android:layout_marginBottom="5dp" - android:text="@string/addBlockedNumber" /> + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_marginStart="@dimen/blocked_number_horizontal_margin" + android:gravity="center_vertical" + android:orientation="vertical"> + + <TextView + android:id="@+id/add_number_textview" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:includeFontPadding="false" + android:text="@string/addBlockedNumber" + android:textColor="@color/blocked_number_primary_text_color" + android:textSize="@dimen/blocked_number_primary_text_size"/> </LinearLayout> </LinearLayout> @@ -150,7 +163,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginStart="72dp" - android:background="@color/divider_line_color" /> + android:background="@color/divider_line_color"/> </LinearLayout> diff --git a/res/layout/blocked_number_item.xml b/res/layout/blocked_number_item.xml index 82e2207b7..a4997f257 100644 --- a/res/layout/blocked_number_item.xml +++ b/res/layout/blocked_number_item.xml @@ -19,26 +19,25 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingStart="@dimen/blocked_number_horizontal_margin" - android:paddingTop="@dimen/blocked_number_top_margin" - android:paddingBottom="@dimen/blocked_number_bottom_margin" android:baselineAligned="false" - android:gravity="center_vertical" android:orientation="horizontal" android:focusable="true" + android:gravity="center_vertical" android:background="@android:color/white"> <QuickContactBadge android:id="@+id/quick_contact_photo" android:layout_width="@dimen/contact_photo_size" android:layout_height="@dimen/contact_photo_size" - android:focusable="true" /> - + android:focusable="true" + android:layout_marginTop="@dimen/blocked_number_top_margin" + android:layout_marginBottom="@dimen/blocked_number_bottom_margin"/> <LinearLayout android:layout_width="0dp" - android:layout_height="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" android:layout_weight="1" android:orientation="vertical" - android:gravity="center_vertical" android:layout_marginStart="@dimen/blocked_number_horizontal_margin"> <TextView @@ -48,16 +47,14 @@ android:textColor="@color/blocked_number_primary_text_color" android:textSize="@dimen/blocked_number_primary_text_size" android:includeFontPadding="false" - android:layout_marginBottom="5dp" - android:singleLine="true" /> + android:singleLine="true"/> <TextView android:id="@+id/caller_number" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/blocked_number_secondary_text_color" - android:textSize="@dimen/blocked_number_secondary_text_size" - android:layout_marginBottom="1dp" + android:textSize="@dimen/blocked_number_settings_description_text_size" android:singleLine="true" /> </LinearLayout> @@ -65,7 +62,7 @@ android:id="@+id/delete_button" android:layout_width="@dimen/blocked_number_delete_icon_size" android:layout_height="@dimen/blocked_number_delete_icon_size" - android:layout_marginEnd="16dp" + android:layout_marginEnd="24dp" android:background="?android:attr/selectableItemBackgroundBorderless" android:src="@drawable/ic_remove" android:scaleType="center" |