diff options
author | Wenyi Wang <wenyiw@google.com> | 2016-02-10 16:20:40 -0800 |
---|---|---|
committer | Wenyi Wang <wenyiw@google.com> | 2016-02-11 21:24:26 +0000 |
commit | 5fe9557ae4fdd7a1b70f27f7b1b6b4c096984d6a (patch) | |
tree | 26fa3a900c9f54afe7d3fbca97fa254c51bda74e /res | |
parent | 9ff6a7caf65540c00e456e4d4a7354f8939ffd0c (diff) | |
download | android_packages_apps_Contacts-5fe9557ae4fdd7a1b70f27f7b1b6b4c096984d6a.tar.gz android_packages_apps_Contacts-5fe9557ae4fdd7a1b70f27f7b1b6b4c096984d6a.tar.bz2 android_packages_apps_Contacts-5fe9557ae4fdd7a1b70f27f7b1b6b4c096984d6a.zip |
Remove "Blocked Numbers Activity" from Contacts
This is almost a revert of ag/847363.
We also hide menu for now in PeopleActivity.
Bug 27118866
Change-Id: Ie242e2d1fcf00e7226a1f8e16c92c5d7620630e4
(cherry picked from commit 4bc3bd2aea6f053f5e9159a1ca5cd79e1d8887d8)
Diffstat (limited to 'res')
31 files changed, 0 insertions, 660 deletions
diff --git a/res/drawable-hdpi/empty_contacts.png b/res/drawable-hdpi/empty_contacts.png Binary files differdeleted file mode 100644 index d3c0378f5..000000000 --- a/res/drawable-hdpi/empty_contacts.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_not_interested_googblue_24dp.png b/res/drawable-hdpi/ic_not_interested_googblue_24dp.png Binary files differdeleted file mode 100644 index 26a26f911..000000000 --- a/res/drawable-hdpi/ic_not_interested_googblue_24dp.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_remove.png b/res/drawable-hdpi/ic_remove.png Binary files differdeleted file mode 100644 index 1ee6adf8d..000000000 --- a/res/drawable-hdpi/ic_remove.png +++ /dev/null diff --git a/res/drawable-hdpi/search_shadow.9.png b/res/drawable-hdpi/search_shadow.9.png Binary files differdeleted file mode 100644 index 92b4f5b33..000000000 --- a/res/drawable-hdpi/search_shadow.9.png +++ /dev/null diff --git a/res/drawable-mdpi/empty_contacts.png b/res/drawable-mdpi/empty_contacts.png Binary files differdeleted file mode 100644 index 2ce7eae37..000000000 --- a/res/drawable-mdpi/empty_contacts.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_not_interested_googblue_24dp.png b/res/drawable-mdpi/ic_not_interested_googblue_24dp.png Binary files differdeleted file mode 100644 index d7d5c588f..000000000 --- a/res/drawable-mdpi/ic_not_interested_googblue_24dp.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_remove.png b/res/drawable-mdpi/ic_remove.png Binary files differdeleted file mode 100644 index 2c134ea10..000000000 --- a/res/drawable-mdpi/ic_remove.png +++ /dev/null diff --git a/res/drawable-mdpi/search_shadow.9.png b/res/drawable-mdpi/search_shadow.9.png Binary files differdeleted file mode 100644 index 0c33905cd..000000000 --- a/res/drawable-mdpi/search_shadow.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/empty_contacts.png b/res/drawable-xhdpi/empty_contacts.png Binary files differdeleted file mode 100644 index 65b1de333..000000000 --- a/res/drawable-xhdpi/empty_contacts.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_not_interested_googblue_24dp.png b/res/drawable-xhdpi/ic_not_interested_googblue_24dp.png Binary files differdeleted file mode 100644 index 3e6ec071b..000000000 --- a/res/drawable-xhdpi/ic_not_interested_googblue_24dp.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_remove.png b/res/drawable-xhdpi/ic_remove.png Binary files differdeleted file mode 100644 index be81592ef..000000000 --- a/res/drawable-xhdpi/ic_remove.png +++ /dev/null diff --git a/res/drawable-xhdpi/search_shadow.9.png b/res/drawable-xhdpi/search_shadow.9.png Binary files differdeleted file mode 100644 index 5667ab368..000000000 --- a/res/drawable-xhdpi/search_shadow.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/empty_contacts.png b/res/drawable-xxhdpi/empty_contacts.png Binary files differdeleted file mode 100644 index 407d78c9c..000000000 --- a/res/drawable-xxhdpi/empty_contacts.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_not_interested_googblue_24dp.png b/res/drawable-xxhdpi/ic_not_interested_googblue_24dp.png Binary files differdeleted file mode 100644 index 7c256b5d7..000000000 --- a/res/drawable-xxhdpi/ic_not_interested_googblue_24dp.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_remove.png b/res/drawable-xxhdpi/ic_remove.png Binary files differdeleted file mode 100644 index 2722f23aa..000000000 --- a/res/drawable-xxhdpi/ic_remove.png +++ /dev/null diff --git a/res/drawable-xxhdpi/search_shadow.9.png b/res/drawable-xxhdpi/search_shadow.9.png Binary files differdeleted file mode 100644 index ff55620d0..000000000 --- a/res/drawable-xxhdpi/search_shadow.9.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/empty_contacts.png b/res/drawable-xxxhdpi/empty_contacts.png Binary files differdeleted file mode 100644 index 5893965e9..000000000 --- a/res/drawable-xxxhdpi/empty_contacts.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/ic_not_interested_googblue_24dp.png b/res/drawable-xxxhdpi/ic_not_interested_googblue_24dp.png Binary files differdeleted file mode 100644 index 6591ed485..000000000 --- a/res/drawable-xxxhdpi/ic_not_interested_googblue_24dp.png +++ /dev/null diff --git a/res/drawable/rounded_corner.xml b/res/drawable/rounded_corner.xml deleted file mode 100644 index 276fb304b..000000000 --- a/res/drawable/rounded_corner.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!-- - ~ Copyright (C) 2016 The Android Open Source Project - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License - --> -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle" > - <solid android:color="@color/blocked_number_background" /> - <corners android:radius="2dp" /> -</shape>
\ No newline at end of file diff --git a/res/layout/blocked_number_fragment.xml b/res/layout/blocked_number_fragment.xml deleted file mode 100644 index e2b940376..000000000 --- a/res/layout/blocked_number_fragment.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2016 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/blocked_number_fragment" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:background="@color/blocked_number_background"> - - <ListView android:id="@id/android:list" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:divider="@null" - android:headerDividersEnabled="false" /> - -</LinearLayout>
\ No newline at end of file diff --git a/res/layout/blocked_number_header.xml b/res/layout/blocked_number_header.xml deleted file mode 100644 index 13ee7ba7e..000000000 --- a/res/layout/blocked_number_header.xml +++ /dev/null @@ -1,179 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2015 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - 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:focusable="false" - android:orientation="vertical"> - - <LinearLayout - android:id="@+id/blocked_numbers_disabled_for_emergency" - android:layout_width="match_parent" - android:layout_height="wrap_content" - 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"/> - - <TextView - style="@style/BlockedNumbersDescriptionTextStyle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/blocked_numbers_disabled_emergency_desc"/> - - </LinearLayout> - - <android.support.v7.widget.CardView - android:layout_width="match_parent" - android:layout_height="wrap_content" - card_view:cardCornerRadius="0dp"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@android:color/white" - android:focusable="true" - android:orientation="vertical"> - - <LinearLayout - android:id="@+id/header_textview" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:padding="@dimen/blocked_number_container_padding" - android:background="@android:color/white" - android:focusable="true"> - - <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/blocked_number_header_message"/> - </LinearLayout> - - <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" - style="@style/BlockedNumbersDescriptionTextStyle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="11dp" - android:paddingBottom="27dp" - android:paddingStart="@dimen/blocked_number_container_padding" - android:paddingEnd="@dimen/blocked_number_container_padding" - android:text="@string/blocked_call_settings_import_description" - android:textColor="@color/blocked_number_secondary_text_color" - android:textSize="@dimen/blocked_number_settings_description_text_size"/> - - <Button - android:id="@+id/import_button" - style="@style/ContactsFlatButtonStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginEnd="@dimen/blocked_number_container_padding" - 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" - style="@style/ContactsFlatButtonStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginEnd="8dp" - android:layout_below="@id/import_description" - 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/blocked_number_divider_line_color"/> - - </RelativeLayout> - - <LinearLayout - 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/blocked_number_add_number_icon_size" - android:layout_height="@dimen/blocked_number_add_number_icon_size" - android:importantForAccessibility="no"/> - <LinearLayout - 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> - - <View - android:id="@+id/blocked_number_list_divider" - android:layout_width="match_parent" - android:layout_height="1dp" - android:layout_marginStart="72dp" - android:background="@color/blocked_number_divider_line_color"/> - - </LinearLayout> - - </android.support.v7.widget.CardView> - -</LinearLayout> diff --git a/res/layout/blocked_number_item.xml b/res/layout/blocked_number_item.xml deleted file mode 100644 index 0d8b26fd0..000000000 --- a/res/layout/blocked_number_item.xml +++ /dev/null @@ -1,72 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2016 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/caller_information" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingStart="@dimen/blocked_number_horizontal_margin" - android:baselineAligned="false" - 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/blocked_number_add_number_icon_size" - android:layout_height="@dimen/blocked_number_add_number_icon_size" - 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="match_parent" - android:gravity="center_vertical" - android:layout_weight="1" - android:orientation="vertical" - android:layout_marginStart="@dimen/blocked_number_horizontal_margin"> - - <TextView - android:id="@+id/caller_name" - android:layout_width="wrap_content" - 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: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_settings_description_text_size" - android:singleLine="true" /> - </LinearLayout> - - <ImageView - 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="24dp" - android:background="?android:attr/selectableItemBackgroundBorderless" - android:src="@drawable/ic_remove" - android:scaleType="center" - android:tint="@color/blocked_number_icon_tint" - android:contentDescription="@string/description_blocked_number_list_delete" /> - -</LinearLayout>
\ No newline at end of file diff --git a/res/layout/blocked_numbers_activity.xml b/res/layout/blocked_numbers_activity.xml deleted file mode 100644 index 645149635..000000000 --- a/res/layout/blocked_numbers_activity.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2016 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/blocked_numbers_activity_container" - android:layout_width="match_parent" - android:layout_height="match_parent"> -</FrameLayout>
\ No newline at end of file diff --git a/res/layout/empty_content_view.xml b/res/layout/empty_content_view.xml deleted file mode 100644 index 97ac4c79c..000000000 --- a/res/layout/empty_content_view.xml +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2015 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<merge xmlns:android="http://schemas.android.com/apk/res/android"> - <ImageView - android:id="@+id/emptyListViewImage" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:gravity="center_horizontal" /> - - <TextView - android:id="@+id/emptyListViewMessage" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:gravity="center_horizontal|top" - android:textSize="@dimen/empty_list_message_text_size" - android:textColor="@color/empty_list_text_color" - android:paddingRight="16dp" - android:paddingLeft="16dp" - android:paddingTop="8dp" - android:paddingBottom="8dp" /> - - <TextView - android:id="@+id/emptyListViewAction" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center_horizontal" - android:layout_gravity="center_horizontal" - android:paddingRight="16dp" - android:paddingLeft="16dp" - android:paddingTop="8dp" - android:paddingBottom="8dp" - android:background="?android:attr/selectableItemBackground" - android:clickable="true" - style="@style/TextActionStyle" /> - - <Space - android:layout_width="match_parent" - android:layout_height="40dp" /> - -</merge> diff --git a/res/layout/search_edittext.xml b/res/layout/search_edittext.xml deleted file mode 100644 index 2492ca996..000000000 --- a/res/layout/search_edittext.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<view class="com.android.contacts.widget.SearchEditTextLayout" - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:id="@+id/search_view_container" - android:orientation="horizontal" - android:layout_marginTop="0dp" - android:layout_marginBottom="0dp" - android:layout_marginLeft="0dp" - android:layout_marginRight="0dp" - android:background="@drawable/rounded_corner" - android:elevation="3dp"> - - <include layout="@layout/search_bar_expanded" /> - -</view> diff --git a/res/layout/view_numbers_to_import_fragment.xml b/res/layout/view_numbers_to_import_fragment.xml deleted file mode 100644 index 8f7331fe6..000000000 --- a/res/layout/view_numbers_to_import_fragment.xml +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2016 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - 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="match_parent" - android:orientation="vertical" - android:background="@color/blocked_number_background"> - - <ListView android:id="@id/android:list" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:divider="@null" - android:headerDividersEnabled="false" /> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:paddingTop="8dp" - android:paddingBottom="8dp" - android:background="@android:color/white"> - - <Button android:id="@+id/import_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:layout_marginEnd="@dimen/blocked_number_container_padding" - android:text="@string/blocked_call_settings_import_button" - style="@style/ContactsFlatButtonStyle" /> - - <Button android:id="@+id/cancel_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/import_description" - android:layout_toLeftOf="@id/import_button" - android:text="@android:string/cancel" - style="@style/ContactsFlatButtonStyle" /> - - </RelativeLayout> - -</LinearLayout> diff --git a/res/values/colors.xml b/res/values/colors.xml index 088c6ffac..0025a417a 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -76,18 +76,4 @@ <!-- Color of background of disabled link contacts button, 15% black. --> <color name="disabled_button_background">#26000000</color> - - <!-- Color used in blocked numbers --> - <color name="blocked_number_background">#FFFFFF</color> - <color name="add_blocked_number_icon_color">#bdbdbd</color> - <color name="blocked_number_secondary_text_color">#636363</color> - <color name="blocked_number_header_color">@color/primary_color</color> - <color name="blocked_number_divider_line_color">#D8D8D8</color> - <color name="blocked_number_primary_text_color">#333333</color> - <color name="empty_list_text_color">#b2b2b2</color> - <color name="background_contacts_results">#f9f9f9</color> - <color name="blocked_number_block_color">#F44336</color> - <color name="contacts_snackbar_action_text_color">@color/primary_color</color> - <color name="blocked_number_disabled_emergency_background_color">#E0E0E0</color> - <color name="blocked_number_icon_tint">#616161</color> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index cab8ac225..321c39b1e 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -287,21 +287,4 @@ <!-- Top margin for "Saving to" account header text field. --> <dimen name="compact_editor_account_header_top_margin">3dp</dimen> - <!-- Dimensions used in blocked numbers --> - <dimen name="blocked_number_settings_description_text_size">14sp</dimen> - <dimen name="blocked_number_container_padding">16dp</dimen> - <dimen name="blocked_number_top_margin">16dp</dimen> - <dimen name="blocked_number_bottom_margin">16dp</dimen> - <dimen name="blocked_number_add_top_margin">8dp</dimen> - <dimen name="blocked_number_add_bottom_margin">8dp</dimen> - <dimen name="blocked_number_horizontal_margin">16dp</dimen> - <dimen name="blocked_number_primary_text_size">16sp</dimen> - <dimen name="blocked_number_add_number_icon_size">40dp</dimen> - <dimen name="blocked_number_delete_icon_size">32dp</dimen> - <dimen name="empty_list_message_text_size">16sp</dimen> - <dimen name="call_log_action_height">48dp</dimen> - <dimen name="call_log_action_horizontal_padding">24dp</dimen> - <dimen name="search_list_padding_top">16dp</dimen> - <dimen name="blocked_number_search_text_size">14sp</dimen> - <dimen name="button_horizontal_padding">16dp</dimen> </resources> diff --git a/res/values/ids.xml b/res/values/ids.xml index 7a2ea0df1..7f6a51fcc 100644 --- a/res/values/ids.xml +++ b/res/values/ids.xml @@ -43,7 +43,4 @@ <!-- An ID to be used for contents of a custom dialog so that its state be preserved --> <item type="id" name="custom_dialog_content" /> - - <!-- For blocked numbers --> - <item type="id" name="block_id" /> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 31552b64d..e21681107 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -917,135 +917,6 @@ <!-- Text shown in the contacts app while the background process updates contacts after a locale change [CHAR LIMIT=150]--> <string name="locale_change_in_progress">Contact list is being updated to reflect the change of language.\n\nPlease wait...</string> - <!-- The blocked numbers activity title [CHAR LIMIT=50]--> - <string name="blocked_numbers_title">Blocked numbers</string> - - <!-- Header message of blocked number activity [CHAR LIMIT=NONE] --> - <string name="blocked_number_header_message"> - Calls and texts from these numbers will be blocked. - </string> - - <!-- Button to bring up UI to add a number to the blocked call list. [CHAR LIMIT=40] --> - <string name="addBlockedNumber">Add number</string> - - <!-- Shortcut item used to block a number directly from search. [CHAR LIMIT=25] --> - <string name="search_shortcut_block_number">Block number</string> - - <!-- Hint displayed in add blocked number search box when there is no query typed. - [CHAR LIMIT=45] --> - <string name="block_number_search_hint">Add number or search contacts</string> - - <!-- Confirmation dialog message for blocking a number. [CHAR LIMIT=NONE] --> - <string name="block_number_confirmation_message"> - Calls and texts from this number will be blocked. - </string> - - <!-- Confirmation dialog for unblocking a number. [CHAR LIMIT=NONE] --> - <string name="unblock_number_confirmation_title">Unblock - <xliff:g id="number" example="(555) 555-5555">%1$s</xliff:g>?</string> - - <!-- Unblock number alert dialog button [CHAR LIMIT=32] --> - <string name="unblock_number_ok">UNBLOCK</string> - - <!-- Confirmation dialog title for blocking a number. [CHAR LIMIT=NONE] --> - <string name="block_number_confirmation_title">Block - <xliff:g id="number" example="(555) 555-5555">%1$s</xliff:g>?</string> - - <!-- Block number alert dialog button [CHAR LIMIT=32] --> - <string name="block_number_ok">BLOCK</string> - - <!-- Text for snackbar to undo blocking a number. [CHAR LIMIT=64] --> - <string name="snackbar_number_blocked"> - <xliff:g id="number" example="(555) 555-5555">%1$s</xliff:g> blocked</string> - - <!-- Text for snackbar to undo unblocking a number. [CHAR LIMIT=64] --> - <string name="snackbar_number_unblocked"> - <xliff:g id="number" example="(555) 555-5555">%1$s</xliff:g> - unblocked</string> - - <!-- Error message shown when user tries to add invalid number to the block list. - [CHAR LIMIT=64] --> - <string name="invalidNumber"><xliff:g id="number" example="(555) 555-5555">%1$s</xliff:g> - is invalid.</string> - - <!-- Label for a section describing that call blocking is temporarily disabled because an - emergency call was made. [CHAR LIMIT=50] --> - <string name="blocked_numbers_disabled_emergency_header_label"> - Call blocking temporarily off - </string> - - <!-- Description that call blocking is temporarily disabled because the user called an - emergency number, and explains that call blocking will be re-enabled after a buffer - period has passed. [CHAR LIMIT=NONE] --> - <string name="blocked_numbers_disabled_emergency_desc"> - Call blocking has been disabled because you contacted emergency services from this phone - within the last 48 hours. It will be automatically reenabled once the 48 hour period - expires. - </string> - - <!-- Text informing the user they have previously marked contacts to be sent to voicemail. - This will be followed by two buttons, 1) to view who is marked to be sent to voicemail - and 2) importing these settings to block list. [CHAR LIMIT=NONE] --> - <string name="blocked_call_settings_import_description"> - You previously marked some contacts to be automatically sent to voicemail. Import those numbers here to block both calls and texts. - </string> - - <!-- Label for button to import settings for sending contacts to voicemail into block list. [CHAR_LIMIT=20] --> - <string name="blocked_call_settings_import_button">Import</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> - - <!-- Button to bring up UI to add a number to the blocked call list. [CHAR LIMIT=40] --> - <string name="addBlockedNumber">Add number</string> - - <!-- Title of notification telling the user that call blocking has been temporarily disabled. - [CHAR LIMIT=56] --> - <string name="call_blocking_disabled_notification_title"> - Call blocking disabled for 48 hours - </string> - - <!-- Text for notification which provides the reason that call blocking has been temporarily - disabled. Namely, we disable call blocking after an emergency call in case of return - phone calls made by emergency services. [CHAR LIMIT=64] --> - <string name="call_blocking_disabled_notification_text"> - Disabled because an emergency call was made. - </string> - - <!-- Text for undo button in snackbar for blocking/unblocking number. [CHAR LIMIT=10] --> - <string name="block_number_undo">UNDO</string> - - <!-- Error message shown when user tries to add a number to the block list that was already - blocked. [CHAR LIMIT=64] --> - <string name="alreadyBlocked"><xliff:g id="number" example="(555) 555-5555">%1$s</xliff:g> - is already blocked.</string> - - <!-- String describing the delete icon on a blocked number list item. - When tapped, it will show a dialog confirming the unblocking of the number. - [CHAR LIMIT=NONE]--> - <string name="description_blocked_number_list_delete">Unblock number</string> - - <!-- String describing the button to access the contact details for a name or number. - - Note: AccessibilityServices use this attribute to announce what the view represents. - This is especially valuable for views without textual representation like ImageView. ---> - <string name="description_contact_details">Contact details for <xliff:g id="nameOrNumber">%1$s</xliff:g></string> - - <!-- Error toast message for when send to voicemail import fails. [CHAR LIMIT=40] --> - <string name="send_to_voicemail_import_failed">Import failed</string> - - <!-- Label for fragment to import numbers from contacts marked as send to voicemail. - [CHAR_LIMIT=30] --> - <string name="import_send_to_voicemail_numbers_label">Import numbers</string> - - <!-- Shown as a prompt to turn on contacts permissions to allow contact search [CHAR LIMIT=NONE]--> - <string name="permission_no_search">To search your contacts, turn on the Contacts permissions.</string> - - <!-- The label of the button used to turn on a single permission [CHAR LIMIT=30]--> - <string name="permission_single_turn_on">Turn on</string> - <!-- The menu item to open blocked numbers activity [CHAR LIMIT=60]--> <string name="menu_blocked_numbers">Blocked numbers</string> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 7f4982033..97486fbad 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -460,51 +460,4 @@ <item name="android:textColor">#363636</item> <item name="android:fontFamily">sans-serif</item> </style> - - <style name="TextActionStyle"> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">@dimen/call_log_action_height</item> - <item name="android:gravity">end|center_vertical</item> - <item name="android:paddingStart">@dimen/call_log_action_horizontal_padding</item> - <item name="android:paddingEnd">@dimen/call_log_action_horizontal_padding</item> - <item name="android:textColor">@color/primary_color</item> - <item name="android:fontFamily">"sans-serif-medium"</item> - <item name="android:focusable">true</item> - <item name="android:singleLine">true</item> - <item name="android:textAllCaps">true</item> - </style> - - <style name="BlockedNumbersDescriptionTextStyle"> - <item name="android:lineSpacingMultiplier">1.43</item> - <item name="android:paddingTop">8dp</item> - <item name="android:paddingBottom">8dp</item> - <item name="android:textSize">@dimen/blocked_number_settings_description_text_size</item> - </style> - - <style name="ContactsFlatButtonStyle" parent="@style/Widget.AppCompat.Button.Colored"> - <item name="android:background">?android:attr/selectableItemBackground</item> - <item name="android:paddingEnd">@dimen/button_horizontal_padding</item> - <item name="android:paddingStart">@dimen/button_horizontal_padding</item> - <item name="android:textColor">@color/primary_color</item> - <item name="background">?android:attr/selectableItemBackground</item> - <item name="paddingEnd">@dimen/button_horizontal_padding</item> - <item name="paddingStart">@dimen/button_horizontal_padding</item> - </style> - - <style name="BlockedNumbersStyle" parent="@style/PeopleThemeAppCompat"> - <item name="android:actionBarStyle">@style/BlockedNumbersStyleActionBarStyle</item> - <item name="actionBarStyle">@style/BlockedNumbersStyleActionBarStyle</item> - </style> - - <style name="BlockedNumbersStyleActionBarStyle" - parent="@style/ContactsActionBarStyleAppCompat"> - <!-- Styles that require AppCompat compatibility, remember to update both sets --> - <item name="android:displayOptions"></item> - <item name="displayOptions"></item> - <!-- Override ActionBar title offset to keep search box aligned left --> - <item name="android:contentInsetStart">0dp</item> - <item name="contentInsetStart">0dp</item> - <item name="android:contentInsetEnd">0dp</item> - <item name="contentInsetEnd">0dp</item> - </style> </resources> |