Clean up: move speciall access stuff into single package

Bug: 110207366
Test: robotests
Change-Id: I17ad7a15d1e44bb7690d2b18ed6e2b6b17b46d8a
This commit is contained in:
Fan Zhang
2018-06-14 11:14:02 -07:00
parent 04233df504
commit ed3a2bd2c3
19 changed files with 295 additions and 249 deletions

View File

@@ -1,106 +0,0 @@
/*
* Copyright (C) 2016 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.app.ActivityManager;
import android.content.Context;
import android.os.Bundle;
import androidx.annotation.NonNull;
import android.provider.SearchIndexableResource;
import androidx.preference.Preference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.List;
@SearchIndexable
public class SpecialAccessSettings extends DashboardFragment {
private static final String TAG = "SpecialAccessSettings";
private static final String[] DISABLED_FEATURES_LOW_RAM =
new String[]{"notification_access", "zen_access", "enabled_vr_listeners",
"picture_in_picture"};
@Override
protected String getLogTag() {
return TAG;
}
@Override
protected int getPreferenceScreenResId() {
return R.xml.special_access;
}
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
if (ActivityManager.isLowRamDeviceStatic()) {
for (String disabledFeature : DISABLED_FEATURES_LOW_RAM) {
Preference pref = findPreference(disabledFeature);
if (pref != null) {
removePreference(disabledFeature);
}
}
}
}
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context);
}
private static List<AbstractPreferenceController> buildPreferenceControllers(
@NonNull Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new HighPowerAppsController(context));
controllers.add(new DeviceAdministratorsController(context));
controllers.add(new PremiumSmsController(context));
controllers.add(new DataSaverController(context));
controllers.add(new EnabledVrListenersController(context));
return controllers;
}
@Override
public int getMetricsCategory() {
return MetricsEvent.SPECIAL_ACCESS;
}
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
boolean enabled) {
final ArrayList<SearchIndexableResource> result = new ArrayList<>();
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.special_access;
result.add(sir);
return result;
}
@Override
public List<AbstractPreferenceController> createPreferenceControllers(
Context context) {
return buildPreferenceControllers(context);
}
};
}

View File

@@ -15,20 +15,17 @@
*/
package com.android.settings.applications;
package com.android.settings.applications.specialaccess;
import android.content.Context;
import androidx.annotation.VisibleForTesting;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
public class DataSaverController extends BasePreferenceController {
@VisibleForTesting static final String KEY_DATA_SAVER = "data_saver";
public DataSaverController(Context context) {
super(context, KEY_DATA_SAVER);
public DataSaverController(Context context, String key) {
super(context, key);
}
@AvailabilityStatus

View File

@@ -14,20 +14,17 @@
* limitations under the License.
*/
package com.android.settings.applications;
package com.android.settings.applications.specialaccess;
import android.content.Context;
import androidx.annotation.VisibleForTesting;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
public class DeviceAdministratorsController extends BasePreferenceController {
@VisibleForTesting static final String KEY_DEVICE_ADMIN = "device_administrators";
public DeviceAdministratorsController(Context context) {
super(context, KEY_DEVICE_ADMIN);
public DeviceAdministratorsController(Context context, String key) {
super(context, key);
}
@AvailabilityStatus

View File

@@ -14,25 +14,24 @@
* limitations under the License.
*/
package com.android.settings.applications;
package com.android.settings.applications.specialaccess;
import android.app.ActivityManager;
import android.content.Context;
import androidx.annotation.VisibleForTesting;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
public class EnabledVrListenersController extends BasePreferenceController {
@VisibleForTesting static final String KEY_ENABLED_VR_LISTENERS = "enabled_vr_listeners";
public EnabledVrListenersController(Context context) {
super(context, KEY_ENABLED_VR_LISTENERS);
public EnabledVrListenersController(Context context, String key) {
super(context, key);
}
@AvailabilityStatus
public int getAvailabilityStatus() {
return mContext.getResources().getBoolean(R.bool.config_show_enabled_vr_listeners)
&& !ActivityManager.isLowRamDeviceStatic()
? AVAILABLE
: UNSUPPORTED_ON_DEVICE;
}

View File

@@ -14,20 +14,17 @@
* limitations under the License.
*/
package com.android.settings.applications;
package com.android.settings.applications.specialaccess;
import android.content.Context;
import androidx.annotation.VisibleForTesting;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
public class HighPowerAppsController extends BasePreferenceController {
@VisibleForTesting static final String KEY_HIGH_POWER_APPS = "high_power_apps";
public HighPowerAppsController(Context context) {
super(context, KEY_HIGH_POWER_APPS);
public HighPowerAppsController(Context context, String key) {
super(context, key);
}
@AvailabilityStatus

View File

@@ -0,0 +1,36 @@
/*
* Copyright (C) 2018 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.specialaccess;
import android.app.ActivityManager;
import android.content.Context;
import com.android.settings.core.BasePreferenceController;
public class NotificationAccessController extends BasePreferenceController {
public NotificationAccessController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
@Override
public int getAvailabilityStatus() {
return !ActivityManager.isLowRamDeviceStatic()
? AVAILABLE
: UNSUPPORTED_ON_DEVICE;
}
}

View File

@@ -0,0 +1,36 @@
/*
* Copyright (C) 2018 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.specialaccess;
import android.app.ActivityManager;
import android.content.Context;
import com.android.settings.core.BasePreferenceController;
public class PictureInPictureController extends BasePreferenceController {
public PictureInPictureController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
@Override
public int getAvailabilityStatus() {
return !ActivityManager.isLowRamDeviceStatic()
? AVAILABLE
: UNSUPPORTED_ON_DEVICE;
}
}

View File

@@ -14,20 +14,17 @@
* limitations under the License.
*/
package com.android.settings.applications;
package com.android.settings.applications.specialaccess;
import android.content.Context;
import androidx.annotation.VisibleForTesting;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
public class PremiumSmsController extends BasePreferenceController {
@VisibleForTesting static final String KEY_PREMIUM_SMS = "premium_sms";
public PremiumSmsController(Context context) {
super(context, KEY_PREMIUM_SMS);
public PremiumSmsController(Context context, String key) {
super(context, key);
}
@AvailabilityStatus

View File

@@ -0,0 +1,65 @@
/*
* Copyright (C) 2016 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.specialaccess;
import android.content.Context;
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.List;
@SearchIndexable
public class SpecialAccessSettings extends DashboardFragment {
private static final String TAG = "SpecialAccessSettings";
@Override
protected String getLogTag() {
return TAG;
}
@Override
protected int getPreferenceScreenResId() {
return R.xml.special_access;
}
@Override
public int getMetricsCategory() {
return MetricsEvent.SPECIAL_ACCESS;
}
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
boolean enabled) {
final ArrayList<SearchIndexableResource> result = new ArrayList<>();
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.special_access;
result.add(sir);
return result;
}
};
}

View File

@@ -0,0 +1,36 @@
/*
* Copyright (C) 2018 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.specialaccess;
import android.app.ActivityManager;
import android.content.Context;
import com.android.settings.core.BasePreferenceController;
public class ZenAccessController extends BasePreferenceController {
public ZenAccessController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
@Override
public int getAvailabilityStatus() {
return !ActivityManager.isLowRamDeviceStatic()
? AVAILABLE
: UNSUPPORTED_ON_DEVICE;
}
}