diff options
| author | James Kung <kingkung@google.com> | 2013-02-22 15:36:51 -0800 |
|---|---|---|
| committer | James Kung <kingkung@google.com> | 2013-02-22 15:47:03 -0800 |
| commit | cab7aab41db1c19e8881b6603a21a85b27624309 (patch) | |
| tree | d20af27886695634b00777e972f39483cd568259 /res/layout | |
| parent | 108e14d42caed725b9ab4662944701771fcd615e (diff) | |
| download | android_packages_apps_Calendar-cab7aab41db1c19e8881b6603a21a85b27624309.tar.gz android_packages_apps_Calendar-cab7aab41db1c19e8881b6603a21a85b27624309.tar.bz2 android_packages_apps_Calendar-cab7aab41db1c19e8881b6603a21a85b27624309.zip | |
Adding visible click state to color picker button.
Change-Id: I595ba1e187a6cb8fefac3a92c55043becd9c8644
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/edit_event_1.xml | 22 | ||||
| -rw-r--r-- | res/layout/event_info_dialog.xml | 26 |
2 files changed, 36 insertions, 12 deletions
diff --git a/res/layout/edit_event_1.xml b/res/layout/edit_event_1.xml index af7174f7..fb2955af 100644 --- a/res/layout/edit_event_1.xml +++ b/res/layout/edit_event_1.xml @@ -40,7 +40,16 @@ android:gravity="center_vertical" /> <ImageButton android:id="@+id/change_color_new_event" - style="@style/EditEventColorImageButton" + style="?android:attr/buttonBarButtonStyle" + android:src="@drawable/ic_menu_colorpicker_holo_dark" + android:contentDescription="@string/choose_event_color_label" + android:layout_width="48dip" + android:layout_height="48dip" + android:enabled="false" + android:layout_marginRight="8dip" + android:layout_gravity="center_vertical" + android:padding="8dip" + android:scaleType="centerInside" android:visibility="invisible" /> </LinearLayout> @@ -78,7 +87,16 @@ </LinearLayout> <ImageButton android:id="@+id/change_color_existing_event" - style="@style/EditEventColorImageButton" + style="?android:attr/buttonBarButtonStyle" + android:src="@drawable/ic_menu_colorpicker_holo_dark" + android:contentDescription="@string/choose_event_color_label" + android:layout_width="48dip" + android:layout_height="48dip" + android:enabled="false" + android:layout_marginRight="8dip" + android:layout_gravity="center_vertical" + android:padding="8dip" + android:scaleType="centerInside" android:visibility="gone" /> </LinearLayout> diff --git a/res/layout/event_info_dialog.xml b/res/layout/event_info_dialog.xml index 5bce6a43..0bc9772e 100644 --- a/res/layout/event_info_dialog.xml +++ b/res/layout/event_info_dialog.xml @@ -95,11 +95,20 @@ android:layout_gravity="right"> <ImageButton android:id="@+id/change_color" - style="@style/EditEventColorImageButton" + style="?android:attr/buttonBarButtonStyle" + android:src="@drawable/ic_menu_colorpicker_holo_dark" + android:contentDescription="@string/choose_event_color_label" + android:layout_width="48dip" + android:layout_height="48dip" android:enabled="false" - android:visibility="gone" /> + android:visibility="gone" + android:layout_marginRight="8dip" + android:padding="8dip" + android:scaleType="centerInside" /> <ImageButton android:id="@+id/edit" + style="?android:attr/buttonBarButtonStyle" + android:src="@drawable/ic_menu_compose_holo_dark" android:contentDescription="@string/edit_label" android:layout_width="48dip" android:layout_height="48dip" @@ -107,21 +116,18 @@ android:visibility="gone" android:layout_marginRight="8dip" android:padding="8dip" - android:scaleType="centerInside" - style="?android:attr/buttonBarButtonStyle" - android:src="@drawable/ic_menu_compose_holo_dark" /> + android:scaleType="centerInside" /> <ImageButton android:id="@+id/delete" + style="?android:attr/buttonBarButtonStyle" + android:src="@drawable/ic_menu_trash_holo_dark" android:contentDescription="@string/delete_label" android:layout_width="48dip" android:layout_height="48dip" - android:layout_marginLeft="8dip" - android:padding="8dip" - android:scaleType="centerInside" android:enabled="false" android:visibility="gone" - style="?android:attr/buttonBarButtonStyle" - android:src="@drawable/ic_menu_trash_holo_dark" /> + android:padding="8dip" + android:scaleType="centerInside" /> </LinearLayout> </LinearLayout> |