Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f10d3a04 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Adding support for hiding widgets from the widget tray and... 

Merge "Revert "Adding support for hiding widgets from the widget tray and reconfiguring widgets"" into ub-launcher3-master
parents 85f1eed5 f502e5fa

res/drawable-v24/ic_setup_shadow.xml→res/drawable-v24/ic_info_shadow.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,5 +15,5 @@ 
-->

<com.android.launcher3.graphics.ShadowDrawable

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:src="@drawable/ic_setting"

    android:src="@drawable/ic_info_no_shadow"

    android:elevation="@dimen/drop_target_shadow_elevation" />

res/drawable/ic_setting.xml

+2 −3
Original line number Diff line number Diff line
@@ -17,10 +17,9 @@ 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:tint="?android:attr/textColorPrimary" >

        android:viewportHeight="48.0">

    <path

        android:fillColor="#FFFFFFFF"

        android:fillColor="?android:attr/textColorPrimary"

        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,

res/layout/drop_target_bar.xml

+11 −1
Original line number Diff line number Diff line
@@ -32,8 +32,18 @@ 
        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.SecondaryDropTarget

    <com.android.launcher3.UninstallDropTarget

        android:id="@+id/uninstall_target_text"

        style="@style/DropTargetButton"

        android:layout_width="wrap_content"

res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ 
<!-- Accessibility actions -->

    <item type="id" name="action_remove" />

    <item type="id" name="action_uninstall" />

    <item type="id" name="action_reconfigure" />

    <item type="id" name="action_info" />

    <item type="id" name="action_add_to_workspace" />

    <item type="id" name="action_move" />

    <item type="id" name="action_move_to_workspace" />

res/values/drawables.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
     limitations under the License.

-->

<resources>

    <drawable name="ic_setup_shadow">@drawable/ic_setting</drawable>

    <drawable name="ic_info_shadow">@drawable/ic_info_no_shadow</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