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

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: e811873b4e

Browse Source 
am: f62c6372e8

Change-Id: Ic1434ccc7a4ec01957a7d1219fa5cf6cc1f84948
This commit is contained in:
Alison Cichowlas
2017-06-02 18:52:33 +00:00
committed by android-build-merger
parent 3aeffe5e9d f62c6372e8
commit 0f7e904dbe
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/notification/AppNotificationSettings.java
View File

@@ -93,7 +93,6 @@ public class AppNotificationSettings extends NotificationSettingsBase {
getPreferenceScreen().setOrderingAsAdded(true); getPreferenceScreen().setOrderingAsAdded(true);
setupBlock(); setupBlock();
addHeaderPref(); addHeaderPref();
addAppLinkPref();
mShowLegacyChannelConfig = mBackend.onlyHasDefaultChannel(mAppRow.pkg, mAppRow.uid); mShowLegacyChannelConfig = mBackend.onlyHasDefaultChannel(mAppRow.pkg, mAppRow.uid);
if (mShowLegacyChannelConfig) { if (mShowLegacyChannelConfig) {
@@ -118,6 +117,7 @@ public class AppNotificationSettings extends NotificationSettingsBase {
return; return;
} }
populateChannelList(); populateChannelList();
addAppLinkPref();
} }
}.execute(); }.execute();
} }

2
src/com/android/settings/notification/NotificationSettingsBase.java
View File

@@ -263,7 +263,7 @@ abstract public class NotificationSettingsBase extends SettingsPreferenceFragmen
} }
protected void addAppLinkPref() { protected void addAppLinkPref() {
if (mAppRow.settingsIntent != null) { if (mAppRow.settingsIntent != null && mAppLink == null) {
mAppLink = new Preference(getPrefContext()); mAppLink = new Preference(getPrefContext());
mAppLink.setKey(KEY_APP_LINK); mAppLink.setKey(KEY_APP_LINK);
mAppLink.setOrder(500); mAppLink.setOrder(500);