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

Commit e8d37d9d authored by Doris Ling's avatar Doris Ling Committed by android-build-merger
Browse files

Merge "Add background color to suggestion/condition view." into oc-dr1-dev 

am: edad87c4

Change-Id: I612dbb1e3347e2052eec5df9b10b43d679b8585b
parents c2448ed5 edad87c4

res/layout/suggestion_condition_container.xml

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
            android:id="@+id/data"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:background="@color/material_grey_300"

            android:scrollbars="none"/>



    </android.support.v7.widget.CardView>

src/com/android/settings/dashboard/conditional/ConditionAdapter.java

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ public class ConditionAdapter extends RecyclerView.Adapter<DashboardItemHolder> 


        @Override

        public int getSwipeDirs(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {

            return viewHolder.getItemViewType() == R.layout.condition_tile_new_ui

            return viewHolder.getItemViewType() == R.layout.condition_tile

                    ? super.getSwipeDirs(recyclerView, viewHolder) : 0;

        }
@@ -121,7 +121,7 @@ public class ConditionAdapter extends RecyclerView.Adapter<DashboardItemHolder> 


    @Override

    public int getItemViewType(int position) {

        return R.layout.condition_tile_new_ui;

        return R.layout.condition_tile;

    }



    @Override