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

Commit 0f7e904d authored by Alison Cichowlas's avatar Alison Cichowlas Committed by android-build-merger
Browse files

Merge "Delay adding app settings link until data fetch returns, to avoid... 

Merge "Delay adding app settings link until data fetch returns, to avoid reordering/visible misplaced "additional settings in the app" during transition." into oc-dev am: e811873b
am: f62c6372

Change-Id: Ic1434ccc7a4ec01957a7d1219fa5cf6cc1f84948
parents 3aeffe5e f62c6372

src/com/android/settings/notification/AppNotificationSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ public class AppNotificationSettings extends NotificationSettingsBase { 
        getPreferenceScreen().setOrderingAsAdded(true);

        setupBlock();

        addHeaderPref();

        addAppLinkPref();



        mShowLegacyChannelConfig = mBackend.onlyHasDefaultChannel(mAppRow.pkg, mAppRow.uid);

        if (mShowLegacyChannelConfig) {
@@ -118,6 +117,7 @@ public class AppNotificationSettings extends NotificationSettingsBase { 
                        return;

                    }

                    populateChannelList();

                    addAppLinkPref();

                }

            }.execute();

        }

src/com/android/settings/notification/NotificationSettingsBase.java

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ abstract public class NotificationSettingsBase extends SettingsPreferenceFragmen 
    }



    protected void addAppLinkPref() {

        if (mAppRow.settingsIntent != null) {

        if (mAppRow.settingsIntent != null && mAppLink == null) {

            mAppLink = new Preference(getPrefContext());

            mAppLink.setKey(KEY_APP_LINK);

            mAppLink.setOrder(500);