Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 982a13a6 authored by Vania Januar's avatar Vania Januar Committed by Automerger Merge Worker
Browse files

Merge "Do not show a summary in Tail button preferences if no app found" into... 

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

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



Change-Id: I1cdf019d8dd73e233e647670af4c6d8d48bf9851
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bc8d6ba1 53988c6f

src/com/android/settings/connecteddevice/stylus/StylusDevicesController.java

+1 −1
Original line number Diff line number Diff line
@@ -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.");

        }

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

+14 −0
Original line number Diff line number Diff line
@@ -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);