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

Commit f62c6372 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

Change-Id: Ia4def66e47faf702c22a4e3aba04d52965052aa8
parents f2379e2e e811873b

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

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

        setupBlock();

        addHeaderPref();

        addAppLinkPref();



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

        if (mShowLegacyChannelConfig) {
@@ -120,6 +119,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);