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

Merge "Fix some animation janks during code start."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-21 21:57:01 +00:00
committed by Android (Google) Code Review
parent 979b0e6cf5 320d60f0ad
commit f38ad51d4e
6 changed files with 79 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
View File

@@ -28,6 +28,7 @@ import android.text.TextUtils;
import android.util.Log;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
@@ -124,7 +125,11 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider {
} else {
pref.setKey(getDashboardKeyForTile(tile));
}
pref.setSummary(tile.summary);
if (tile.summary != null) {
pref.setSummary(tile.summary);
} else {
pref.setSummary(R.string.summary_placeholder);
}
if (tile.icon != null) {
pref.setIcon(tile.icon.loadDrawable(activity));
}