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

Style action bar during onResume instead of onCreate

Browse Source 
am: 50eb81f114

Change-Id: I4259ccfcb36b193a2fa4c745338860c407eeedd6
This commit is contained in:
Fan Zhang
2017-08-02 21:01:16 +00:00
committed by android-build-merger
parent 08db3835ee 50eb81f114
commit a31da35b74
3 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/accounts/AccountDetailDashboardFragment.java
View File

@@ -116,7 +116,7 @@ public class AccountDetailDashboardFragment extends DashboardFragment {
mRemoveAccountController = new RemoveAccountPreferenceController(context, this);
controllers.add(mRemoveAccountController);
controllers.add(new AccountHeaderPreferenceController(
context, getLifecycle(), getActivity(), this, getArguments()));
context, getLifecycle(), getActivity(), this /* host */, getArguments()));
return controllers;
}

26
src/com/android/settings/accounts/AccountHeaderPreferenceController.java
View File

@@ -16,6 +16,9 @@
package com.android.settings.accounts;
import static com.android.settings.accounts.AccountDetailDashboardFragment.KEY_ACCOUNT;
import static com.android.settings.accounts.AccountDetailDashboardFragment.KEY_USER_HANDLE;
import android.accounts.Account;
import android.app.Activity;
import android.content.Context;
@@ -31,12 +34,11 @@ import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.accounts.AuthenticatorHelper;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import static com.android.settings.accounts.AccountDetailDashboardFragment.KEY_ACCOUNT;
import static com.android.settings.accounts.AccountDetailDashboardFragment.KEY_USER_HANDLE;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnResume;
public class AccountHeaderPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
implements PreferenceControllerMixin, LifecycleObserver, OnResume {
private static final String KEY_ACCOUNT_HEADER = "account_header";
@@ -44,14 +46,14 @@ public class AccountHeaderPreferenceController extends AbstractPreferenceControl
private final PreferenceFragment mHost;
private final Account mAccount;
private final UserHandle mUserHandle;
private final Lifecycle mLifecycle;
private LayoutPreference mHeaderPreference;
public AccountHeaderPreferenceController(Context context, Lifecycle lifecycle,
Activity activity, PreferenceFragment host, Bundle args) {
super(context);
mActivity = activity;
mHost = host;
mLifecycle = lifecycle;
if (args != null && args.containsKey(KEY_ACCOUNT)) {
mAccount = args.getParcelable(KEY_ACCOUNT);
} else {
@@ -63,6 +65,9 @@ public class AccountHeaderPreferenceController extends AbstractPreferenceControl
} else {
mUserHandle = null;
}
if (lifecycle != null) {
lifecycle.addObserver(this);
}
}
@Override
@@ -78,14 +83,15 @@ public class AccountHeaderPreferenceController extends AbstractPreferenceControl
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
final LayoutPreference headerPreference =
(LayoutPreference) screen.findPreference(KEY_ACCOUNT_HEADER);
mHeaderPreference = (LayoutPreference) screen.findPreference(KEY_ACCOUNT_HEADER);
}
@Override
public void onResume() {
final AuthenticatorHelper helper = new AuthenticatorHelper(mContext, mUserHandle, null);
EntityHeaderController
.newInstance(mActivity, mHost, headerPreference.findViewById(R.id.entity_header))
.setRecyclerView(mHost.getListView(), mLifecycle)
.newInstance(mActivity, mHost, mHeaderPreference.findViewById(R.id.entity_header))
.setLabel(mAccount.name)
.setIcon(helper.getDrawableForType(mContext, mAccount.type))
.done(mActivity, true /* rebindButtons */);