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

Merge "Remove GameSettings and ExtraAppInfo." into tm-dev

Browse Source
This commit is contained in:
Peiyong Lin
2022-04-07 17:48:18 +00:00
committed by Android (Google) Code Review
parent f2178a48ee e14c23fcf9
commit 7ef70db34d
16 changed files with 0 additions and 548 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/strings.xml
View File

@@ -13817,11 +13817,6 @@
<!-- Describes what is affected by the mic toggle [CHAR LIMIT=NONE] --> <!-- Describes what is affected by the mic toggle [CHAR LIMIT=NONE] -->
<string name="mic_toggle_description">For apps and services. If this setting is off, microphone data may still be shared when you call an emergency number.</string> <string name="mic_toggle_description">For apps and services. If this setting is off, microphone data may still be shared when you call an emergency number.</string>
<!-- Title for Game settings entry. [CHAR_LIMIT=NONE] -->
<string name="game_settings_title">Game settings</string>
<!-- Summary for Game settings entry. [CHAR_LIMIT=NONE] -->
<string name="game_settings_summary">Turn on Game Dashboard shortcut, and more</string>
<!-- Content description of the previous button to bring user to the previous preview page. --> <!-- Content description of the previous button to bring user to the previous preview page. -->
<string name="previous_page_content_description">Previous</string> <string name="previous_page_content_description">Previous</string>

8
res/xml/apps.xml
View File

@@ -62,14 +62,6 @@
<intent android:action="android.settings.MANAGE_DEFAULT_APPS_SETTINGS"/> <intent android:action="android.settings.MANAGE_DEFAULT_APPS_SETTINGS"/>
</Preference> </Preference>
<Preference
android:key="game_settings"
android:title="@string/game_settings_title"
android:summary="@string/game_settings_summary"
android:order="-995"
settings:controller="com.android.settings.applications.GameSettingsPreferenceController">
</Preference>
<PreferenceCategory <PreferenceCategory
android:key="dashboard_tile_placeholder" android:key="dashboard_tile_placeholder"
android:order="10"/> android:order="10"/>

34
src/com/android/settings/applications/GameSettingsFeatureProvider.java
View File

@@ -1,34 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.applications;
import android.content.Context;
/**
* Provider for Game Settings related feature.
*/
public interface GameSettingsFeatureProvider {
/**
* Returns true if the feature is supported.
*/
boolean isSupported(Context context);
/**
* Launch GameSettings
*/
void launchGameSettings(Context context);
}

35
src/com/android/settings/applications/GameSettingsFeatureProviderImpl.java
View File

@@ -1,35 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.applications;
import android.content.Context;
/**
* Provider implementation for Game Settings related features.
*/
public class GameSettingsFeatureProviderImpl implements
GameSettingsFeatureProvider {
@Override
public boolean isSupported(Context context) {
return false;
}
@Override
public void launchGameSettings(Context context) {
return;
}
}

60
src/com/android/settings/applications/GameSettingsPreferenceController.java
View File

@@ -1,60 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.applications;
import android.content.Context;
import android.text.TextUtils;
import androidx.preference.Preference;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
/** Contains logic that deals with showing Game Settings in app settings. */
public class GameSettingsPreferenceController extends BasePreferenceController {
@VisibleForTesting
final GameSettingsFeatureProvider mGameSettingsFeatureProvider;
public GameSettingsPreferenceController(Context context, String key) {
super(context, key);
mGameSettingsFeatureProvider =
FeatureFactory.getFactory(context).getGameSettingsFeatureProvider();
}
GameSettingsPreferenceController(Context context, String key,
GameSettingsFeatureProvider gameSettingsFeatureProvider) {
super(context, key);
mGameSettingsFeatureProvider = gameSettingsFeatureProvider;
}
@Override
public int getAvailabilityStatus() {
return mGameSettingsFeatureProvider.isSupported(mContext)
? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
if (TextUtils.equals(getPreferenceKey(), preference.getKey())) {
mGameSettingsFeatureProvider.launchGameSettings(mContext);
return true;
}
return super.handlePreferenceTreeClick(preference);
}
}

1
src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
View File

@@ -178,7 +178,6 @@ public class AppInfoDashboardFragment extends DashboardFragment
use(AppStoragePreferenceController.class).setParentFragment(this); use(AppStoragePreferenceController.class).setParentFragment(this);
use(AppVersionPreferenceController.class).setParentFragment(this); use(AppVersionPreferenceController.class).setParentFragment(this);
use(InstantAppDomainsPreferenceController.class).setParentFragment(this); use(InstantAppDomainsPreferenceController.class).setParentFragment(this);
use(ExtraAppInfoPreferenceController.class).setPackageName(packageName);
final HibernationSwitchPreferenceController appHibernationSettings = final HibernationSwitchPreferenceController appHibernationSettings =
use(HibernationSwitchPreferenceController.class); use(HibernationSwitchPreferenceController.class);

47
src/com/android/settings/applications/appinfo/ExtraAppInfoFeatureProvider.java
View File

@@ -1,47 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.applications.appinfo;
import android.content.Context;
/**
* Provider for Extra App Info related feature
*/
public interface ExtraAppInfoFeatureProvider {
/** Returns true if the feature is supported. */
boolean isSupported(Context context);
/**
* Launch ExtraAppInfoSettings
*/
void launchExtraAppInfoSettings(Context context);
/**
* Sets the package name
*/
void setPackageName(String packageName);
/**
* Checks if enabled
*/
boolean isEnabled(Context context);
/**
* Gets the summary name
*/
String getSummary(Context context);
}

50
src/com/android/settings/applications/appinfo/ExtraAppInfoFeatureProviderImpl.java
View File

@@ -1,50 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.applications.appinfo;
import android.content.Context;
/**
* Provider for Extra App Info related feature
*/
public class ExtraAppInfoFeatureProviderImpl implements
ExtraAppInfoFeatureProvider {
@Override
public boolean isSupported(Context context) {
return false;
}
@Override
public void launchExtraAppInfoSettings(Context context) {
return;
}
@Override
public void setPackageName(String packageName) {
return;
}
@Override
public boolean isEnabled(Context context) {
return false;
}
@Override
public String getSummary(Context context) {
return "";
}
}

77
src/com/android/settings/applications/appinfo/ExtraAppInfoPreferenceController.java
View File

@@ -1,77 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.applications.appinfo;
import android.content.Context;
import android.text.TextUtils;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
/** Contains logic that deals with showing extra app info in app settings. */
public class ExtraAppInfoPreferenceController extends BasePreferenceController {
private final ExtraAppInfoFeatureProvider mExtraAppInfoFeatureProvider;
public ExtraAppInfoPreferenceController(Context context, String key) {
super(context, key);
mExtraAppInfoFeatureProvider =
FeatureFactory.getFactory(context).getExtraAppInfoFeatureProvider();
}
@Override
public int getAvailabilityStatus() {
return mExtraAppInfoFeatureProvider.isSupported(mContext)
? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
if (TextUtils.equals(getPreferenceKey(), preference.getKey())) {
mExtraAppInfoFeatureProvider.launchExtraAppInfoSettings(mContext);
return true;
}
return super.handlePreferenceTreeClick(preference);
}
@Override
public CharSequence getSummary() {
return mExtraAppInfoFeatureProvider.getSummary(mContext);
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
if (mExtraAppInfoFeatureProvider != null) {
final Preference preference = screen.findPreference(getPreferenceKey());
preference.setEnabled(mExtraAppInfoFeatureProvider.isEnabled(preference.getContext()));
}
}
/**
* Set the local package name
*/
public void setPackageName(String packageName) {
if (mExtraAppInfoFeatureProvider != null) {
mExtraAppInfoFeatureProvider.setPackageName(packageName);
}
}
}

12
src/com/android/settings/overlay/FeatureFactory.java
View File

@@ -27,8 +27,6 @@ import com.android.settings.accessibility.AccessibilityMetricsFeatureProvider;
import com.android.settings.accessibility.AccessibilitySearchFeatureProvider; import com.android.settings.accessibility.AccessibilitySearchFeatureProvider;
import com.android.settings.accounts.AccountFeatureProvider; import com.android.settings.accounts.AccountFeatureProvider;
import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.applications.GameSettingsFeatureProvider;
import com.android.settings.applications.appinfo.ExtraAppInfoFeatureProvider;
import com.android.settings.aware.AwareFeatureProvider; import com.android.settings.aware.AwareFeatureProvider;
import com.android.settings.biometrics.face.FaceFeatureProvider; import com.android.settings.biometrics.face.FaceFeatureProvider;
import com.android.settings.bluetooth.BluetoothFeatureProvider; import com.android.settings.bluetooth.BluetoothFeatureProvider;
@@ -161,21 +159,11 @@ public abstract class FeatureFactory {
*/ */
public abstract WifiTrackerLibProvider getWifiTrackerLibProvider(); public abstract WifiTrackerLibProvider getWifiTrackerLibProvider();
/**
* Retrieves implementation for Extra App Info feature.
*/
public abstract ExtraAppInfoFeatureProvider getExtraAppInfoFeatureProvider();
/** /**
* Retrieves implementation for SecuritySettings feature. * Retrieves implementation for SecuritySettings feature.
*/ */
public abstract SecuritySettingsFeatureProvider getSecuritySettingsFeatureProvider(); public abstract SecuritySettingsFeatureProvider getSecuritySettingsFeatureProvider();
/**
* Retrieves implementation for Game Settings feature.
*/
public abstract GameSettingsFeatureProvider getGameSettingsFeatureProvider();
/** /**
* Retrieves implementation for Accessibility search index feature. * Retrieves implementation for Accessibility search index feature.
*/ */

22
src/com/android/settings/overlay/FeatureFactoryImpl.java
View File

@@ -33,10 +33,6 @@ import com.android.settings.accounts.AccountFeatureProvider;
import com.android.settings.accounts.AccountFeatureProviderImpl; import com.android.settings.accounts.AccountFeatureProviderImpl;
import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.applications.ApplicationFeatureProviderImpl; import com.android.settings.applications.ApplicationFeatureProviderImpl;
import com.android.settings.applications.GameSettingsFeatureProvider;
import com.android.settings.applications.GameSettingsFeatureProviderImpl;
import com.android.settings.applications.appinfo.ExtraAppInfoFeatureProvider;
import com.android.settings.applications.appinfo.ExtraAppInfoFeatureProviderImpl;
import com.android.settings.aware.AwareFeatureProvider; import com.android.settings.aware.AwareFeatureProvider;
import com.android.settings.aware.AwareFeatureProviderImpl; import com.android.settings.aware.AwareFeatureProviderImpl;
import com.android.settings.biometrics.face.FaceFeatureProvider; import com.android.settings.biometrics.face.FaceFeatureProvider;
@@ -107,9 +103,7 @@ public class FeatureFactoryImpl extends FeatureFactory {
private AwareFeatureProvider mAwareFeatureProvider; private AwareFeatureProvider mAwareFeatureProvider;
private FaceFeatureProvider mFaceFeatureProvider; private FaceFeatureProvider mFaceFeatureProvider;
private WifiTrackerLibProvider mWifiTrackerLibProvider; private WifiTrackerLibProvider mWifiTrackerLibProvider;
private ExtraAppInfoFeatureProvider mExtraAppInfoFeatureProvider;
private SecuritySettingsFeatureProvider mSecuritySettingsFeatureProvider; private SecuritySettingsFeatureProvider mSecuritySettingsFeatureProvider;
private GameSettingsFeatureProvider mGameSettingsFeatureProvider;
private AccessibilitySearchFeatureProvider mAccessibilitySearchFeatureProvider; private AccessibilitySearchFeatureProvider mAccessibilitySearchFeatureProvider;
private AccessibilityMetricsFeatureProvider mAccessibilityMetricsFeatureProvider; private AccessibilityMetricsFeatureProvider mAccessibilityMetricsFeatureProvider;
@@ -318,14 +312,6 @@ public class FeatureFactoryImpl extends FeatureFactory {
return mWifiTrackerLibProvider; return mWifiTrackerLibProvider;
} }
@Override
public ExtraAppInfoFeatureProvider getExtraAppInfoFeatureProvider() {
if (mExtraAppInfoFeatureProvider == null) {
mExtraAppInfoFeatureProvider = new ExtraAppInfoFeatureProviderImpl();
}
return mExtraAppInfoFeatureProvider;
}
@Override @Override
public SecuritySettingsFeatureProvider getSecuritySettingsFeatureProvider() { public SecuritySettingsFeatureProvider getSecuritySettingsFeatureProvider() {
if (mSecuritySettingsFeatureProvider == null) { if (mSecuritySettingsFeatureProvider == null) {
@@ -334,14 +320,6 @@ public class FeatureFactoryImpl extends FeatureFactory {
return mSecuritySettingsFeatureProvider; return mSecuritySettingsFeatureProvider;
} }
@Override
public GameSettingsFeatureProvider getGameSettingsFeatureProvider() {
if (mGameSettingsFeatureProvider == null) {
mGameSettingsFeatureProvider = new GameSettingsFeatureProviderImpl();
}
return mGameSettingsFeatureProvider;
}
@Override @Override
public AccessibilitySearchFeatureProvider getAccessibilitySearchFeatureProvider() { public AccessibilitySearchFeatureProvider getAccessibilitySearchFeatureProvider() {
if (mAccessibilitySearchFeatureProvider == null) { if (mAccessibilitySearchFeatureProvider == null) {

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

@@ -1,65 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.applications;
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.content.Context;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
public class GameSettingsPreferenceControllerTest {
private GameSettingsPreferenceController mController;
private GameSettingsFeatureProvider mProvider;
private Context mContext;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
mProvider = FakeFeatureFactory.setupForTest().getGameSettingsFeatureProvider();
mController = new GameSettingsPreferenceController(mContext, "test_key", mProvider);
}
@Test
public void getAvailabilityStatus_GameSettingsFeatureEnabled_shouldReturnAVAILABLE() {
when(mProvider.isSupported(mContext)).thenReturn(true);
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
}
@Test
public void getAvailabilityStatus_GameSettingsFeatureDisabled_shouldReturnUNSUPPORTED_ON_DEVICE() {
when(mProvider.isSupported(mContext)).thenReturn(false);
assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
}
}

54
tests/robotests/src/com/android/settings/applications/appinfo/ExtraAppInfoFeatureProviderImplTest.java
View File

@@ -1,54 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
public class ExtraAppInfoFeatureProviderImplTest {
private Context mContext;
private ExtraAppInfoFeatureProviderImpl mController;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
mController = new ExtraAppInfoFeatureProviderImpl();
}
@Test
public void isSupported_notSupportedByDefault() {
assertThat(mController.isSupported(mContext)).isEqualTo(false);
}
@Test
public void isEnabled_notEnabledByDefault() {
assertThat(mController.isEnabled(mContext)).isEqualTo(false);
}
@Test
public void getSummary_emptyByDefault() {
assertThat(mController.getSummary(mContext)).isEqualTo("");
}
}

46
tests/robotests/src/com/android/settings/applications/appinfo/ExtraAppInfoPreferenceControllerTest.java
View File

@@ -1,46 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.applications.appinfo;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
public class ExtraAppInfoPreferenceControllerTest {
private Context mContext;
private ExtraAppInfoPreferenceController mController;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
mController = new ExtraAppInfoPreferenceController(mContext, "test_key");
}
@Test
public void getAvailabilityStatus_unavailableByDefault() {
assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
}
}

16
tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
View File

@@ -25,8 +25,6 @@ import com.android.settings.accessibility.AccessibilityMetricsFeatureProvider;
import com.android.settings.accessibility.AccessibilitySearchFeatureProvider; import com.android.settings.accessibility.AccessibilitySearchFeatureProvider;
import com.android.settings.accounts.AccountFeatureProvider; import com.android.settings.accounts.AccountFeatureProvider;
import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.applications.GameSettingsFeatureProvider;
import com.android.settings.applications.appinfo.ExtraAppInfoFeatureProvider;
import com.android.settings.aware.AwareFeatureProvider; import com.android.settings.aware.AwareFeatureProvider;
import com.android.settings.biometrics.face.FaceFeatureProvider; import com.android.settings.biometrics.face.FaceFeatureProvider;
import com.android.settings.bluetooth.BluetoothFeatureProvider; import com.android.settings.bluetooth.BluetoothFeatureProvider;
@@ -86,9 +84,7 @@ public class FakeFeatureFactory extends FeatureFactory {
public ContextualCardFeatureProvider mContextualCardFeatureProvider; public ContextualCardFeatureProvider mContextualCardFeatureProvider;
public WifiTrackerLibProvider wifiTrackerLibProvider; public WifiTrackerLibProvider wifiTrackerLibProvider;
public ExtraAppInfoFeatureProvider extraAppInfoFeatureProvider;
public SecuritySettingsFeatureProvider securitySettingsFeatureProvider; public SecuritySettingsFeatureProvider securitySettingsFeatureProvider;
public GameSettingsFeatureProvider gameSettingsFeatureProvider;
public AccessibilitySearchFeatureProvider mAccessibilitySearchFeatureProvider; public AccessibilitySearchFeatureProvider mAccessibilitySearchFeatureProvider;
public AccessibilityMetricsFeatureProvider mAccessibilityMetricsFeatureProvider; public AccessibilityMetricsFeatureProvider mAccessibilityMetricsFeatureProvider;
@@ -137,9 +133,7 @@ public class FakeFeatureFactory extends FeatureFactory {
mAwareFeatureProvider = mock(AwareFeatureProvider.class); mAwareFeatureProvider = mock(AwareFeatureProvider.class);
mFaceFeatureProvider = mock(FaceFeatureProvider.class); mFaceFeatureProvider = mock(FaceFeatureProvider.class);
wifiTrackerLibProvider = mock(WifiTrackerLibProvider.class); wifiTrackerLibProvider = mock(WifiTrackerLibProvider.class);
extraAppInfoFeatureProvider = mock(ExtraAppInfoFeatureProvider.class);
securitySettingsFeatureProvider = mock(SecuritySettingsFeatureProvider.class); securitySettingsFeatureProvider = mock(SecuritySettingsFeatureProvider.class);
gameSettingsFeatureProvider = mock(GameSettingsFeatureProvider.class);
mAccessibilitySearchFeatureProvider = mock(AccessibilitySearchFeatureProvider.class); mAccessibilitySearchFeatureProvider = mock(AccessibilitySearchFeatureProvider.class);
mAccessibilityMetricsFeatureProvider = mock(AccessibilityMetricsFeatureProvider.class); mAccessibilityMetricsFeatureProvider = mock(AccessibilityMetricsFeatureProvider.class);
} }
@@ -264,21 +258,11 @@ public class FakeFeatureFactory extends FeatureFactory {
return wifiTrackerLibProvider; return wifiTrackerLibProvider;
} }
@Override
public ExtraAppInfoFeatureProvider getExtraAppInfoFeatureProvider() {
return extraAppInfoFeatureProvider;
}
@Override @Override
public SecuritySettingsFeatureProvider getSecuritySettingsFeatureProvider() { public SecuritySettingsFeatureProvider getSecuritySettingsFeatureProvider() {
return securitySettingsFeatureProvider; return securitySettingsFeatureProvider;
} }
@Override
public GameSettingsFeatureProvider getGameSettingsFeatureProvider() {
return gameSettingsFeatureProvider;
}
@Override @Override
public AccessibilitySearchFeatureProvider getAccessibilitySearchFeatureProvider() { public AccessibilitySearchFeatureProvider getAccessibilitySearchFeatureProvider() {
return mAccessibilitySearchFeatureProvider; return mAccessibilitySearchFeatureProvider;

16
tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
View File

@@ -23,8 +23,6 @@ import com.android.settings.accessibility.AccessibilityMetricsFeatureProvider;
import com.android.settings.accessibility.AccessibilitySearchFeatureProvider; import com.android.settings.accessibility.AccessibilitySearchFeatureProvider;
import com.android.settings.accounts.AccountFeatureProvider; import com.android.settings.accounts.AccountFeatureProvider;
import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.applications.GameSettingsFeatureProvider;
import com.android.settings.applications.appinfo.ExtraAppInfoFeatureProvider;
import com.android.settings.aware.AwareFeatureProvider; import com.android.settings.aware.AwareFeatureProvider;
import com.android.settings.biometrics.face.FaceFeatureProvider; import com.android.settings.biometrics.face.FaceFeatureProvider;
import com.android.settings.bluetooth.BluetoothFeatureProvider; import com.android.settings.bluetooth.BluetoothFeatureProvider;
@@ -81,9 +79,7 @@ public class FakeFeatureFactory extends FeatureFactory {
public ContextualCardFeatureProvider mContextualCardFeatureProvider; public ContextualCardFeatureProvider mContextualCardFeatureProvider;
public WifiTrackerLibProvider wifiTrackerLibProvider; public WifiTrackerLibProvider wifiTrackerLibProvider;
public ExtraAppInfoFeatureProvider extraAppInfoFeatureProvider;
public SecuritySettingsFeatureProvider securitySettingsFeatureProvider; public SecuritySettingsFeatureProvider securitySettingsFeatureProvider;
public GameSettingsFeatureProvider gameSettingsFeatureProvider;
public AccessibilitySearchFeatureProvider mAccessibilitySearchFeatureProvider; public AccessibilitySearchFeatureProvider mAccessibilitySearchFeatureProvider;
public AccessibilityMetricsFeatureProvider mAccessibilityMetricsFeatureProvider; public AccessibilityMetricsFeatureProvider mAccessibilityMetricsFeatureProvider;
@@ -123,9 +119,7 @@ public class FakeFeatureFactory extends FeatureFactory {
mAwareFeatureProvider = mock(AwareFeatureProvider.class); mAwareFeatureProvider = mock(AwareFeatureProvider.class);
mFaceFeatureProvider = mock(FaceFeatureProvider.class); mFaceFeatureProvider = mock(FaceFeatureProvider.class);
wifiTrackerLibProvider = mock(WifiTrackerLibProvider.class); wifiTrackerLibProvider = mock(WifiTrackerLibProvider.class);
extraAppInfoFeatureProvider = mock(ExtraAppInfoFeatureProvider.class);
securitySettingsFeatureProvider = mock(SecuritySettingsFeatureProvider.class); securitySettingsFeatureProvider = mock(SecuritySettingsFeatureProvider.class);
gameSettingsFeatureProvider = mock(GameSettingsFeatureProvider.class);
mAccessibilitySearchFeatureProvider = mock(AccessibilitySearchFeatureProvider.class); mAccessibilitySearchFeatureProvider = mock(AccessibilitySearchFeatureProvider.class);
mAccessibilityMetricsFeatureProvider = mock(AccessibilityMetricsFeatureProvider.class); mAccessibilityMetricsFeatureProvider = mock(AccessibilityMetricsFeatureProvider.class);
} }
@@ -250,21 +244,11 @@ public class FakeFeatureFactory extends FeatureFactory {
return wifiTrackerLibProvider; return wifiTrackerLibProvider;
} }
@Override
public ExtraAppInfoFeatureProvider getExtraAppInfoFeatureProvider() {
return extraAppInfoFeatureProvider;
}
@Override @Override
public SecuritySettingsFeatureProvider getSecuritySettingsFeatureProvider() { public SecuritySettingsFeatureProvider getSecuritySettingsFeatureProvider() {
return securitySettingsFeatureProvider; return securitySettingsFeatureProvider;
} }
@Override
public GameSettingsFeatureProvider getGameSettingsFeatureProvider() {
return gameSettingsFeatureProvider;
}
@Override @Override
public AccessibilitySearchFeatureProvider getAccessibilitySearchFeatureProvider() { public AccessibilitySearchFeatureProvider getAccessibilitySearchFeatureProvider() {
return mAccessibilitySearchFeatureProvider; return mAccessibilitySearchFeatureProvider;