Merge "Add a new About Phone page."
This commit is contained in:
committed by
Android (Google) Code Review
commit
06af7c8d4b
@@ -21,6 +21,7 @@ import android.text.TextUtils;
|
||||
import android.util.Log;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.accounts.AccountFeatureProvider;
|
||||
import com.android.settings.applications.ApplicationFeatureProvider;
|
||||
import com.android.settings.bluetooth.BluetoothFeatureProvider;
|
||||
import com.android.settings.connecteddevice.SmsMirroringFeatureProvider;
|
||||
@@ -109,6 +110,8 @@ public abstract class FeatureFactory {
|
||||
|
||||
public abstract SlicesFeatureProvider getSlicesFeatureProvider();
|
||||
|
||||
public abstract AccountFeatureProvider getAccountFeatureProvider();
|
||||
|
||||
public static final class FactoryNotFoundException extends RuntimeException {
|
||||
public FactoryNotFoundException(Throwable throwable) {
|
||||
super("Unable to create factory. Did you misconfigure Proguard?", throwable);
|
||||
|
@@ -23,6 +23,8 @@ import android.net.ConnectivityManager;
|
||||
import android.os.UserManager;
|
||||
import android.support.annotation.Keep;
|
||||
|
||||
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.bluetooth.BluetoothFeatureProvider;
|
||||
@@ -78,6 +80,7 @@ public class FeatureFactoryImpl extends FeatureFactory {
|
||||
private DataPlanFeatureProvider mDataPlanFeatureProvider;
|
||||
private SmsMirroringFeatureProvider mSmsMirroringFeatureProvider;
|
||||
private SlicesFeatureProvider mSlicesFeatureProvider;
|
||||
private AccountFeatureProvider mAccountFeatureProvider;
|
||||
|
||||
@Override
|
||||
public SupportFeatureProvider getSupportFeatureProvider(Context context) {
|
||||
@@ -219,4 +222,12 @@ public class FeatureFactoryImpl extends FeatureFactory {
|
||||
}
|
||||
return mSlicesFeatureProvider;
|
||||
}
|
||||
|
||||
@Override
|
||||
public AccountFeatureProvider getAccountFeatureProvider() {
|
||||
if (mAccountFeatureProvider == null) {
|
||||
mAccountFeatureProvider = new AccountFeatureProviderImpl();
|
||||
}
|
||||
return mAccountFeatureProvider;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user