diff options
author | Anne Rong <annerong@google.com> | 2015-09-18 17:28:38 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-18 17:28:38 +0000 |
commit | 59b2b5578aa8864b9fffd089f35a04d284d9e1c9 (patch) | |
tree | 6a1904c54296d2cb56c36dd328fa72402cbd9689 /res | |
parent | 91037cc532bfdbf991228c2d5ee7901bffb92be4 (diff) | |
parent | 6fb201a4f048e1a5763465a2e31f3a93e649fff7 (diff) |
Merge "Build management screen for managing blocked numbers." into ub-contactsdialer-a-dev
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/blocked_number_fragment.xml | 56 | ||||
-rw-r--r-- | res/layout/blocked_number_header.xml | 40 | ||||
-rw-r--r-- | res/layout/blocked_number_item.xml | 75 | ||||
-rw-r--r-- | res/values/colors.xml | 7 | ||||
-rw-r--r-- | res/values/dimens.xml | 8 | ||||
-rw-r--r-- | res/values/strings.xml | 34 |
6 files changed, 220 insertions, 0 deletions
diff --git a/res/layout/blocked_number_fragment.xml b/res/layout/blocked_number_fragment.xml new file mode 100644 index 000000000..b1e4d0f57 --- /dev/null +++ b/res/layout/blocked_number_fragment.xml @@ -0,0 +1,56 @@ +<?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:orientation="vertical" + android:background="@color/blocked_number_background" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <android.support.v7.widget.CardView + android:layout_width="match_parent" + android:layout_height="wrap_content" + card_view:cardCornerRadius="0dp"> + + <ListView android:id="@id/android:list" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/background_dialer_white" + android:layout_weight="1" + android:drawSelectorOnTop="false" + android:headerDividersEnabled="false" /> + + <LinearLayout + android:id="@android:id/empty" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical"> + + <include layout="@layout/blocked_number_header" /> + + <TextView android:id="@id/android:empty" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingStart="@dimen/blocked_number_horizontal_margin" + android:paddingTop="@dimen/blocked_number_top_margin" + android:paddingBottom="@dimen/blocked_number_bottom_margin" + android:text="@string/listNoBlockedNumbers" /> + + </LinearLayout> + + </android.support.v7.widget.CardView> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/blocked_number_header.xml b/res/layout/blocked_number_header.xml new file mode 100644 index 000000000..fed94cc37 --- /dev/null +++ b/res/layout/blocked_number_header.xml @@ -0,0 +1,40 @@ +<?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" + android:orientation="vertical" android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/textView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/blockList" + android:paddingStart="@dimen/blocked_number_horizontal_margin" + android:paddingTop="@dimen/blocked_number_top_margin" + android:paddingBottom="@dimen/blocked_number_bottom_margin" + android:textColor="@color/blocked_number_accent_color" + style="@android:style/TextAppearance.Material.Subhead" /> + + <Button + android:id="@+id/add_number_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/blockNumber" + android:layout_gravity="right" + android:textColor="@color/blocked_number_accent_color" + style="?android:attr/borderlessButtonStyle" /> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/blocked_number_item.xml b/res/layout/blocked_number_item.xml new file mode 100644 index 000000000..6c87533f1 --- /dev/null +++ b/res/layout/blocked_number_item.xml @@ -0,0 +1,75 @@ +<?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" + android:id="@+id/caller_information" + 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:background="@color/background_dialer_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" /> + + <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/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:layout_marginBottom="5dp" + 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: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="16dp" + android:background="?android:attr/selectableItemBackgroundBorderless" + android:src="@drawable/ic_remove" + android:scaleType="center" + android:tint="@color/delete_icon_tint" + android:contentDescription="@string/description_blocked_number_list_delete" /> + +</LinearLayout> diff --git a/res/values/colors.xml b/res/values/colors.xml index 8ce3c17ba..a747927d1 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -104,4 +104,11 @@ <color name="floating_action_button_touch_tint">#80ffffff</color> <color name="call_log_action_divider">#eeeeee</color> + + <!-- Colors for blocked numbers list --> + <color name="blocked_number_primary_text_color">@color/dialtacts_primary_text_color</color> + <color name="blocked_number_secondary_text_color">@color/dialtacts_secondary_text_color</color> + <color name="delete_icon_tint">#6D6D6D</color> + <color name="blocked_number_background">#E0E0E0</color> + <color name="blocked_number_accent_color">#42A5F5</color> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 776cd1150..b5acf2019 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -147,4 +147,12 @@ <dimen name="promo_card_line_spacing">4dp</dimen> <dimen name="voicemail_playback_top_padding">12dp</dimen> + + <!-- Size of entries in blocked numbers list --> + <dimen name="blocked_number_horizontal_margin">16dp</dimen> + <dimen name="blocked_number_top_margin">16dp</dimen> + <dimen name="blocked_number_bottom_margin">16dp</dimen> + <dimen name="blocked_number_primary_text_size">16sp</dimen> + <dimen name="blocked_number_secondary_text_size">12sp</dimen> + <dimen name="blocked_number_delete_icon_size">32dp</dimen> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 7bd88baef..093aa190e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -805,6 +805,40 @@ <!-- Label for the call settings section [CHAR LIMIT=30] --> <string name="call_settings_label">Calls</string> + <!-- Label for the blocked calls settings section [CHAR LIMIT=30] --> + <string name="blocked_calls_settings_label">Spam and blocked calls</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> + + <!-- Displayed in the blocked numbers list when there are no blocked numbers. + [CHAR LIMIT=NONE] --> + <string name="listNoBlockedNumbers">No blocked numbers</string> + + <!-- Button to bring up UI to add a number to the blocked call list. [CHAR LIMIT=40] --> + <string name="blockNumber">Add number</string> + + <!-- Heading for the block list in the "Spam and blocked calls" settings. [CHAR LIMIT=64] --> + <string name="blockList">Block list</string> + + <!-- Label for progress dialog when validating a number to be added to the block list. + [CHAR LIMIT=64] --> + <string name="checkingNumber">Checking + <xliff:g id="number" example="(555) 555-5555">%1$s</xliff:g> + </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> + + <!-- 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> + <!-- Label for the phone account settings [CHAR LIMIT=30] --> <string name="phone_account_settings_label">Calling accounts</string> |