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

Move styleActionBar to onStart()

Browse Source 
Change-Id: I002c266acc0e1095269e92eb7988b1ab505e48ff
Fixes: 72097389
Test: robotest
This commit is contained in:
Fan Zhang
2018-01-17 16:52:30 -08:00
parent 85cd77c9f2
commit 9de4999015
5 changed files with 77 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AndroidManifest.xml
View File

@@ -1199,7 +1199,6 @@
</activity>
<activity android:name="Settings$NotificationStationActivity"
android:theme="@style/Theme.NotificationStation"
android:label="@string/notification_log_title"
android:taskAffinity="">
<intent-filter>

8
res/values/themes.xml
View File

@@ -267,14 +267,6 @@
<item name="android:actionBarStyle">@style/Theme.ActionBar</item>
</style>
<style name="Theme.NotificationStation" parent="@style/Theme.Settings">
<!-- Redefine the ActionBar style for contentInsetStart -->
<item name="android:actionBarStyle">@style/Theme.ActionBar.SubSettings</item>
<item name="*android:actionBarSize">@dimen/actionbar_size</item>
<item name="preferenceBackgroundColor">@android:color/transparent</item>
</style>
<style name="Theme.ConfirmDeviceCredentials" parent="Theme.SubSettings">
<item name="confirmDeviceCredentialsSideMargin">@dimen/confirm_credentials_side_margin</item>
<item name="confirmDeviceCredentialsTopMargin">@dimen/confirm_credentials_top_margin</item>

25
src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java
View File

@@ -29,9 +29,11 @@ import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
public class AppHeaderViewPreferenceController extends BasePreferenceController
implements AppInfoDashboardFragment.Callback {
implements AppInfoDashboardFragment.Callback, LifecycleObserver, OnStart {
private static final String KEY_HEADER = "header_view";
@@ -40,12 +42,17 @@ public class AppHeaderViewPreferenceController extends BasePreferenceController
private final String mPackageName;
private final Lifecycle mLifecycle;
private EntityHeaderController mEntityHeaderController;
public AppHeaderViewPreferenceController(Context context, AppInfoDashboardFragment parent,
String packageName, Lifecycle lifecycle) {
super(context, KEY_HEADER);
mParent = parent;
mPackageName = packageName;
mLifecycle = lifecycle;
if (mLifecycle != null) {
mLifecycle.addObserver(this);
}
}
@Override
@@ -58,17 +65,21 @@ public class AppHeaderViewPreferenceController extends BasePreferenceController
super.displayPreference(screen);
mHeader = (LayoutPreference) screen.findPreference(KEY_HEADER);
final Activity activity = mParent.getActivity();
EntityHeaderController
mEntityHeaderController = EntityHeaderController
.newInstance(activity, mParent, mHeader.findViewById(R.id.entity_header))
.setRecyclerView(mParent.getListView(), mLifecycle)
.setPackageName(mPackageName)
.setHasAppInfoLink(false)
.setButtonActions(EntityHeaderController.ActionType.ACTION_APP_PREFERENCE,
EntityHeaderController.ActionType.ACTION_NONE)
.styleActionBar(activity)
.bindHeaderButtons();
}
@Override
public void onStart() {
mEntityHeaderController
.setRecyclerView(mParent.getListView(), mLifecycle)
.styleActionBar(mParent.getActivity());
}
@Override
public void refreshUi() {
setAppLabelAndIcon(mParent.getPackageInfo(), mParent.getAppEntry());
@@ -80,13 +91,11 @@ public class AppHeaderViewPreferenceController extends BasePreferenceController
final boolean isInstantApp = AppUtils.isInstant(pkgInfo.applicationInfo);
final CharSequence summary = isInstantApp
? null : mContext.getString(Utils.getInstallationStatus(appEntry.info));
EntityHeaderController
.newInstance(activity, mParent, mHeader.findViewById(R.id.entity_header))
mEntityHeaderController
.setLabel(appEntry)
.setIcon(appEntry)
.setSummary(summary)
.setIsInstantApp(isInstantApp)
.done(activity, false /* rebindActions */);
}
}

14
src/com/android/settings/widget/EntityHeaderController.java
View File

@@ -16,6 +16,10 @@
package com.android.settings.widget;
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
.ACTION_OPEN_APP_NOTIFICATION_SETTING;
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_OPEN_APP_SETTING;
import android.annotation.IdRes;
import android.annotation.UserIdInt;
import android.app.ActionBar;
@@ -27,6 +31,7 @@ import android.content.pm.PackageInfo;
import android.content.pm.ResolveInfo;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.UserHandle;
import android.support.annotation.IntDef;
import android.support.annotation.VisibleForTesting;
@@ -54,10 +59,6 @@ import com.android.settingslib.core.lifecycle.Lifecycle;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
.ACTION_OPEN_APP_NOTIFICATION_SETTING;
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_OPEN_APP_SETTING;
public class EntityHeaderController {
@IntDef({ActionType.ACTION_NONE,
@@ -291,6 +292,11 @@ public class EntityHeaderController {
return;
}
/**
* Styles the action bar (elevation, scrolling behaviors, color, etc).
* <p/>
* This method must be called after {@link Fragment#onCreate(Bundle)}.
*/
public EntityHeaderController styleActionBar(Activity activity) {
if (activity == null) {
Log.w(TAG, "No activity, cannot style actionbar.");

65
tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java
View File

@@ -16,15 +16,25 @@
package com.android.settings.applications.appinfo;
import static android.arch.lifecycle.Lifecycle.Event.ON_START;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
import android.app.ActionBar;
import android.app.Activity;
import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.graphics.drawable.Drawable;
import android.support.v7.preference.PreferenceScreen;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;
@@ -33,12 +43,14 @@ import com.android.settings.TestConfig;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@@ -48,19 +60,34 @@ public class AppHeaderViewPreferenceControllerTest {
@Mock
private AppInfoDashboardFragment mFragment;
@Mock
private Activity mActivity;
private PreferenceScreen mScreen;
@Mock
private LayoutPreference mPreference;
private Context mContext;
private Activity mActivity;
private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
private View mHeader;
private AppHeaderViewPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mActivity = spy(Robolectric.buildActivity(Activity.class).get());
mLifecycleOwner = () -> mLifecycle;
mLifecycle = new Lifecycle(mLifecycleOwner);
mHeader = LayoutInflater.from(mContext).inflate(R.layout.settings_entity_header, null);
when(mFragment.getActivity()).thenReturn(mActivity);
when(mActivity.getApplicationContext()).thenReturn(mContext);
mController = new AppHeaderViewPreferenceController(mContext, mFragment, "Package1", null);
when(mScreen.findPreference(anyString())).thenReturn(mPreference);
when(mPreference.findViewById(R.id.entity_header)).thenReturn(mHeader);
mController = new AppHeaderViewPreferenceController(mContext, mFragment, "Package1",
mLifecycle);
}
@Test
@@ -77,21 +104,29 @@ public class AppHeaderViewPreferenceControllerTest {
when(mFragment.getAppEntry()).thenReturn(appEntry);
when(mFragment.getPackageInfo()).thenReturn(packageInfo);
final PreferenceScreen screen = mock(PreferenceScreen.class);
final LayoutPreference preference = mock(LayoutPreference.class);
when(screen.findPreference(mController.getPreferenceKey())).thenReturn(preference);
final View header = mock(View.class);
when(preference.findViewById(R.id.entity_header)).thenReturn(header);
final TextView title = mock(TextView.class);
when(header.findViewById(R.id.entity_header_title)).thenReturn(title);
final TextView summary = mock(TextView.class);
when(header.findViewById(R.id.entity_header_summary)).thenReturn(summary);
mController.displayPreference(screen);
final TextView title = mHeader.findViewById(R.id.entity_header_title);
final TextView summary = mHeader.findViewById(R.id.entity_header_summary);
mController.displayPreference(mScreen);
mController.refreshUi();
verify(title).setText(appLabel);
verify(summary).setText(mContext.getString(R.string.installed));
assertThat(title.getText()).isEqualTo(appLabel);
assertThat(summary.getText()).isEqualTo(mContext.getString(R.string.installed));
}
@Test
public void onStart_shouldStyleActionBar() {
final ActionBar actionBar = mock(ActionBar.class);
when(mActivity.getActionBar()).thenReturn(actionBar);
mController.displayPreference(mScreen);
verifyZeroInteractions(actionBar);
mLifecycle.handleLifecycleEvent(ON_START);
verify(actionBar).setBackgroundDrawable(any(Drawable.class));
}
}