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

Merge "Fix the unaligned title of injected items" into sc-dev am: d32e0cf8a6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408661

Change-Id: I8e292ee7bd037b049406973bea8242f92be9c723
This commit is contained in:
TreeHugger Robot
2021-05-03 07:01:34 +00:00
committed by Automerger Merge Worker
parent dc9beae9ec d32e0cf8a6
commit a130f44094
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -280,8 +280,6 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider {
METHOD_GET_DYNAMIC_SUMMARY); METHOD_GET_DYNAMIC_SUMMARY);
refreshSummary(uri, preference); refreshSummary(uri, preference);
return createDynamicDataObserver(METHOD_GET_DYNAMIC_SUMMARY, uri, preference); return createDynamicDataObserver(METHOD_GET_DYNAMIC_SUMMARY, uri, preference);
} else {
preference.setSummary(R.string.summary_placeholder);
} }
return null; return null;
} }

5
tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
View File

@@ -285,7 +285,7 @@ public class DashboardFeatureProviderImplTest {
} }
@Test @Test
public void bindPreference_noSummary_shouldSetSummaryToPlaceholder() { public void bindPreference_noSummary_shouldSetNullSummary() {
final Preference preference = new Preference(RuntimeEnvironment.application); final Preference preference = new Preference(RuntimeEnvironment.application);
mActivityInfo.metaData.remove(META_DATA_PREFERENCE_SUMMARY); mActivityInfo.metaData.remove(META_DATA_PREFERENCE_SUMMARY);
@@ -295,8 +295,7 @@ public class DashboardFeatureProviderImplTest {
MetricsEvent.VIEW_UNKNOWN, preference, tile, null /*key */, MetricsEvent.VIEW_UNKNOWN, preference, tile, null /*key */,
Preference.DEFAULT_ORDER); Preference.DEFAULT_ORDER);
assertThat(preference.getSummary()) assertThat(preference.getSummary()).isNull();
.isEqualTo(RuntimeEnvironment.application.getString(R.string.summary_placeholder));
} }
@Test @Test