diff options
author | Michael Jurka <mikejurka@google.com> | 2010-12-17 20:04:50 -0800 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2010-12-21 14:27:41 -0800 |
commit | 577d017732abf9969e9a5c1b6aa3ffb5b8fdae7f (patch) | |
tree | f72eea280796f43ca4b758d0efed80d2a5b189c8 /res | |
parent | b7f2a8f099bd5abac5a613b8b2a5e8e337f847b1 (diff) | |
download | android_packages_apps_Trebuchet-577d017732abf9969e9a5c1b6aa3ffb5b8fdae7f.tar.gz android_packages_apps_Trebuchet-577d017732abf9969e9a5c1b6aa3ffb5b8fdae7f.tar.bz2 android_packages_apps_Trebuchet-577d017732abf9969e9a5c1b6aa3ffb5b8fdae7f.zip |
adding "Remove" and "Delete" text to delete button
- also removed some unused assets
Change-Id: Iad42afd2f144de92d80fb89d892ab42b32811b69
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-xlarge-hdpi/trashcan.png | bin | 888 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xlarge-hdpi/trashcan_hover.png | bin | 834 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xlarge-mdpi/trashcan.png | bin | 906 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xlarge-mdpi/trashcan_hover.png | bin | 542 -> 0 bytes | |||
-rw-r--r-- | res/layout-land/launcher.xml | 2 | ||||
-rw-r--r-- | res/layout-port/launcher.xml | 2 | ||||
-rw-r--r-- | res/layout-xlarge-land/all_apps_tabbed.xml | 16 | ||||
-rw-r--r-- | res/layout-xlarge-land/launcher.xml | 14 | ||||
-rw-r--r-- | res/layout-xlarge-port/all_apps_tabbed.xml | 16 | ||||
-rw-r--r-- | res/layout-xlarge-port/launcher.xml | 14 | ||||
-rw-r--r-- | res/values/colors.xml | 4 | ||||
-rw-r--r-- | res/values/strings.xml | 7 |
12 files changed, 63 insertions, 12 deletions
diff --git a/res/drawable-xlarge-hdpi/trashcan.png b/res/drawable-xlarge-hdpi/trashcan.png Binary files differdeleted file mode 100644 index a07f78442..000000000 --- a/res/drawable-xlarge-hdpi/trashcan.png +++ /dev/null diff --git a/res/drawable-xlarge-hdpi/trashcan_hover.png b/res/drawable-xlarge-hdpi/trashcan_hover.png Binary files differdeleted file mode 100644 index 6dbc8f3b8..000000000 --- a/res/drawable-xlarge-hdpi/trashcan_hover.png +++ /dev/null diff --git a/res/drawable-xlarge-mdpi/trashcan.png b/res/drawable-xlarge-mdpi/trashcan.png Binary files differdeleted file mode 100644 index 839d4b854..000000000 --- a/res/drawable-xlarge-mdpi/trashcan.png +++ /dev/null diff --git a/res/drawable-xlarge-mdpi/trashcan_hover.png b/res/drawable-xlarge-mdpi/trashcan_hover.png Binary files differdeleted file mode 100644 index cc2fde7d5..000000000 --- a/res/drawable-xlarge-mdpi/trashcan_hover.png +++ /dev/null diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 8d38a3d61..6e797f8eb 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -86,7 +86,7 @@ android:layout_gravity="right|center_vertical" android:scaleType="center" - android:src="@drawable/delete_zone_selector" + android:drawableLeft="@drawable/delete_zone_selector" android:visibility="invisible" launcher:direction="vertical" /> diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index c50dbca93..b7c61d8fa 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -79,7 +79,7 @@ android:layout_gravity="bottom|center_horizontal" android:scaleType="center" - android:src="@drawable/delete_zone_selector" + android:drawableLeft="@drawable/delete_zone_selector" android:visibility="invisible" launcher:direction="horizontal" /> diff --git a/res/layout-xlarge-land/all_apps_tabbed.xml b/res/layout-xlarge-land/all_apps_tabbed.xml index e1a37ff14..fbe98b09e 100644 --- a/res/layout-xlarge-land/all_apps_tabbed.xml +++ b/res/layout-xlarge-land/all_apps_tabbed.xml @@ -39,7 +39,7 @@ android:layout_centerVertical="true"> <com.android.launcher2.ApplicationInfoDropTarget android:id="@+id/all_apps_info_target" - android:src="@drawable/ic_home_info_holo_dark" + android:drawableRight="@drawable/ic_home_info_holo_dark" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" @@ -53,14 +53,24 @@ </FrameLayout> <com.android.launcher2.DeleteZone android:id="@+id/all_apps_delete_zone" - android:src="@drawable/delete_zone_selector" + android:text="@string/delete_zone_label_all_apps" + android:drawablePadding="@dimen/all_apps_drawable_padding" + android:drawableLeft="@drawable/delete_zone_selector" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toLeftOf="@id/market_info_frame" android:layout_centerVertical="true" android:visibility="invisible" android:paddingRight="22dp" - launcher:direction="horizontal" /> + launcher:direction="horizontal" + + android:gravity="center_horizontal|center_vertical" + android:textColor="@color/workspace_all_apps_and_delete_zone_text_color" + android:textSize="18sp" + android:shadowColor="@color/workspace_all_apps_and_delete_zone_text_shadow_color" + android:shadowDx="0.0" + android:shadowDy="0.0" + android:shadowRadius="2.0" /> </RelativeLayout> <FrameLayout android:id="@android:id/tabcontent" diff --git a/res/layout-xlarge-land/launcher.xml b/res/layout-xlarge-land/launcher.xml index ca77c5590..b68231785 100644 --- a/res/layout-xlarge-land/launcher.xml +++ b/res/layout-xlarge-land/launcher.xml @@ -168,16 +168,26 @@ android:visibility="gone"/> <com.android.launcher2.DeleteZone android:id="@+id/delete_zone" - android:src="@drawable/delete_zone_selector" + android:text="@string/delete_zone_label_workspace" + android:drawablePadding="@dimen/all_apps_drawable_padding" + android:drawableLeft="@drawable/delete_zone_selector" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignLeft="@id/configure_button" + android:layout_alignRight="@id/configure_button" android:paddingLeft="@dimen/toolbar_button_horizontal_padding" android:paddingRight="@dimen/toolbar_button_horizontal_padding" android:paddingTop="@dimen/toolbar_button_vertical_padding" android:paddingBottom="@dimen/toolbar_button_vertical_padding" android:background="@drawable/button_bg" + android:gravity="center_horizontal|center_vertical" + android:textColor="@color/workspace_all_apps_and_delete_zone_text_color" + android:textSize="18sp" + android:shadowColor="@color/workspace_all_apps_and_delete_zone_text_shadow_color" + android:shadowDx="0.0" + android:shadowDy="0.0" + android:shadowRadius="2.0" + android:visibility="gone" launcher:direction="horizontal" /> </RelativeLayout> diff --git a/res/layout-xlarge-port/all_apps_tabbed.xml b/res/layout-xlarge-port/all_apps_tabbed.xml index a59314834..b90041c6b 100644 --- a/res/layout-xlarge-port/all_apps_tabbed.xml +++ b/res/layout-xlarge-port/all_apps_tabbed.xml @@ -39,7 +39,7 @@ android:layout_centerVertical="true"> <com.android.launcher2.ApplicationInfoDropTarget android:id="@+id/all_apps_info_target" - android:src="@drawable/ic_home_info_holo_dark" + android:drawableRight="@drawable/ic_home_info_holo_dark" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" @@ -53,14 +53,24 @@ </FrameLayout> <com.android.launcher2.DeleteZone android:id="@+id/all_apps_delete_zone" - android:src="@drawable/delete_zone_selector" + android:text="@string/delete_zone_label_all_apps" + android:drawablePadding="@dimen/all_apps_drawable_padding" + android:drawableLeft="@drawable/delete_zone_selector" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toLeftOf="@id/market_info_frame" android:layout_centerVertical="true" android:visibility="invisible" android:paddingRight="22dp" - launcher:direction="horizontal" /> + launcher:direction="horizontal" + + android:gravity="center_horizontal|center_vertical" + android:textColor="@color/workspace_all_apps_and_delete_zone_text_color" + android:textSize="18sp" + android:shadowColor="@color/workspace_all_apps_and_delete_zone_text_shadow_color" + android:shadowDx="0.0" + android:shadowDy="0.0" + android:shadowRadius="2.0" /> </RelativeLayout> <FrameLayout android:id="@android:id/tabcontent" diff --git a/res/layout-xlarge-port/launcher.xml b/res/layout-xlarge-port/launcher.xml index e64da5af7..40b947e6b 100644 --- a/res/layout-xlarge-port/launcher.xml +++ b/res/layout-xlarge-port/launcher.xml @@ -166,15 +166,25 @@ android:visibility="gone"/> <com.android.launcher2.DeleteZone android:id="@+id/delete_zone" - android:src="@drawable/delete_zone_selector" + android:text="@string/delete_zone_label_workspace" + android:drawablePadding="@dimen/all_apps_drawable_padding" + android:drawableLeft="@drawable/delete_zone_selector" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignLeft="@id/configure_button" + android:layout_alignRight="@id/configure_button" android:paddingLeft="@dimen/toolbar_button_horizontal_padding" android:paddingRight="@dimen/toolbar_button_horizontal_padding" android:paddingTop="@dimen/toolbar_button_vertical_padding" android:paddingBottom="@dimen/toolbar_button_vertical_padding" + android:gravity="center_horizontal|center_vertical" + android:textColor="@color/workspace_all_apps_and_delete_zone_text_color" + android:textSize="18sp" + android:shadowColor="@color/workspace_all_apps_and_delete_zone_text_shadow_color" + android:shadowDx="0.0" + android:shadowDy="0.0" + android:shadowRadius="2.0" + android:visibility="gone" launcher:direction="horizontal" /> </RelativeLayout> diff --git a/res/values/colors.xml b/res/values/colors.xml index 4abbd50dd..91fe2c974 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -38,4 +38,8 @@ <color name="workspace_item_pressed_glow_color">#0997ff</color> <color name="workspace_item_focused_outline_color">#6595f9</color> <color name="workspace_item_focused_glow_color">#0997ff</color> + + <color name="workspace_all_apps_and_delete_zone_text_color">#CCFFFFFF</color> + <color name="workspace_all_apps_and_delete_zone_text_shadow_color">#A0000000</color> + <color name="workspace_delete_zone_drag_text_color">#FFFF0000</color> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 48790525f..c56ee9eb7 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -142,6 +142,13 @@ <!-- Label for button in all applications label to go back home (to the workspace / desktop) for accessibilty (spoken when the button gets focus). --> <string name="all_apps_home_button_label">Home</string> + <!-- Label for trash icon on workspace. Meant to communicate the idea of removing the + icon/widget from the home screen, but not permanently. Contrast with the label for trash + icon in All Apps [CHAR_LIMIT=30] --> + <string name="delete_zone_label_workspace">Remove</string> + <!-- Label for trash icon in All Apps. The icon/widget will become completely unavailable on the + device. [CHAR_LIMIT=30]--> + <string name="delete_zone_label_all_apps">Delete</string> <!-- Menus items: --> <skip /> |