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

Merge "Eliminate the injection flicker while navigating back" into udc-dev

Browse Source
This commit is contained in:
Jason Chiu
2023-03-02 02:34:14 +00:00
committed by Android (Google) Code Review
parent 926352a668 771a0c0473
commit bfd3c051be
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -260,7 +260,9 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider {
META_DATA_PREFERENCE_TITLE_URI)) { META_DATA_PREFERENCE_TITLE_URI)) {
// Set a placeholder title before starting to fetch real title, this is necessary // Set a placeholder title before starting to fetch real title, this is necessary
// to avoid preference height change. // to avoid preference height change.
preference.setTitle(R.string.summary_placeholder); if (preference.getTitle() == null) {
preference.setTitle(R.string.summary_placeholder);
}
final Uri uri = TileUtils.getCompleteUri(tile, META_DATA_PREFERENCE_TITLE_URI, final Uri uri = TileUtils.getCompleteUri(tile, META_DATA_PREFERENCE_TITLE_URI,
METHOD_GET_DYNAMIC_TITLE); METHOD_GET_DYNAMIC_TITLE);
@@ -288,7 +290,9 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider {
&& tile.getMetaData().containsKey(META_DATA_PREFERENCE_SUMMARY_URI)) { && tile.getMetaData().containsKey(META_DATA_PREFERENCE_SUMMARY_URI)) {
// Set a placeholder summary before starting to fetch real summary, this is necessary // Set a placeholder summary before starting to fetch real summary, this is necessary
// to avoid preference height change. // to avoid preference height change.
preference.setSummary(R.string.summary_placeholder); if (preference.getSummary() == null) {
preference.setSummary(R.string.summary_placeholder);
}
final Uri uri = TileUtils.getCompleteUri(tile, META_DATA_PREFERENCE_SUMMARY_URI, final Uri uri = TileUtils.getCompleteUri(tile, META_DATA_PREFERENCE_SUMMARY_URI,
METHOD_GET_DYNAMIC_SUMMARY); METHOD_GET_DYNAMIC_SUMMARY);