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

Change to use new suggestion/condition UI.

Browse Source 
Change to always use the new UI that combines the suggestion and conditions,
and remove all codes relating to the old UI.

Fix: 37645754
Fix: 62621808
Test: make RunSettingsRoboTests

Merged-In: I3421a9e5182f6606843392d6fae8b9f07c5f2e46
Change-Id: I5ef169a563166520dad0ac44f6780da814e2f1f7
This commit is contained in:
Doris Ling
2017-06-16 14:13:45 -07:00
parent a6b24388fc
commit b99af0e4a2
20 changed files with 278 additions and 1064 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,6 @@ import android.view.View;
import android.view.ViewGroup;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.R.layout;
import com.android.settings.SettingsActivity;
import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.dashboard.DashboardAdapter.DashboardItemHolder;
@@ -114,7 +113,10 @@ public class SuggestionAdapter extends RecyclerView.Adapter<DashboardItemHolder>
@Override
public int getItemViewType(int position) {
return layout.suggestion_tile_new_ui;
Tile suggestion = getSuggestion(position);
return suggestion.remoteViews != null
? R.layout.suggestion_tile_card
: R.layout.suggestion_tile_new_ui;
}
@Override