diff options
| author | Andrew Sapperstein <asapperstein@google.com> | 2015-05-28 19:59:19 -0700 |
|---|---|---|
| committer | Andrew Sapperstein <asapperstein@google.com> | 2015-05-29 10:03:12 -0700 |
| commit | c6e314b5a20a234a8207ef4cd67e2f042579a087 (patch) | |
| tree | a11c0ccffcfa315470a286af1fe9adb9f6476a06 /res | |
| parent | 6f86e3b4ab4137d43769d78abd9a45ed84e6e50d (diff) | |
| download | chips-c6e314b5a20a234a8207ef4cd67e2f042579a087.tar.gz | |
Use a proper dialog fragment for copying.
Also delete some dead code.
b/21087247
Change-Id: I2f49e26d11a28a7f80b5f4643e3e36a7c0a8980e
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/copy_chip_dialog_layout.xml | 23 | ||||
| -rw-r--r-- | res/values/attrs.xml | 2 | ||||
| -rw-r--r-- | res/values/colors.xml | 1 | ||||
| -rw-r--r-- | res/values/strings.xml | 4 |
4 files changed, 4 insertions, 26 deletions
diff --git a/res/layout/copy_chip_dialog_layout.xml b/res/layout/copy_chip_dialog_layout.xml deleted file mode 100644 index c7cc490..0000000 --- a/res/layout/copy_chip_dialog_layout.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<Button xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/copy_email" - android:id="@android:id/button1" - android:background="@null" - android:layout_gravity="left"/> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 8cc5470..ddc69c7 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -31,8 +31,6 @@ <enum name="baseline" value = "1"/> </attr> <attr name="unselectedChipBackgroundColor" format="color" /> - <attr name="selectedChipBackgroundColor" format="color" /> <attr name="unselectedChipTextColor" format="color" /> - <attr name="selectedChipTextColor" format="color" /> </declare-styleable> </resources>
\ No newline at end of file diff --git a/res/values/colors.xml b/res/values/colors.xml index 5130a32..9b87a6c 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -23,7 +23,6 @@ <color name="autocomplete_divider_color">#cccccc</color> <color name="chip_background">#f6f6f6</color> - <color name="chip_background_selected">#4285f4</color> <color name="chip_background_invalid">#db4437</color> <color name="chips_dropdown_text_default">#212121</color> diff --git a/res/values/strings.xml b/res/values/strings.xml index ecff60f..8c339fe 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -26,4 +26,8 @@ <string name="accessbility_suggestion_dropdown_opened">Contact suggestions opened</string> <!-- Description for the delete button that removes the selected contact from the recipients [CHAR LIMIT=100] --> <string name="dropdown_delete_button_desc">Remove <xliff:g id="contact">%s</xliff:g> from recipients</string> + <!-- Text displayed as the primary action for a dialog to copy text. [CHAR LIMIT=25] --> + <string name="chips_action_copy">Copy</string> + <!-- Text displayed as the secondary action for a dialog to cancel. [CHAR LIMIT=25] --> + <string name="chips_action_cancel">Cancel</string> </resources> |