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

Commit d1c41a30 authored by Fan Zhang's avatar Fan Zhang
Browse files

Only show "reset app preference" actionbar menu in app info 

Because it doesn't make sense to show it in other types of app
list view.

Change-Id: Ia4f84812a6f0acc434f770b026e5ed550714087a
Fix: 36110694
Test: robotests
parent d0417e42

src/com/android/settings/applications/ManageApplications.java

+2 −1
Original line number Diff line number Diff line
@@ -625,7 +625,6 @@ public class ManageApplications extends InstrumentedPreferenceFragment 
        if (mOptionsMenu == null) {

            return;

        }

        final Context context = getActivity();

        mOptionsMenu.findItem(R.id.advanced).setVisible(false);



        mOptionsMenu.findItem(R.id.sort_order_alpha).setVisible(mListType == LIST_TYPE_STORAGE
@@ -637,6 +636,8 @@ public class ManageApplications extends InstrumentedPreferenceFragment 
                && mListType != LIST_TYPE_HIGH_POWER);

        mOptionsMenu.findItem(R.id.hide_system).setVisible(mShowSystem

                && mListType != LIST_TYPE_HIGH_POWER);



        mOptionsMenu.findItem(R.id.reset_app_preferences).setVisible(mListType == LIST_TYPE_MAIN);

    }



    @Override

tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java

+48 −6
Original line number Diff line number Diff line
@@ -20,26 +20,33 @@ import android.app.Activity; 
import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.os.Looper;

import android.view.Menu;

import android.view.MenuItem;

import android.widget.TextView;



import com.android.settings.R;

import com.android.settings.Settings;

import com.android.settings.SettingsRobolectricTestRunner;

import com.android.settings.TestConfig;

import com.android.settings.core.lifecycle.Lifecycle;

import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;

import com.android.settings.testutils.shadow.SettingsShadowResources;

import com.android.settings.testutils.shadow.SettingsShadowResources.SettingsShadowTheme;

import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;

import com.android.settings.testutils.shadow.ShadowEventLogWriter;

import com.android.settingslib.applications.ApplicationsState;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.annotation.Config;

import org.robolectric.fakes.RoboMenuItem;

import org.robolectric.util.ReflectionHelpers;



import static com.google.common.truth.Truth.assertThat;

import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;
@@ -59,16 +66,20 @@ import static org.mockito.Mockito.when; 
        })

public class ManageApplicationsTest {



    @Mock private ApplicationsState mState;

    @Mock private ApplicationsState.Session mSession;



    @Mock

    private ApplicationsState mState;

    @Mock

    private ApplicationsState.Session mSession;

    @Mock

    private Menu mMenu;

    private MenuItem mAppReset;

    private Looper mBgLooper;

    private ManageApplications mFragment;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);



        mAppReset = new RoboMenuItem(R.id.reset_app_preferences);

        ReflectionHelpers.setStaticField(ApplicationsState.class, "sInstance", mState);

        when(mState.newSession(any())).thenReturn(mSession);

        mBgLooper = Looper.myLooper();
@@ -100,4 +111,35 @@ public class ManageApplicationsTest { 


        verify(view).setText(R.string.disabled);

    }



    @Test

    public void updateMenu_mainListType_showAppReset() {

        setUpOptionMenus();

        ReflectionHelpers.setField(mFragment, "mListType", ManageApplications.LIST_TYPE_MAIN);

        ReflectionHelpers.setField(mFragment, "mOptionsMenu", mMenu);



        mFragment.updateOptionsMenu();

        assertThat(mMenu.findItem(R.id.reset_app_preferences).isVisible()).isTrue();

    }



    @Test

    public void updateMenu_batteryListType_hideAppReset() {

        setUpOptionMenus();

        ReflectionHelpers.setField(mFragment, "mListType", ManageApplications.LIST_TYPE_HIGH_POWER);

        ReflectionHelpers.setField(mFragment, "mOptionsMenu", mMenu);



        mFragment.updateOptionsMenu();

        assertThat(mMenu.findItem(R.id.reset_app_preferences).isVisible()).isFalse();

    }



    private void setUpOptionMenus() {

        when(mMenu.findItem(anyInt())).thenAnswer(invocation -> {

            final Object[] args = invocation.getArguments();

            final int id = (int) args[0];

            if (id == mAppReset.getItemId()) {

                return mAppReset;

            }

            return new RoboMenuItem(id);

        });

    }

}