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

More renaming in DashboardFragment

Browse Source 
getPreferenceControllers() -> createPreferenceControllers() for the same
reason as in ag/3647936

Bug: 73668763
Test: robotests
Change-Id: I97670a91a2a38d1c844d1b9d37f4222c5e6f45a0
This commit is contained in:
Fan Zhang
2018-02-22 13:51:41 -08:00
parent aed8994f6f
commit f7843adabd
87 changed files with 110 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/DisplaySettingsTest.java
View File

@@ -32,7 +32,7 @@ public class DisplaySettingsTest {
fragment.getPreferenceScreenResId());
final List<String> preferenceKeys = new ArrayList<>();
for (AbstractPreferenceController controller : fragment.getPreferenceControllers(context)) {
for (AbstractPreferenceController controller : fragment.createPreferenceControllers(context)) {
preferenceKeys.add(controller.getPreferenceKey());
}
// Nightmode is currently hidden

4
tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java
View File

@@ -24,8 +24,6 @@ import static com.android.settings.applications.appinfo.AppInfoDashboardFragment
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
@@ -255,7 +253,7 @@ public final class AppInfoDashboardFragmentTest {
public void getPreferenceControllers_noPackageInfo_shouldReturnNull() {
doNothing().when(mFragment).retrieveAppEntry();
assertThat(mFragment.getPreferenceControllers(mShadowContext)).isNull();
assertThat(mFragment.createPreferenceControllers(mShadowContext)).isNull();
}
@Test

2
tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java
View File

@@ -208,7 +208,7 @@ public class DeviceListPreferenceFragmentTest {
}
@Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return null;
}
}

2
tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java
View File

@@ -57,7 +57,7 @@ public class DashboardFragmentSearchIndexProviderInspector {
}
try {
controllersFromFragment =
((DashboardFragment) fragment).getPreferenceControllers(context);
((DashboardFragment) fragment).createPreferenceControllers(context);
} catch (Throwable e) {
// Can't do much with exception, assume the test passed.
return true;

8
tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
View File

@@ -86,7 +86,7 @@ public class DashboardFragmentTest {
final TestPreferenceController controller = new TestPreferenceController(mContext);
mTestFragment.addPreferenceController(controller);
final TestPreferenceController retrievedController = mTestFragment.getPreferenceController
final TestPreferenceController retrievedController = mTestFragment.use
(TestPreferenceController.class);
assertThat(controller).isSameAs(retrievedController);
@@ -99,7 +99,7 @@ public class DashboardFragmentTest {
final TestPreferenceController controller2 = new TestPreferenceController(mContext);
mTestFragment.addPreferenceController(controller2);
final TestPreferenceController retrievedController = mTestFragment.getPreferenceController
final TestPreferenceController retrievedController = mTestFragment.use
(TestPreferenceController.class);
assertThat(controller1).isSameAs(retrievedController);
@@ -135,7 +135,7 @@ public class DashboardFragmentTest {
@Test
public void onAttach_shouldCreatePlaceholderPreferenceController() {
final AbstractPreferenceController controller = mTestFragment.getPreferenceController(
final AbstractPreferenceController controller = mTestFragment.use(
DashboardTilePlaceholderPreferenceController.class);
assertThat(controller).isNotNull();
@@ -289,7 +289,7 @@ public class DashboardFragmentTest {
}
@Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return mControllers;
}

2
tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java
View File

@@ -84,7 +84,7 @@ public class ApplicationListFragmentTest {
@Test
public void getPreferenceControllers() {
final List<AbstractPreferenceController> controllers = mFragment.getPreferenceControllers(
final List<AbstractPreferenceController> controllers = mFragment.createPreferenceControllers(
mContext);
assertThat(controllers).isNotNull();
assertThat(controllers.size()).isEqualTo(1);

2
tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
View File

@@ -90,7 +90,7 @@ public final class EnterprisePrivacySettingsTest {
@Test
public void getPreferenceControllers() throws Exception {
final List<AbstractPreferenceController> controllers = mSettings.getPreferenceControllers(
final List<AbstractPreferenceController> controllers = mSettings.createPreferenceControllers(
ShadowApplication.getInstance().getApplicationContext());
verifyPreferenceControllers(controllers);
}

2
tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java
View File

@@ -80,7 +80,7 @@ public class EnterpriseSetDefaultAppsListFragmentTest {
@Test
public void getPreferenceControllers() {
final List<AbstractPreferenceController> controllers = mFragment.getPreferenceControllers(mContext);
final List<AbstractPreferenceController> controllers = mFragment.createPreferenceControllers(mContext);
assertThat(controllers).isNotNull();
assertThat(controllers.size()).isEqualTo(1);
int position = 0;

2
tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java
View File

@@ -94,7 +94,7 @@ public class PowerUsageBaseTest {
}
@Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return null;
}

2
tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacyTest.java
View File

@@ -408,7 +408,7 @@ public class PowerUsageSummaryLegacyTest {
fragment.getPreferenceScreenResId());
final List<String> preferenceKeys = new ArrayList<>();
for (AbstractPreferenceController controller : fragment.getPreferenceControllers(context)) {
for (AbstractPreferenceController controller : fragment.createPreferenceControllers(context)) {
preferenceKeys.add(controller.getPreferenceKey());
}

7
tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
View File

@@ -37,19 +37,14 @@ import android.os.Bundle;
import android.os.PowerManager;
import android.support.v7.preference.PreferenceScreen;
import android.util.SparseArray;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.TestConfig;
import com.android.settings.Utils;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.fuelgauge.anomaly.Anomaly;
import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy;
@@ -222,7 +217,7 @@ public class PowerUsageSummaryTest {
fragment.getPreferenceScreenResId());
final List<String> preferenceKeys = new ArrayList<>();
for (AbstractPreferenceController controller : fragment.getPreferenceControllers(context)) {
for (AbstractPreferenceController controller : fragment.createPreferenceControllers(context)) {
preferenceKeys.add(controller.getPreferenceKey());
}

2
tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java
View File

@@ -59,7 +59,7 @@ public class SwipeToNotificationSettingsTest {
@Test
public void testGetPreferenceControllers_shouldAllBeCreated() {
final List<AbstractPreferenceController> controllers =
mFragment.getPreferenceControllers(mContext);
mFragment.createPreferenceControllers(mContext);
assertThat(controllers.isEmpty()).isFalse();
}

6
tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
View File

@@ -107,7 +107,7 @@ public class LanguageAndInputSettingsTest {
@Test
public void testGetPreferenceControllers_shouldRegisterLifecycleObservers() {
final List<AbstractPreferenceController> controllers =
mFragment.getPreferenceControllers(mActivity);
mFragment.createPreferenceControllers(mActivity);
int lifecycleObserverCount = 0;
for (AbstractPreferenceController controller : controllers) {
if (controller instanceof LifecycleObserver) {
@@ -121,7 +121,7 @@ public class LanguageAndInputSettingsTest {
@Test
public void testGetPreferenceControllers_shouldAllBeCreated() {
final List<AbstractPreferenceController> controllers =
mFragment.getPreferenceControllers(mActivity);
mFragment.createPreferenceControllers(mActivity);
assertThat(controllers.isEmpty()).isFalse();
}
@@ -189,7 +189,7 @@ public class LanguageAndInputSettingsTest {
fragment.getPreferenceScreenResId());
final List<String> preferenceKeys = new ArrayList<>();
for (AbstractPreferenceController controller : fragment.getPreferenceControllers(context)) {
for (AbstractPreferenceController controller : fragment.createPreferenceControllers(context)) {
preferenceKeys.add(controller.getPreferenceKey());
}

2
tests/robotests/src/com/android/settings/search/indexing/FakeSettingsFragment.java
View File

@@ -68,7 +68,7 @@ public class FakeSettingsFragment extends DashboardFragment {
}
@Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return null;
}