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

Commit 358411a9 authored by Stevie Kideckel's avatar Stevie Kideckel Committed by Android (Google) Code Review
Browse files

Merge "Use drawable states for list positions instead of swapping drawables" into sc-dev

parents e00d88e3 803927bd

res/layout/widgets_table_container.xml

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<TableLayout

<com.android.launcher3.widget.picker.WidgetsListTableView

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

    android:id="@+id/widgets_table"

    android:layout_width="match_parent"

res/values/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ 


    <dimen name="widget_list_top_bottom_corner_radius">28dp</dimen>

    <dimen name="widget_list_content_corner_radius">4dp</dimen>

    <dimen name="widget_list_content_joined_corner_radius">0dp</dimen>



    <dimen name="widget_list_header_view_vertical_padding">20dp</dimen>

    <dimen name="widget_list_entry_bottom_margin">2dp</dimen>

robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java

+4 −1
Original line number Diff line number Diff line
@@ -107,7 +107,10 @@ public final class WidgetsListHeaderViewHolderBinderTest { 
                /* iconClickListener= */ view -> {},

                /* iconLongClickListener= */ view -> false);

        mViewHolderBinder = new WidgetsListHeaderViewHolderBinder(

                LayoutInflater.from(mTestActivity), mOnHeaderClickListener, widgetsListAdapter);

                LayoutInflater.from(mTestActivity),

                mOnHeaderClickListener,

                new WidgetsListDrawableFactory(mTestActivity),

                widgetsListAdapter);

    }



    @After

robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinderTest.java

+4 −1
Original line number Diff line number Diff line
@@ -107,7 +107,10 @@ public final class WidgetsListSearchHeaderViewHolderBinderTest { 
                /* iconClickListener= */ view -> {},

                /* iconLongClickListener= */ view -> false);

        mViewHolderBinder = new WidgetsListSearchHeaderViewHolderBinder(

                LayoutInflater.from(mTestActivity), mOnHeaderClickListener, widgetsListAdapter);

                LayoutInflater.from(mTestActivity),

                mOnHeaderClickListener,

                new WidgetsListDrawableFactory(mTestActivity),

                widgetsListAdapter);

    }



    @After

robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java

+1 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ public final class WidgetsListTableViewHolderBinderTest { 
                mOnIconClickListener,

                mOnLongClickListener,

                mWidgetPreviewLoader,

                new WidgetsListDrawableFactory(mTestActivity),

                widgetsListAdapter);

    }