diff options
| author | Andrew Lee <anwlee@google.com> | 2015-10-30 19:11:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-30 19:11:35 +0000 |
| commit | 7323d631ba028ead01371d7d00abaeba3e3ef56e (patch) | |
| tree | a0f0911102479900fa7ce1edca122064ec243e83 /res | |
| parent | 05f9a260038e8bf47563afd8aabf545f3acb9665 (diff) | |
| parent | efc4d0f7d35fa9aa6395c3290ae04ef73671a428 (diff) | |
Merge "Always hide blocked calls." into ub-contactsdialer-a-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/blocked_number_header.xml | 35 | ||||
| -rw-r--r-- | res/values/strings.xml | 6 |
2 files changed, 0 insertions, 41 deletions
diff --git a/res/layout/blocked_number_header.xml b/res/layout/blocked_number_header.xml index 57f5df0e2..50a3dc8f2 100644 --- a/res/layout/blocked_number_header.xml +++ b/res/layout/blocked_number_header.xml @@ -45,41 +45,6 @@ </LinearLayout> - - <android.support.v7.widget.CardView - android:id="@+id/hide_blocked_calls_setting" - 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" - android:background="@android:color/white" - android:focusable="true"> - - <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" - android:focusable="false" /> - - </LinearLayout> - - </android.support.v7.widget.CardView> - <android.support.v7.widget.CardView android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/res/values/strings.xml b/res/values/strings.xml index f1e7b2f35..4d4fb1e84 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -855,12 +855,6 @@ You previously marked some callers to be automatically sent to voicemail via other apps. </string> - <!-- Text for a setting to hide blocked calls and automatically delete new voicemail from block - numbers. [CHAR LIMIT=NONE] --> - <string name="blocked_call_settings_hide_setting"> - Hide calls and automatically delete new voicemails from blocked numbers. - </string> - <!-- Label for button to view numbers of contacts previous marked to be sent to voicemail. [CHAR_LIMIT=20] --> <string name="blocked_call_settings_view_numbers_button">View Numbers</string> |