Merge "Fix the injection disappearance in the Account detail page" into tm-qpr-dev am: da28893958
am: f9baa40744
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19781356 Change-Id: I5593f67b9fcc0e2168dbaf8abf4b64447debc093 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -64,8 +64,7 @@ public class AccountDetailDashboardFragment extends DashboardFragment {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreate(Bundle icicle) {
|
public void onCreate(Bundle icicle) {
|
||||||
super.onCreate(icicle);
|
// Initialize the parameters since displayTile() will be called in super.onCreate().
|
||||||
getPreferenceManager().setPreferenceComparisonCallback(null);
|
|
||||||
Bundle args = getArguments();
|
Bundle args = getArguments();
|
||||||
final Activity activity = getActivity();
|
final Activity activity = getActivity();
|
||||||
mUserHandle = Utils.getSecureTargetUser(activity.getActivityToken(),
|
mUserHandle = Utils.getSecureTargetUser(activity.getActivityToken(),
|
||||||
@@ -82,6 +81,9 @@ public class AccountDetailDashboardFragment extends DashboardFragment {
|
|||||||
mAccountType = args.getString(KEY_ACCOUNT_TYPE);
|
mAccountType = args.getString(KEY_ACCOUNT_TYPE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
super.onCreate(icicle);
|
||||||
|
getPreferenceManager().setPreferenceComparisonCallback(null);
|
||||||
mAccountSynController.init(mAccount, mUserHandle);
|
mAccountSynController.init(mAccount, mUserHandle);
|
||||||
mRemoveAccountController.init(mAccount, mUserHandle);
|
mRemoveAccountController.init(mAccount, mUserHandle);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user