PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: edad87c4b0

Change-Id: I612dbb1e3347e2052eec5df9b10b43d679b8585b
This commit is contained in:
Doris Ling
2017-07-17 22:24:53 +00:00
committed by android-build-merger
parent c2448ed53d edad87c4b0
commit e8d37d9d75
10 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/dashboard/conditional/ConditionAdapter.java
View File

@@ -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

4
src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
View File

@@ -115,8 +115,8 @@ public class SuggestionAdapter extends RecyclerView.Adapter<DashboardItemHolder>
public int getItemViewType(int position) {
Tile suggestion = getSuggestion(position);
return suggestion.remoteViews != null
? R.layout.suggestion_tile_card
: R.layout.suggestion_tile_new_ui;
? R.layout.suggestion_tile_remote_container
: R.layout.suggestion_tile;
}
@Override

4
src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
View File

@@ -66,8 +66,8 @@ public class SuggestionDismissController extends ItemTouchHelper.SimpleCallback
@Override
public int getSwipeDirs(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
final int layoutId = viewHolder.getItemViewType();
if (layoutId == R.layout.suggestion_tile_new_ui
|| layoutId == R.layout.suggestion_tile_card) {
if (layoutId == R.layout.suggestion_tile
|| layoutId == R.layout.suggestion_tile_remote_container) {
// Only return swipe direction for suggestion tiles. All other types are not swipeable.
return super.getSwipeDirs(recyclerView, viewHolder);
}