diff options
author | Anne Rong <annerong@google.com> | 2015-09-29 21:54:33 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-29 21:54:33 +0000 |
commit | 63be57f9193e59724e5d8394f788925e8a9bf3b7 (patch) | |
tree | d3099f402e4e477036421bccbac661d070b62249 /res | |
parent | 11ae5a2dbca0c18a736bd32073d2333981cb997f (diff) | |
parent | e78b54ce7bbe51501e3c2a7f269bcdc0334d425a (diff) |
am e78b54ce: Add search for adding blocked numbers to the blocked number management screen.
* commit 'e78b54ce7bbe51501e3c2a7f269bcdc0334d425a':
Add search for adding blocked numbers to the blocked number management screen.
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/ic_not_interested_googblue_24dp.png | bin | 0 -> 565 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_not_interested_googblue_24dp.png | bin | 0 -> 377 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_not_interested_googblue_24dp.png | bin | 0 -> 755 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_not_interested_googblue_24dp.png | bin | 0 -> 1112 bytes | |||
-rw-r--r-- | res/drawable-xxxhdpi/ic_not_interested_googblue_24dp.png | bin | 0 -> 1458 bytes | |||
-rw-r--r-- | res/layout/search_activity.xml | 21 | ||||
-rw-r--r-- | res/values/dimens.xml | 1 | ||||
-rw-r--r-- | res/values/strings.xml | 7 |
8 files changed, 29 insertions, 0 deletions
diff --git a/res/drawable-hdpi/ic_not_interested_googblue_24dp.png b/res/drawable-hdpi/ic_not_interested_googblue_24dp.png Binary files differnew file mode 100644 index 000000000..26a26f911 --- /dev/null +++ b/res/drawable-hdpi/ic_not_interested_googblue_24dp.png diff --git a/res/drawable-mdpi/ic_not_interested_googblue_24dp.png b/res/drawable-mdpi/ic_not_interested_googblue_24dp.png Binary files differnew file mode 100644 index 000000000..d7d5c588f --- /dev/null +++ b/res/drawable-mdpi/ic_not_interested_googblue_24dp.png diff --git a/res/drawable-xhdpi/ic_not_interested_googblue_24dp.png b/res/drawable-xhdpi/ic_not_interested_googblue_24dp.png Binary files differnew file mode 100644 index 000000000..3e6ec071b --- /dev/null +++ b/res/drawable-xhdpi/ic_not_interested_googblue_24dp.png diff --git a/res/drawable-xxhdpi/ic_not_interested_googblue_24dp.png b/res/drawable-xxhdpi/ic_not_interested_googblue_24dp.png Binary files differnew file mode 100644 index 000000000..7c256b5d7 --- /dev/null +++ b/res/drawable-xxhdpi/ic_not_interested_googblue_24dp.png diff --git a/res/drawable-xxxhdpi/ic_not_interested_googblue_24dp.png b/res/drawable-xxxhdpi/ic_not_interested_googblue_24dp.png Binary files differnew file mode 100644 index 000000000..6591ed485 --- /dev/null +++ b/res/drawable-xxxhdpi/ic_not_interested_googblue_24dp.png diff --git a/res/layout/search_activity.xml b/res/layout/search_activity.xml new file mode 100644 index 000000000..8feeac20d --- /dev/null +++ b/res/layout/search_activity.xml @@ -0,0 +1,21 @@ +<?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. +--> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/search_activity_container" + android:layout_width="match_parent" + android:layout_height="match_parent"> +</FrameLayout>
\ No newline at end of file diff --git a/res/values/dimens.xml b/res/values/dimens.xml index f71f12876..b36066a94 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -153,4 +153,5 @@ <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> + <dimen name="blocked_number_search_text_size">16sp</dimen> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 093aa190e..c8b238f03 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -470,6 +470,10 @@ [CHAR LIMIT=30] --> <string name="dialer_hint_find_contact">Search contacts</string> + <!-- Hint displayed in add blocked number search box when there is no query typed. + [CHAR LIMIT=30] --> + <string name="block_number_search_hint">Add number or search contacts</string> + <!-- String resource for the font-family to use for the call log activity's title Do not translate. --> <string name="call_log_activity_title_font_family">sans-serif-light</string> @@ -559,6 +563,9 @@ <!-- Shortcut item used to make a video call directly from search. [CHAR LIMIT=25] --> <string name="search_shortcut_make_video_call">Make video call</string> + <!-- Shortcut item used to block a number directly from search. [CHAR LIMIT=25] --> + <string name="search_shortcut_block_number">Block number</string> + <!-- Number of missed calls shown on call card [CHAR LIMIT=40] --> <string name="num_missed_calls"><xliff:g id="number">%s</xliff:g> new missed calls</string> |