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

Merge "Do not show a summary in Tail button preferences if no app found" into udc-qpr-dev am: 82c36c5cb5

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

Change-Id: I10586591c2e6f0ec8efe1ea57e3050463fc0e4a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vania Januar
2023-07-19 15:31:18 +00:00
committed by Automerger Merge Worker
parent a386366550 82c36c5cb5
commit 53988c6fe7
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/connecteddevice/stylus/StylusDevicesController.java
View File

@@ -124,7 +124,7 @@ public class StylusDevicesController extends AbstractPreferenceController implem
try {
ApplicationInfo ai = pm.getApplicationInfo(packageName,
PackageManager.ApplicationInfoFlags.of(0));
appName = ai == null ? packageName : pm.getApplicationLabel(ai).toString();
appName = ai == null ? "" : pm.getApplicationLabel(ai).toString();
} catch (PackageManager.NameNotFoundException e) {
Log.e(TAG, "Notes role package not found.");
}

14
tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java
View File

@@ -272,6 +272,20 @@ public class StylusDevicesControllerTest {
NOTES_APP_LABEL.toString()));
}
@Test
public void defaultNotesPreference_noApplicationInfo_showsBlankSummary()
throws PackageManager.NameNotFoundException {
when(mPm.getApplicationInfo(eq(NOTES_PACKAGE_NAME),
any(PackageManager.ApplicationInfoFlags.class))).thenReturn(null);
showScreen(mController);
Preference defaultNotesPref = mPreferenceContainer.getPreference(0);
assertThat(defaultNotesPref.getTitle().toString()).isEqualTo(
mContext.getString(R.string.stylus_default_notes_app));
assertThat(defaultNotesPref.getSummary().toString()).isEqualTo("");
}
@Test
public void defaultNotesPreference_roleHolderChanges_updatesPreference() {
showScreen(mController);