diff options
author | Danny Baumann <dannybaumann@web.de> | 2016-11-29 09:54:27 +0100 |
---|---|---|
committer | Arne Coucheron <arco68@gmail.com> | 2018-01-26 01:08:54 +0100 |
commit | 95c43cdeab5606e5a44b41a958de93dbbca77d04 (patch) | |
tree | f25cdd46f1c9e6d5c9ca916a2dfaf9bdea48dddd | |
parent | f1e07ddcb86233c0864065f89c5bf68c29e928ce (diff) | |
download | android_packages_apps_Snap-95c43cdeab5606e5a44b41a958de93dbbca77d04.tar.gz android_packages_apps_Snap-95c43cdeab5606e5a44b41a958de93dbbca77d04.tar.bz2 android_packages_apps_Snap-95c43cdeab5606e5a44b41a958de93dbbca77d04.zip |
Use material versions of share/delete/edit icons.
Change-Id: I5cbcd574802170747973c8d685cdfdebf61d5a4f
-rw-r--r-- | res/drawable-hdpi/ic_menu_edit_holo_dark.png | bin | 1677 -> 0 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_menu_share_holo_light.png | bin | 1007 -> 0 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_menu_trash_holo_light.png | bin | 970 -> 0 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_menu_edit_holo_dark.png | bin | 1136 -> 0 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_menu_share_holo_light.png | bin | 706 -> 0 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_menu_trash_holo_light.png | bin | 726 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_menu_edit_holo_dark.png | bin | 2303 -> 0 bytes | |||
-rw-r--r-- | res/drawable/ic_menu_delete.xml | 9 | ||||
-rw-r--r-- | res/drawable/ic_menu_edit.xml | 9 | ||||
-rw-r--r-- | res/drawable/ic_menu_share.xml | 9 | ||||
-rw-r--r-- | res/drawable/photopage_bottom_button_background.xml | 5 | ||||
-rw-r--r-- | res/layout/filmstrip_bottom_controls.xml | 22 | ||||
-rw-r--r-- | res/menu/operations.xml | 6 |
13 files changed, 37 insertions, 23 deletions
diff --git a/res/drawable-hdpi/ic_menu_edit_holo_dark.png b/res/drawable-hdpi/ic_menu_edit_holo_dark.png Binary files differdeleted file mode 100644 index 54952f5d3..000000000 --- a/res/drawable-hdpi/ic_menu_edit_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menu_share_holo_light.png b/res/drawable-hdpi/ic_menu_share_holo_light.png Binary files differdeleted file mode 100644 index 492d6090c..000000000 --- a/res/drawable-hdpi/ic_menu_share_holo_light.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menu_trash_holo_light.png b/res/drawable-hdpi/ic_menu_trash_holo_light.png Binary files differdeleted file mode 100644 index 721ee5ca2..000000000 --- a/res/drawable-hdpi/ic_menu_trash_holo_light.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_menu_edit_holo_dark.png b/res/drawable-mdpi/ic_menu_edit_holo_dark.png Binary files differdeleted file mode 100644 index ca9188e18..000000000 --- a/res/drawable-mdpi/ic_menu_edit_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_menu_share_holo_light.png b/res/drawable-mdpi/ic_menu_share_holo_light.png Binary files differdeleted file mode 100644 index 29574f5bd..000000000 --- a/res/drawable-mdpi/ic_menu_share_holo_light.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_menu_trash_holo_light.png b/res/drawable-mdpi/ic_menu_trash_holo_light.png Binary files differdeleted file mode 100644 index f45540b21..000000000 --- a/res/drawable-mdpi/ic_menu_trash_holo_light.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_menu_edit_holo_dark.png b/res/drawable-xhdpi/ic_menu_edit_holo_dark.png Binary files differdeleted file mode 100644 index 65e72c1e2..000000000 --- a/res/drawable-xhdpi/ic_menu_edit_holo_dark.png +++ /dev/null diff --git a/res/drawable/ic_menu_delete.xml b/res/drawable/ic_menu_delete.xml new file mode 100644 index 000000000..8732b858f --- /dev/null +++ b/res/drawable/ic_menu_delete.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="@android:color/white" + android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/> +</vector> diff --git a/res/drawable/ic_menu_edit.xml b/res/drawable/ic_menu_edit.xml new file mode 100644 index 000000000..18c9c2c30 --- /dev/null +++ b/res/drawable/ic_menu_edit.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="@android:color/white" + android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/> +</vector> diff --git a/res/drawable/ic_menu_share.xml b/res/drawable/ic_menu_share.xml new file mode 100644 index 000000000..9c04fa74e --- /dev/null +++ b/res/drawable/ic_menu_share.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="@android:color/white" + android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/> +</vector> diff --git a/res/drawable/photopage_bottom_button_background.xml b/res/drawable/photopage_bottom_button_background.xml deleted file mode 100644 index 0c772ad21..000000000 --- a/res/drawable/photopage_bottom_button_background.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@android:color/holo_blue_light" android:state_pressed="true"/> - <item android:drawable="@color/button_dark_transparent_background" android:state_selected="false"/> -</selector> diff --git a/res/layout/filmstrip_bottom_controls.xml b/res/layout/filmstrip_bottom_controls.xml index 1ad07aee9..ef370a327 100644 --- a/res/layout/filmstrip_bottom_controls.xml +++ b/res/layout/filmstrip_bottom_controls.xml @@ -26,17 +26,13 @@ <ImageButton android:id="@+id/filmstrip_bottom_control_edit" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_width="48dp" + android:layout_height="48dp" android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:background="@drawable/photopage_bottom_button_background" - android:paddingBottom="5dp" - android:paddingLeft="15dp" - android:paddingRight="15dp" - android:paddingTop="5dp" - android:src="@drawable/ic_menu_edit_holo_dark" + android:background="?android:attr/selectableItemBackgroundBorderless" + android:src="@drawable/ic_menu_edit" android:visibility="gone" /> <ImageButton @@ -52,16 +48,12 @@ <ImageButton android:id="@+id/filmstrip_bottom_control_tiny_planet" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_width="48dp" + android:layout_height="48dp" android:layout_alignParentBottom="true" android:layout_alignParentRight="true" android:layout_alignParentEnd="true" - android:background="@drawable/photopage_bottom_button_background" - android:paddingBottom="5dp" - android:paddingLeft="15dp" - android:paddingRight="15dp" - android:paddingTop="5dp" + android:background="?android:attr/selectableItemBackgroundBorderless" android:src="@drawable/ic_menu_tiny_planet" android:visibility="gone" /> diff --git a/res/menu/operations.xml b/res/menu/operations.xml index 639792f32..8651e90bd 100644 --- a/res/menu/operations.xml +++ b/res/menu/operations.xml @@ -19,19 +19,19 @@ But, if share_panorama is set to never, it doesn't seem to get promoted to the action bar and stays on the overflow menu. --> <item android:id="@+id/action_share_panorama" - android:icon="@drawable/ic_menu_share_holo_light" + android:icon="@drawable/ic_menu_share" android:title="@string/share_panorama" android:visible="false" android:actionProviderClass="android.widget.ShareActionProvider" android:showAsAction="ifRoom" /> <item android:id="@+id/action_share" - android:icon="@drawable/ic_menu_share_holo_light" + android:icon="@drawable/ic_menu_share" android:title="@string/share" android:visible="false" android:actionProviderClass="android.widget.ShareActionProvider" android:showAsAction="never" /> <item android:id="@+id/action_delete" - android:icon="@drawable/ic_menu_trash_holo_light" + android:icon="@drawable/ic_menu_delete" android:title="@string/delete" android:visible="false" android:showAsAction="ifRoom" /> |