diff options
| author | Andrew Lee <anwlee@google.com> | 2015-10-20 21:20:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-20 21:20:49 +0000 |
| commit | b2ae1410907a622c59175f821d07d3c936b2882c (patch) | |
| tree | 198a42611fdeb361d452d880a9c03e532d1e2d12 /res/layout | |
| parent | 87013734468f26070c2b07bf6d98ba4500abccd7 (diff) | |
| parent | b980fc4386cdc24a605fc682d0fef0c5dc54c327 (diff) | |
Merge "Add setting for hiding blocked calls." into ub-contactsdialer-a-dev
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/blocked_number_fragment.xml | 30 | ||||
| -rw-r--r-- | res/layout/blocked_number_header.xml | 6 |
2 files changed, 32 insertions, 4 deletions
diff --git a/res/layout/blocked_number_fragment.xml b/res/layout/blocked_number_fragment.xml index bb4b7f20f..906e8a10c 100644 --- a/res/layout/blocked_number_fragment.xml +++ b/res/layout/blocked_number_fragment.xml @@ -25,6 +25,36 @@ <android.support.v7.widget.CardView android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + card_view:cardCornerRadius="0dp"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:gravity="center_vertical" + android:padding="16dp" + android:paddingEnd="8dp"> + + <TextView + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/blocked_call_settings_hide_setting" + style="@style/BlockedNumbersDescriptionTextStyle" /> + + <Switch android:id="@+id/hide_blocked_calls_switch" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="40dp" /> + + </LinearLayout> + + </android.support.v7.widget.CardView> + + <android.support.v7.widget.CardView + android:layout_width="match_parent" + android:layout_height="wrap_content" card_view:cardCornerRadius="0dp"> <LinearLayout diff --git a/res/layout/blocked_number_header.xml b/res/layout/blocked_number_header.xml index 39f532281..e16efbcf4 100644 --- a/res/layout/blocked_number_header.xml +++ b/res/layout/blocked_number_header.xml @@ -33,11 +33,9 @@ android:layout_height="wrap_content" android:text="@string/blocked_call_settings_import_description" android:textSize="@dimen/blocked_number_settings_description_text_size" - android:lineSpacingMultiplier="1.2" - android:paddingTop="8dp" - android:paddingBottom="8dp" android:paddingStart="@dimen/blocked_number_container_padding" - android:paddingEnd="@dimen/blocked_number_container_padding" /> + android:paddingEnd="@dimen/blocked_number_container_padding" + style="@style/BlockedNumbersDescriptionTextStyle" /> <Button android:id="@+id/import_button" android:layout_width="wrap_content" |