Merge "Remove GameSettings and ExtraAppInfo." into tm-dev
This commit is contained in:
@@ -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);
|
||||
}
|
@@ -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;
|
||||
}
|
||||
}
|
@@ -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);
|
||||
}
|
||||
}
|
@@ -178,7 +178,6 @@ public class AppInfoDashboardFragment extends DashboardFragment
|
||||
use(AppStoragePreferenceController.class).setParentFragment(this);
|
||||
use(AppVersionPreferenceController.class).setParentFragment(this);
|
||||
use(InstantAppDomainsPreferenceController.class).setParentFragment(this);
|
||||
use(ExtraAppInfoPreferenceController.class).setPackageName(packageName);
|
||||
|
||||
final HibernationSwitchPreferenceController appHibernationSettings =
|
||||
use(HibernationSwitchPreferenceController.class);
|
||||
|
@@ -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);
|
||||
}
|
@@ -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 "";
|
||||
}
|
||||
}
|
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
@@ -27,8 +27,6 @@ import com.android.settings.accessibility.AccessibilityMetricsFeatureProvider;
|
||||
import com.android.settings.accessibility.AccessibilitySearchFeatureProvider;
|
||||
import com.android.settings.accounts.AccountFeatureProvider;
|
||||
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.biometrics.face.FaceFeatureProvider;
|
||||
import com.android.settings.bluetooth.BluetoothFeatureProvider;
|
||||
@@ -161,21 +159,11 @@ public abstract class FeatureFactory {
|
||||
*/
|
||||
public abstract WifiTrackerLibProvider getWifiTrackerLibProvider();
|
||||
|
||||
/**
|
||||
* Retrieves implementation for Extra App Info feature.
|
||||
*/
|
||||
public abstract ExtraAppInfoFeatureProvider getExtraAppInfoFeatureProvider();
|
||||
|
||||
/**
|
||||
* Retrieves implementation for SecuritySettings feature.
|
||||
*/
|
||||
public abstract SecuritySettingsFeatureProvider getSecuritySettingsFeatureProvider();
|
||||
|
||||
/**
|
||||
* Retrieves implementation for Game Settings feature.
|
||||
*/
|
||||
public abstract GameSettingsFeatureProvider getGameSettingsFeatureProvider();
|
||||
|
||||
/**
|
||||
* Retrieves implementation for Accessibility search index feature.
|
||||
*/
|
||||
|
@@ -33,10 +33,6 @@ import com.android.settings.accounts.AccountFeatureProvider;
|
||||
import com.android.settings.accounts.AccountFeatureProviderImpl;
|
||||
import com.android.settings.applications.ApplicationFeatureProvider;
|
||||
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.AwareFeatureProviderImpl;
|
||||
import com.android.settings.biometrics.face.FaceFeatureProvider;
|
||||
@@ -107,9 +103,7 @@ public class FeatureFactoryImpl extends FeatureFactory {
|
||||
private AwareFeatureProvider mAwareFeatureProvider;
|
||||
private FaceFeatureProvider mFaceFeatureProvider;
|
||||
private WifiTrackerLibProvider mWifiTrackerLibProvider;
|
||||
private ExtraAppInfoFeatureProvider mExtraAppInfoFeatureProvider;
|
||||
private SecuritySettingsFeatureProvider mSecuritySettingsFeatureProvider;
|
||||
private GameSettingsFeatureProvider mGameSettingsFeatureProvider;
|
||||
private AccessibilitySearchFeatureProvider mAccessibilitySearchFeatureProvider;
|
||||
private AccessibilityMetricsFeatureProvider mAccessibilityMetricsFeatureProvider;
|
||||
|
||||
@@ -318,14 +312,6 @@ public class FeatureFactoryImpl extends FeatureFactory {
|
||||
return mWifiTrackerLibProvider;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ExtraAppInfoFeatureProvider getExtraAppInfoFeatureProvider() {
|
||||
if (mExtraAppInfoFeatureProvider == null) {
|
||||
mExtraAppInfoFeatureProvider = new ExtraAppInfoFeatureProviderImpl();
|
||||
}
|
||||
return mExtraAppInfoFeatureProvider;
|
||||
}
|
||||
|
||||
@Override
|
||||
public SecuritySettingsFeatureProvider getSecuritySettingsFeatureProvider() {
|
||||
if (mSecuritySettingsFeatureProvider == null) {
|
||||
@@ -334,14 +320,6 @@ public class FeatureFactoryImpl extends FeatureFactory {
|
||||
return mSecuritySettingsFeatureProvider;
|
||||
}
|
||||
|
||||
@Override
|
||||
public GameSettingsFeatureProvider getGameSettingsFeatureProvider() {
|
||||
if (mGameSettingsFeatureProvider == null) {
|
||||
mGameSettingsFeatureProvider = new GameSettingsFeatureProviderImpl();
|
||||
}
|
||||
return mGameSettingsFeatureProvider;
|
||||
}
|
||||
|
||||
@Override
|
||||
public AccessibilitySearchFeatureProvider getAccessibilitySearchFeatureProvider() {
|
||||
if (mAccessibilitySearchFeatureProvider == null) {
|
||||
|
Reference in New Issue
Block a user