diff options
| author | James Kung <kingkung@google.com> | 2013-08-09 17:22:34 -0700 |
|---|---|---|
| committer | James Kung <kingkung@google.com> | 2013-08-14 12:13:47 -0700 |
| commit | 25ee07c27a7bab22f3b87e2bd634dcc35029f0c7 (patch) | |
| tree | c7cce8f91b10094b1a87735a06ad472f035ef2c8 /res | |
| parent | 28f4040a333cda56fc61ce5767b8906f85d88b12 (diff) | |
| download | android_packages_apps_DeskClock-25ee07c27a7bab22f3b87e2bd634dcc35029f0c7.tar.gz android_packages_apps_DeskClock-25ee07c27a7bab22f3b87e2bd634dcc35029f0c7.tar.bz2 android_packages_apps_DeskClock-25ee07c27a7bab22f3b87e2bd634dcc35029f0c7.zip | |
City Search functionality
Change-Id: I8ec790fe7adf59f81caf74af8be50d2fcfbd6b99
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/cities_activity.xml | 9 | ||||
| -rw-r--r-- | res/layout/city_list_item.xml | 40 | ||||
| -rw-r--r-- | res/menu/cities_menu.xml | 7 |
3 files changed, 28 insertions, 28 deletions
diff --git a/res/layout/cities_activity.xml b/res/layout/cities_activity.xml index cdb2165b0..5a5f489bd 100644 --- a/res/layout/cities_activity.xml +++ b/res/layout/cities_activity.xml @@ -20,8 +20,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:clickable="true" - android:paddingLeft="8dip" android:paddingStart="8dip" - android:paddingRight="32dip" - android:paddingEnd="32dip" - android:clipToPadding="false" /> + android:paddingEnd="8dip" + android:paddingLeft="8dip" + android:paddingRight="8dip" + android:clipToPadding="false" + /> diff --git a/res/layout/city_list_item.xml b/res/layout/city_list_item.xml index e5f1e0d52..3cd0c124e 100644 --- a/res/layout/city_list_item.xml +++ b/res/layout/city_list_item.xml @@ -18,36 +18,28 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:gravity="center_vertical" - android:paddingLeft="8dip" - android:paddingStart="8dip" - android:paddingRight="8dip" - android:paddingEnd="8dip" android:background="?android:attr/selectableItemBackground" android:layout_height="wrap_content" android:minHeight="@dimen/cities_list_item_height" android:orientation="horizontal"> - <LinearLayout - android:layout_width="0dip" - android:layout_weight="1" - android:layout_height="wrap_content" - android:orientation="vertical"> - <TextView - android:id="@+id/city_name" - style="@style/city_name" - android:textColor="@color/clock_white" - android:layout_height="wrap_content" - android:layout_width="wrap_content"/> - <TextView - android:id="@+id/city_time" - style="@style/city_time" - android:textColor="@color/clock_gray" - android:layout_height="wrap_content" - android:layout_width="wrap_content"/> - </LinearLayout> <CheckBox android:id="@+id/city_onoff" android:clickable="false" android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_gravity="center_vertical" /> + android:layout_width="wrap_content" /> + <TextView + android:id="@+id/city_name" + style="@style/city_name" + android:textColor="@color/clock_white" + android:paddingStart="16dip" + android:layout_height="wrap_content" + android:layout_width="0dip" + android:layout_weight="1" + android:ellipsize="start" /> + <TextView + android:id="@+id/city_time" + style="@style/city_time" + android:textColor="@color/clock_gray" + android:layout_height="wrap_content" + android:layout_width="wrap_content"/> </LinearLayout> diff --git a/res/menu/cities_menu.xml b/res/menu/cities_menu.xml index 7a863d64e..305ad6b01 100644 --- a/res/menu/cities_menu.xml +++ b/res/menu/cities_menu.xml @@ -15,6 +15,13 @@ --> <menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:id="@+id/menu_item_search" + android:title="@android:string/search_go" + android:icon="@android:drawable/ic_menu_search" + android:showAsAction="ifRoom" + android:actionViewClass="android.widget.SearchView" + android:imeOptions="actionSearch" + android:orderInCategory="1" /> <item android:id="@+id/menu_item_settings" android:title="@string/menu_item_settings" android:icon="@android:drawable/ic_menu_preferences" |