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

Merge "Create version 2 of InstalledAppDetails"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-11-18 01:23:43 +00:00
committed by Android (Google) Code Review
parent eacfbf5221 529e207986
commit 01a225fd7f
12 changed files with 1782 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/robotests/assets/grandfather_not_implementing_indexable
View File

@@ -47,6 +47,7 @@ com.android.settings.applications.RunningServices
com.android.settings.applications.ConfirmConvertToFbe
com.android.settings.deviceinfo.PublicVolumeSettings
com.android.settings.applications.InstalledAppDetails
com.android.settings.applications.AppInfoDashboardFragment
com.android.settings.accessibility.ToggleAccessibilityServicePreferenceFragment
com.android.settings.print.PrintServiceSettingsFragment
com.android.settings.wfd.WifiDisplaySettings

14
tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java
View File

@@ -35,11 +35,14 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceCategory;
import android.support.v7.preference.PreferenceScreen;
import android.text.TextUtils;
import android.util.FeatureFlagUtils;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.TestConfig;
import com.android.settings.applications.InstalledAppDetails;
import com.android.settings.applications.AppInfoDashboardFragment;
import com.android.settings.core.FeatureFlags;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.AppPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -167,8 +170,15 @@ public class RecentLocationRequestPreferenceControllerTest {
preference.performClick();
verify(activity).startPreferencePanelAsUser(any(), eq(InstalledAppDetails.class.getName()),
any(Bundle.class), anyInt(), any(), any());
if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.APP_INFO_V2)) {
verify(activity).startPreferencePanelAsUser(any(),
eq(AppInfoDashboardFragment.class.getName()),
any(Bundle.class), anyInt(), any(), any());
} else {
verify(activity).startPreferencePanelAsUser(any(),
eq(InstalledAppDetails.class.getName()),
any(Bundle.class), anyInt(), any(), any());
}
}
private static ArgumentMatcher<Preference> titleMatches(String expected) {