diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable-v24/ic_setup_shadow.xml (renamed from res/drawable-v24/ic_info_shadow.xml) | 2 | ||||
| -rw-r--r-- | res/drawable/ic_setting.xml | 5 | ||||
| -rw-r--r-- | res/layout/drop_target_bar.xml | 12 | ||||
| -rw-r--r-- | res/values/config.xml | 2 | ||||
| -rw-r--r-- | res/values/drawables.xml | 2 |
5 files changed, 7 insertions, 16 deletions
diff --git a/res/drawable-v24/ic_info_shadow.xml b/res/drawable-v24/ic_setup_shadow.xml index 1fe2c46b4..10aeee6e0 100644 --- a/res/drawable-v24/ic_info_shadow.xml +++ b/res/drawable-v24/ic_setup_shadow.xml @@ -15,5 +15,5 @@ --> <com.android.launcher3.graphics.ShadowDrawable xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_info_no_shadow" + android:src="@drawable/ic_setting" android:elevation="@dimen/drop_target_shadow_elevation" /> diff --git a/res/drawable/ic_setting.xml b/res/drawable/ic_setting.xml index 08eba253d..33cd6ce34 100644 --- a/res/drawable/ic_setting.xml +++ b/res/drawable/ic_setting.xml @@ -17,9 +17,10 @@ Copyright (C) 2016 The Android Open Source Project android:width="@dimen/options_menu_icon_size" android:height="@dimen/options_menu_icon_size" android:viewportWidth="48.0" - android:viewportHeight="48.0"> + android:viewportHeight="48.0" + android:tint="?android:attr/textColorPrimary" > <path - android:fillColor="?android:attr/textColorPrimary" + android:fillColor="#FFFFFFFF" android:pathData="M42.8,28.4l-3.88-2.9c0.06-0.5,0.08-1,0.08-1.52s-0.02-1.02-0.08-1.52l3.88-2.86c0.84-0.62,1.04-1.88, 0.48-2.82l-3.2-5.52c-0.56-0.96-1.76-1.4-2.72-1l-4.28,1.82c-0.96-0.74-2.02-1.36-3.14-1.84l-0.54-4.4C29.28,4.8,28.28,4, 27.18,4h-6.36c-1.1,0-2.1,0.8-2.22,1.84l-0.52,4.38c-1.14,0.48-2.2,1.1-3.16,1.84l-4.28-1.82c-0.96-0.4-2.16,0.04-2.72, diff --git a/res/layout/drop_target_bar.xml b/res/layout/drop_target_bar.xml index d376bcf09..2f21c605a 100644 --- a/res/layout/drop_target_bar.xml +++ b/res/layout/drop_target_bar.xml @@ -32,18 +32,8 @@ android:gravity="center" android:text="@string/remove_drop_target_label" /> - <!-- App Info --> - <com.android.launcher3.InfoDropTarget - android:id="@+id/info_target_text" - style="@style/DropTargetButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:gravity="center" - android:text="@string/app_info_drop_target_label" /> - <!-- Uninstall target --> - <com.android.launcher3.UninstallDropTarget + <com.android.launcher3.SecondaryDropTarget android:id="@+id/uninstall_target_text" style="@style/DropTargetButton" android:layout_width="wrap_content" diff --git a/res/values/config.xml b/res/values/config.xml index 6821b5906..3f727cf38 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -127,7 +127,7 @@ <!-- Accessibility actions --> <item type="id" name="action_remove" /> <item type="id" name="action_uninstall" /> - <item type="id" name="action_info" /> + <item type="id" name="action_reconfigure" /> <item type="id" name="action_add_to_workspace" /> <item type="id" name="action_move" /> <item type="id" name="action_move_to_workspace" /> diff --git a/res/values/drawables.xml b/res/values/drawables.xml index fea17b153..1367174b1 100644 --- a/res/values/drawables.xml +++ b/res/values/drawables.xml @@ -14,7 +14,7 @@ limitations under the License. --> <resources> - <drawable name="ic_info_shadow">@drawable/ic_info_no_shadow</drawable> + <drawable name="ic_setup_shadow">@drawable/ic_setting</drawable> <drawable name="ic_remove_shadow">@drawable/ic_remove_no_shadow</drawable> <drawable name="ic_uninstall_shadow">@drawable/ic_uninstall_no_shadow</drawable> </resources>
\ No newline at end of file |