Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
tongchenfei
2020-08-18 09:49:08 +08:00
5 changed files with 27 additions and 13 deletions

View File

@@ -25,7 +25,13 @@ public class AppsAdapter extends BaseAdapter {
private List< AppInfo > mAppInfos;
public AppsAdapter( List< AppInfo > appInfos ) {
this.mAppInfos = new ArrayList<>( appInfos );
this.mAppInfos = new ArrayList<>();
for ( AppInfo appInfo : appInfos ) {
if ( appInfo == null ) {
continue;
}
mAppInfos.add( appInfo );
}
}
@Override

View File

@@ -10,7 +10,7 @@
android:id="@+id/module_apps_id_app_icon"
android:layout_width="@dimen/module_apps_navigation_icon_width"
android:scaleType="fitXY"
android:src="@drawable/module_apps_ic_im"
android:src="@drawable/module_apps_ic_default_icon"
android:layout_height="@dimen/module_apps_navigation_icon_height" />
<TextView