summaryrefslogtreecommitdiffstats
path: root/chips/res
diff options
context:
space:
mode:
authorDaisuke Miyakawa <dmiyakawa@google.com>2011-07-11 10:28:02 -0700
committerDaisuke Miyakawa <dmiyakawa@google.com>2011-07-11 14:30:42 -0700
commita601adc796fa7276771e6ab2670bf50663555489 (patch)
treed16e4e66fe99f100a5238ef572a5e030afd8eda7 /chips/res
parent4c514e6055a25fcd0e8168970cb7e4b1920aeae2 (diff)
downloadandroid_frameworks_ex-a601adc796fa7276771e6ab2670bf50663555489.tar.gz
android_frameworks_ex-a601adc796fa7276771e6ab2670bf50663555489.tar.bz2
android_frameworks_ex-a601adc796fa7276771e6ab2670bf50663555489.zip
Show "Waiting for more contacts" message on directory load
Requires - I458c4b068d91feb16fe12c3b813f9704668663d2 - I5f83103628c14dd5079515c46c42a6f43d4f194c - I858c66faa6d5bcb3248da6be6a40f47ab0f00a4d Bug: 4996797 Change-Id: Iad5b8444f4b1949666d93ad43a34de057aba560e
Diffstat (limited to 'chips/res')
-rw-r--r--chips/res/layout/chips_waiting_for_directory_search.xml45
-rw-r--r--chips/res/values/attrs.xml13
-rw-r--r--chips/res/values/strings.xml4
3 files changed, 56 insertions, 6 deletions
diff --git a/chips/res/layout/chips_waiting_for_directory_search.xml b/chips/res/layout/chips_waiting_for_directory_search.xml
new file mode 100644
index 0000000..cc35c35
--- /dev/null
+++ b/chips/res/layout/chips_waiting_for_directory_search.xml
@@ -0,0 +1,45 @@
+<?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.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="50dip"
+ android:orientation="horizontal"
+ android:layout_centerVertical="true"
+ android:layout_gravity="center_vertical">
+ <TextView android:id="@+id/text1"
+ android:textColor="?android:attr/textColorSecondary"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:gravity="center_vertical"
+ android:paddingLeft="6dip"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:text="@string/chips_waiting_for_directory_result"
+ />
+ <ProgressBar android:id="@+id/progress_circular"
+ style="?android:attr/progressBarStyleSmall"
+ android:indeterminate="true"
+ android:layout_centerVertical="true"
+ android:layout_alignParentRight="true"
+ android:layout_marginLeft="6dip"
+ android:layout_marginRight="6dip"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+</RelativeLayout>
diff --git a/chips/res/values/attrs.xml b/chips/res/values/attrs.xml
index 1efaccd..9536a7f 100644
--- a/chips/res/values/attrs.xml
+++ b/chips/res/values/attrs.xml
@@ -15,9 +15,10 @@
-->
<resources>
- <add-resource type="dimen" name="chip_padding"></add-resource>
- <add-resource type="dimen" name="chip_height"></add-resource>
- <add-resource type="dimen" name="chip_text_size"></add-resource>
- <add-resource type="color" name="default_chip_background"></add-resource>
- <add-resource type="string" name="more_string"></add-resource>
-</resources> \ No newline at end of file
+ <add-resource type="dimen" name="chip_padding" />
+ <add-resource type="dimen" name="chip_height" />
+ <add-resource type="dimen" name="chip_text_size" />
+ <add-resource type="color" name="default_chip_background" />
+ <add-resource type="string" name="more_string" />
+ <add-resource type="string" name="chips_waiting_for_directory_result" />
+</resources>
diff --git a/chips/res/values/strings.xml b/chips/res/values/strings.xml
index f83ebb4..3ae1d20 100644
--- a/chips/res/values/strings.xml
+++ b/chips/res/values/strings.xml
@@ -16,4 +16,8 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Text displayed when the recipientedittextview is not focused. Displays the total number of recipients since the field is shrunk to just display a portion -->
<string name="more_string">\u002B <xliff:g id="count">%1$s</xliff:g> more</string>
+
+ <!-- Text displayed when there are remote directories not returning results.
+ [CHAR LIMIT=50] -->
+ <string name="chips_waiting_for_directory_result">Waiting for more contacts</string>
</resources>