Adding alarms and reminders activity
Adding a settings screen to control the permission SCHEDULE_EXACT_ALARM. Apps can start this by starting a newly introduced API intent REQUEST_SCHEDULE_EXACT_ALARM. Test: make -j RunSettingsRoboTests Manually by UI inspection: Settings -> Apps -> Special App access -> Alarms and Reminders or by running: adb shell am start -a android.settings.REQUEST_SCHEDULE_EXACT_ALARM Bug: 171306433 Bug: 171305516 Change-Id: I1293d38fc50a22b2af46f80ab24f676ed632f964
This commit is contained in:
@@ -3065,6 +3065,33 @@
|
||||
android:value="com.android.settings.applications.appinfo.WriteSettingsDetails" />
|
||||
</activity>
|
||||
|
||||
<activity
|
||||
android:name="Settings$AlarmsAndRemindersActivity"
|
||||
android:exported="true"
|
||||
android:label="@string/alarms_and_reminders_label">
|
||||
<intent-filter android:priority="1">
|
||||
<action android:name="android.settings.REQUEST_SCHEDULE_EXACT_ALARM" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
</intent-filter>
|
||||
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
|
||||
android:value="com.android.settings.applications.manageapplications.ManageApplications" />
|
||||
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
|
||||
android:value="true" />
|
||||
</activity>
|
||||
|
||||
<activity
|
||||
android:name="Settings$AlarmsAndRemindersAppActivity"
|
||||
android:exported="true"
|
||||
android:label="@string/alarms_and_reminders_label">
|
||||
<intent-filter android:priority="1">
|
||||
<action android:name="android.settings.REQUEST_SCHEDULE_EXACT_ALARM" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
<data android:scheme="package" />
|
||||
</intent-filter>
|
||||
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
|
||||
android:value="com.android.settings.applications.appinfo.AlarmsAndRemindersDetails" />
|
||||
</activity>
|
||||
|
||||
<activity
|
||||
android:name="Settings$ManageExternalSourcesActivity"
|
||||
android:exported="true"
|
||||
|
@@ -3359,6 +3359,22 @@
|
||||
<!-- Section header above list of external storage devices [CHAR LIMIT=30]-->
|
||||
<string name="storage_external_title">Portable storage</string>
|
||||
|
||||
<!-- Label for the settings activity for controlling apps that can schedule alarms [CHAR LIMIT=30] -->
|
||||
<string name="alarms_and_reminders_label">Alarms and reminders</string>
|
||||
<!-- Label for the switch to toggler the permission for scheduling alarms [CHAR LIMIT=50] -->
|
||||
<string name="alarms_and_reminders_switch_title">Allow to set alarms or reminders</string>
|
||||
<!-- Title for the setting screen for controlling apps that can schedule alarms [CHAR LIMIT=30] -->
|
||||
<string name="alarms_and_reminders_title">Alarms and reminders</string>
|
||||
<!-- Description that appears below the alarms_and_reminders switch [CHAR LIMIT=NONE] -->
|
||||
<string name="alarms_and_reminders_footer_title">
|
||||
Allow this app to schedule alarms or other timing based events.
|
||||
This will allow the app to wake up and run even when you are not using the device.
|
||||
Note that revoking this permission may cause the app to malfunction, specifically any alarms
|
||||
that the app has scheduled will no longer work.
|
||||
</string>
|
||||
<!-- Keywords for setting screen for controlling apps that can schedule alarms [CHAR LIMIT=100] -->
|
||||
<string name="keywords_alarms_and_reminders">schedule, alarm, reminder, event</string>
|
||||
|
||||
<!-- Summary of a single storage volume, constrasting available and total storage space. [CHAR LIMIT=48]-->
|
||||
<string name="storage_volume_summary"><xliff:g id="used" example="1.2GB">%1$s</xliff:g> used of <xliff:g id="total" example="32GB">%2$s</xliff:g></string>
|
||||
<!-- Summary of a single storage volume used space. [CHAR LIMIT=24] -->
|
||||
@@ -7304,6 +7320,8 @@
|
||||
<string name="help_uri_printing" translatable="false"></string>
|
||||
<!-- Help URI, About phone [DO NOT TRANSLATE] -->
|
||||
<string name="help_uri_about" translatable="false"></string>
|
||||
<!-- Help URI, manage apps that can set alarms and reminders [DO NOT TRANSLATE] -->
|
||||
<string name="help_uri_alarms_and_reminders" translatable="false"></string>
|
||||
|
||||
<!-- Help URL, WiFi [DO NOT TRANSLATE] -->
|
||||
<string name="help_url_wifi" translatable="false"></string>
|
||||
|
30
res/xml/alarms_and_reminders.xml
Normal file
30
res/xml/alarms_and_reminders.xml
Normal file
@@ -0,0 +1,30 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
~ 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.
|
||||
-->
|
||||
|
||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:title="@string/alarms_and_reminders_title">
|
||||
|
||||
<com.android.settings.widget.FilterTouchesRestrictedSwitchPreference
|
||||
android:key="alarms_and_reminders_switch"
|
||||
android:title="@string/alarms_and_reminders_switch_title" />
|
||||
|
||||
<com.android.settingslib.widget.FooterPreference
|
||||
android:key="alarms_and_reminders_description"
|
||||
android:title="@string/alarms_and_reminders_footer_title"
|
||||
android:selectable="false" />
|
||||
|
||||
</PreferenceScreen>
|
@@ -112,6 +112,16 @@
|
||||
android:value="com.android.settings.Settings$ManageExternalSourcesActivity" />
|
||||
</Preference>
|
||||
|
||||
<Preference
|
||||
android:key="alarms_and_reminders"
|
||||
android:title="@string/alarms_and_reminders_title"
|
||||
android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
|
||||
settings:keywords="@string/keywords_alarms_and_reminders">
|
||||
<extra
|
||||
android:name="classname"
|
||||
android:value="com.android.settings.Settings$AlarmsAndRemindersActivity" />
|
||||
</Preference>
|
||||
|
||||
<Preference
|
||||
android:key="special_app_usage_access"
|
||||
android:title="@string/usage_access"
|
||||
|
@@ -204,6 +204,10 @@ public class Settings extends SettingsActivity {
|
||||
public static class ManagedProfileSettingsActivity extends SettingsActivity { /* empty */ }
|
||||
public static class DeletionHelperActivity extends SettingsActivity { /* empty */ }
|
||||
|
||||
/** Actviity to manage apps with {@link android.Manifest.permission#SCHEDULE_EXACT_ALARM} */
|
||||
public static class AlarmsAndRemindersActivity extends SettingsActivity {/* empty */ }
|
||||
/** App specific version of {@link AlarmsAndRemindersActivity} */
|
||||
public static class AlarmsAndRemindersAppActivity extends SettingsActivity {/* empty */ }
|
||||
|
||||
public static class ApnEditorActivity extends SettingsActivity { /* empty */ }
|
||||
public static class ChooseAccountActivity extends SettingsActivity { /* empty */ }
|
||||
|
@@ -0,0 +1,88 @@
|
||||
/*
|
||||
* 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.Manifest;
|
||||
import android.app.AppOpsManager;
|
||||
import android.content.Context;
|
||||
|
||||
import com.android.settingslib.applications.ApplicationsState;
|
||||
import com.android.settingslib.applications.ApplicationsState.AppEntry;
|
||||
import com.android.settingslib.applications.ApplicationsState.AppFilter;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Connects app op info to the ApplicationsState. Extends {@link AppStateAppOpsBridge} to tailor
|
||||
* to the semantics of {@link Manifest.permission#SCHEDULE_EXACT_ALARM}.
|
||||
* Also provides app filters that can use the info.
|
||||
*/
|
||||
public class AppStateAlarmsAndRemindersBridge extends AppStateAppOpsBridge {
|
||||
|
||||
private AppOpsManager mAppOpsManager;
|
||||
|
||||
public AppStateAlarmsAndRemindersBridge(Context context, ApplicationsState appState,
|
||||
Callback callback) {
|
||||
super(context, appState, callback,
|
||||
AppOpsManager.strOpToOp(AppOpsManager.OPSTR_SCHEDULE_EXACT_ALARM),
|
||||
new String[]{Manifest.permission.SCHEDULE_EXACT_ALARM});
|
||||
|
||||
mAppOpsManager = context.getSystemService(AppOpsManager.class);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns information regarding {@link Manifest.permission#SCHEDULE_EXACT_ALARM} for the given
|
||||
* package and uid.
|
||||
*/
|
||||
public PermissionState createPermissionState(String packageName, int uid) {
|
||||
final PermissionState permState = getPermissionInfo(packageName, uid);
|
||||
permState.appOpMode = mAppOpsManager.unsafeCheckOpRawNoThrow(
|
||||
AppOpsManager.OPSTR_SCHEDULE_EXACT_ALARM, uid, packageName);
|
||||
return permState;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void updateExtraInfo(AppEntry app, String pkg, int uid) {
|
||||
app.extraInfo = createPermissionState(pkg, uid);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void loadAllExtraInfo() {
|
||||
final List<AppEntry> allApps = mAppSession.getAllApps();
|
||||
for (int i = 0; i < allApps.size(); i++) {
|
||||
final AppEntry currentEntry = allApps.get(i);
|
||||
updateExtraInfo(currentEntry, currentEntry.info.packageName, currentEntry.info.uid);
|
||||
}
|
||||
}
|
||||
|
||||
public static final AppFilter FILTER_CLOCK_APPS = new AppFilter() {
|
||||
|
||||
@Override
|
||||
public void init() {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean filterApp(AppEntry info) {
|
||||
if (info.extraInfo instanceof PermissionState) {
|
||||
final PermissionState permissionState = (PermissionState) info.extraInfo;
|
||||
return permissionState.permissionDeclared;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
}
|
@@ -277,7 +277,7 @@ public abstract class AppStateAppOpsBridge extends AppStateBaseBridge {
|
||||
if (pe == null) {
|
||||
Log.w(TAG, "AppOp permission exists for package " + packageOp.getPackageName()
|
||||
+ " of user " + userId + " but package doesn't exist or did not request "
|
||||
+ mPermissions + " access");
|
||||
+ Arrays.toString(mPermissions) + " access");
|
||||
continue;
|
||||
}
|
||||
|
||||
|
@@ -0,0 +1,137 @@
|
||||
/*
|
||||
* 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 android.app.Activity.RESULT_CANCELED;
|
||||
import static android.app.Activity.RESULT_OK;
|
||||
|
||||
import android.app.AppOpsManager;
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.appcompat.app.AlertDialog;
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.Preference.OnPreferenceChangeListener;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.Settings;
|
||||
import com.android.settings.applications.AppInfoWithHeader;
|
||||
import com.android.settings.applications.AppStateAlarmsAndRemindersBridge;
|
||||
import com.android.settings.applications.AppStateAppOpsBridge;
|
||||
import com.android.settingslib.RestrictedSwitchPreference;
|
||||
import com.android.settingslib.applications.ApplicationsState.AppEntry;
|
||||
|
||||
/**
|
||||
* App specific activity to show details about
|
||||
* {@link android.Manifest.permission#SCHEDULE_EXACT_ALARM}.
|
||||
*/
|
||||
public class AlarmsAndRemindersDetails extends AppInfoWithHeader
|
||||
implements OnPreferenceChangeListener {
|
||||
|
||||
private static final String KEY_SWITCH = "alarms_and_reminders_switch";
|
||||
|
||||
private AppStateAlarmsAndRemindersBridge mAppBridge;
|
||||
private AppOpsManager mAppOpsManager;
|
||||
private RestrictedSwitchPreference mSwitchPref;
|
||||
private AppStateAppOpsBridge.PermissionState mPermissionState;
|
||||
|
||||
/**
|
||||
* Returns the string that states whether the app has access to
|
||||
* {@link android.Manifest.permission#SCHEDULE_EXACT_ALARM}.
|
||||
*/
|
||||
public static int getSummary(Context context, AppEntry entry) {
|
||||
final AppStateAppOpsBridge.PermissionState state;
|
||||
if (entry.extraInfo instanceof AppStateAppOpsBridge.PermissionState) {
|
||||
state = (AppStateAppOpsBridge.PermissionState) entry.extraInfo;
|
||||
} else {
|
||||
state = new AppStateAlarmsAndRemindersBridge(context, /*appState=*/null,
|
||||
/*callback=*/null).createPermissionState(entry.info.packageName,
|
||||
entry.info.uid);
|
||||
}
|
||||
|
||||
return state.isPermissible() ? R.string.app_permission_summary_allowed
|
||||
: R.string.app_permission_summary_not_allowed;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
final Context context = getActivity();
|
||||
mAppBridge = new AppStateAlarmsAndRemindersBridge(context, mState, /*callback=*/null);
|
||||
mAppOpsManager = context.getSystemService(AppOpsManager.class);
|
||||
|
||||
addPreferencesFromResource(R.xml.alarms_and_reminders);
|
||||
mSwitchPref = findPreference(KEY_SWITCH);
|
||||
mSwitchPref.setOnPreferenceChangeListener(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||
final boolean checked = (Boolean) newValue;
|
||||
if (preference == mSwitchPref) {
|
||||
if (mPermissionState != null && checked != mPermissionState.isPermissible()) {
|
||||
if (Settings.AlarmsAndRemindersAppActivity.class.getName().equals(
|
||||
getIntent().getComponent().getClassName())) {
|
||||
setResult(checked ? RESULT_OK : RESULT_CANCELED);
|
||||
}
|
||||
setCanScheduleAlarms(checked);
|
||||
logPermissionChange(checked, mPackageName);
|
||||
refreshUi();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private void setCanScheduleAlarms(boolean newState) {
|
||||
mAppOpsManager.setUidMode(AppOpsManager.OPSTR_SCHEDULE_EXACT_ALARM,
|
||||
mPackageInfo.applicationInfo.uid,
|
||||
newState ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_ERRORED);
|
||||
}
|
||||
|
||||
private void logPermissionChange(boolean newState, String packageName) {
|
||||
mMetricsFeatureProvider.action(
|
||||
mMetricsFeatureProvider.getAttribution(getActivity()),
|
||||
SettingsEnums.ACTION_ALARMS_AND_REMINDERS_TOGGLE,
|
||||
getMetricsCategory(),
|
||||
packageName,
|
||||
newState ? 1 : 0);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean refreshUi() {
|
||||
if (mPackageInfo == null || mPackageInfo.applicationInfo == null) {
|
||||
return false;
|
||||
}
|
||||
mPermissionState = mAppBridge.createPermissionState(mPackageName,
|
||||
mPackageInfo.applicationInfo.uid);
|
||||
mSwitchPref.setEnabled(mPermissionState.permissionDeclared);
|
||||
mSwitchPref.setChecked(mPermissionState.isPermissible());
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected AlertDialog createDialog(int id, int errorCode) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMetricsCategory() {
|
||||
return SettingsEnums.ALARMS_AND_REMINDERS;
|
||||
}
|
||||
}
|
@@ -19,6 +19,7 @@ package com.android.settings.applications.manageapplications;
|
||||
import androidx.annotation.IntDef;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.applications.AppStateAlarmsAndRemindersBridge;
|
||||
import com.android.settings.applications.AppStateInstallAppsBridge;
|
||||
import com.android.settings.applications.AppStateManageExternalStorageBridge;
|
||||
import com.android.settings.applications.AppStateNotificationBridge;
|
||||
@@ -50,6 +51,7 @@ public class AppFilterRegistry {
|
||||
FILTER_APPS_WRITE_SETTINGS,
|
||||
FILTER_APPS_INSTALL_SOURCES,
|
||||
FILTER_APPS_BLOCKED,
|
||||
FILTER_ALARMS_AND_REMINDERS,
|
||||
})
|
||||
@interface FilterType {
|
||||
}
|
||||
@@ -73,6 +75,7 @@ public class AppFilterRegistry {
|
||||
public static final int FILTER_APP_CAN_CHANGE_WIFI_STATE = 15;
|
||||
public static final int FILTER_APPS_BLOCKED = 16;
|
||||
public static final int FILTER_MANAGE_EXTERNAL_STORAGE = 17;
|
||||
public static final int FILTER_ALARMS_AND_REMINDERS = 18;
|
||||
// Next id: 18. If you add an entry here, length of mFilters should be updated
|
||||
|
||||
private static AppFilterRegistry sRegistry;
|
||||
@@ -80,7 +83,7 @@ public class AppFilterRegistry {
|
||||
private final AppFilterItem[] mFilters;
|
||||
|
||||
private AppFilterRegistry() {
|
||||
mFilters = new AppFilterItem[18];
|
||||
mFilters = new AppFilterItem[19];
|
||||
|
||||
// High power allowlist, on
|
||||
mFilters[FILTER_APPS_POWER_ALLOWLIST] = new AppFilterItem(
|
||||
@@ -185,6 +188,12 @@ public class AppFilterRegistry {
|
||||
AppStateManageExternalStorageBridge.FILTER_MANAGE_EXTERNAL_STORAGE,
|
||||
FILTER_MANAGE_EXTERNAL_STORAGE,
|
||||
R.string.filter_manage_external_storage);
|
||||
|
||||
// Apps that can schedule alarms and reminders
|
||||
mFilters[FILTER_ALARMS_AND_REMINDERS] = new AppFilterItem(
|
||||
AppStateAlarmsAndRemindersBridge.FILTER_CLOCK_APPS,
|
||||
FILTER_ALARMS_AND_REMINDERS,
|
||||
R.string.alarms_and_reminders_title);
|
||||
}
|
||||
|
||||
public static AppFilterRegistry getInstance() {
|
||||
@@ -213,6 +222,8 @@ public class AppFilterRegistry {
|
||||
return FILTER_APPS_RECENT;
|
||||
case ManageApplications.LIST_MANAGE_EXTERNAL_STORAGE:
|
||||
return FILTER_MANAGE_EXTERNAL_STORAGE;
|
||||
case ManageApplications.LIST_TYPE_ALARMS_AND_REMINDERS:
|
||||
return FILTER_ALARMS_AND_REMINDERS;
|
||||
default:
|
||||
return FILTER_APPS_ALL;
|
||||
}
|
||||
|
@@ -91,6 +91,7 @@ import com.android.settings.Settings.WriteSettingsActivity;
|
||||
import com.android.settings.SettingsActivity;
|
||||
import com.android.settings.Utils;
|
||||
import com.android.settings.applications.AppInfoBase;
|
||||
import com.android.settings.applications.AppStateAlarmsAndRemindersBridge;
|
||||
import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
|
||||
import com.android.settings.applications.AppStateBaseBridge;
|
||||
import com.android.settings.applications.AppStateInstallAppsBridge;
|
||||
@@ -104,6 +105,7 @@ import com.android.settings.applications.AppStateUsageBridge.UsageState;
|
||||
import com.android.settings.applications.AppStateWriteSettingsBridge;
|
||||
import com.android.settings.applications.AppStorageSettings;
|
||||
import com.android.settings.applications.UsageAccessDetails;
|
||||
import com.android.settings.applications.appinfo.AlarmsAndRemindersDetails;
|
||||
import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
|
||||
import com.android.settings.applications.appinfo.DrawOverlayDetails;
|
||||
import com.android.settings.applications.appinfo.ExternalSourcesDetails;
|
||||
@@ -230,6 +232,7 @@ public class ManageApplications extends InstrumentedFragment
|
||||
public static final int LIST_TYPE_PHOTOGRAPHY = 11;
|
||||
public static final int LIST_TYPE_WIFI_ACCESS = 13;
|
||||
public static final int LIST_MANAGE_EXTERNAL_STORAGE = 14;
|
||||
public static final int LIST_TYPE_ALARMS_AND_REMINDERS = 15;
|
||||
|
||||
// List types that should show instant apps.
|
||||
public static final Set<Integer> LIST_TYPES_WITH_INSTANT = new ArraySet<>(Arrays.asList(
|
||||
@@ -321,6 +324,9 @@ public class ManageApplications extends InstrumentedFragment
|
||||
} else if (className.equals(Settings.ManageExternalStorageActivity.class.getName())) {
|
||||
mListType = LIST_MANAGE_EXTERNAL_STORAGE;
|
||||
screenTitle = R.string.manage_external_storage_title;
|
||||
} else if (className.equals(Settings.AlarmsAndRemindersActivity.class.getName())) {
|
||||
mListType = LIST_TYPE_ALARMS_AND_REMINDERS;
|
||||
screenTitle = R.string.alarms_and_reminders_title;
|
||||
} else if (className.equals(Settings.NotificationAppListActivity.class.getName())) {
|
||||
mListType = LIST_TYPE_NOTIFICATION;
|
||||
mUsageStatsManager = IUsageStatsManager.Stub.asInterface(
|
||||
@@ -545,6 +551,8 @@ public class ManageApplications extends InstrumentedFragment
|
||||
return SettingsEnums.CONFIGURE_WIFI;
|
||||
case LIST_MANAGE_EXTERNAL_STORAGE:
|
||||
return SettingsEnums.MANAGE_EXTERNAL_STORAGE;
|
||||
case LIST_TYPE_ALARMS_AND_REMINDERS:
|
||||
return SettingsEnums.ALARMS_AND_REMINDERS;
|
||||
default:
|
||||
return SettingsEnums.PAGE_UNKNOWN;
|
||||
}
|
||||
@@ -666,6 +674,10 @@ public class ManageApplications extends InstrumentedFragment
|
||||
startAppInfoFragment(ManageExternalStorageDetails.class,
|
||||
R.string.manage_external_storage_title);
|
||||
break;
|
||||
case LIST_TYPE_ALARMS_AND_REMINDERS:
|
||||
startAppInfoFragment(AlarmsAndRemindersDetails.class,
|
||||
R.string.alarms_and_reminders_label);
|
||||
break;
|
||||
// TODO: Figure out if there is a way where we can spin up the profile's settings
|
||||
// process ahead of time, to avoid a long load of data when user clicks on a managed
|
||||
// app. Maybe when they load the list of apps that contains managed profile apps.
|
||||
@@ -744,6 +756,8 @@ public class ManageApplications extends InstrumentedFragment
|
||||
return R.string.help_uri_apps_wifi_access;
|
||||
case LIST_MANAGE_EXTERNAL_STORAGE:
|
||||
return R.string.help_uri_manage_external_storage;
|
||||
case LIST_TYPE_ALARMS_AND_REMINDERS:
|
||||
return R.string.help_uri_alarms_and_reminders;
|
||||
default:
|
||||
case LIST_TYPE_MAIN:
|
||||
return R.string.help_uri_apps;
|
||||
@@ -1066,6 +1080,8 @@ public class ManageApplications extends InstrumentedFragment
|
||||
mExtraInfoBridge = new AppStateChangeWifiStateBridge(mContext, mState, this);
|
||||
} else if (mManageApplications.mListType == LIST_MANAGE_EXTERNAL_STORAGE) {
|
||||
mExtraInfoBridge = new AppStateManageExternalStorageBridge(mContext, mState, this);
|
||||
} else if (mManageApplications.mListType == LIST_TYPE_ALARMS_AND_REMINDERS) {
|
||||
mExtraInfoBridge = new AppStateAlarmsAndRemindersBridge(mContext, mState, this);
|
||||
} else {
|
||||
mExtraInfoBridge = null;
|
||||
}
|
||||
@@ -1527,6 +1543,9 @@ public class ManageApplications extends InstrumentedFragment
|
||||
case LIST_MANAGE_EXTERNAL_STORAGE:
|
||||
holder.setSummary(ManageExternalStorageDetails.getSummary(mContext, entry));
|
||||
break;
|
||||
case LIST_TYPE_ALARMS_AND_REMINDERS:
|
||||
holder.setSummary(AlarmsAndRemindersDetails.getSummary(mContext, entry));
|
||||
break;
|
||||
default:
|
||||
holder.updateSizeText(entry, mManageApplications.mInvalidSizeStr, mWhichSize);
|
||||
break;
|
||||
|
@@ -39,6 +39,7 @@ import com.android.settings.applications.AppDashboardFragment;
|
||||
import com.android.settings.applications.ProcessStatsSummary;
|
||||
import com.android.settings.applications.ProcessStatsUi;
|
||||
import com.android.settings.applications.UsageAccessDetails;
|
||||
import com.android.settings.applications.appinfo.AlarmsAndRemindersDetails;
|
||||
import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
|
||||
import com.android.settings.applications.appinfo.DrawOverlayDetails;
|
||||
import com.android.settings.applications.appinfo.ExternalSourcesDetails;
|
||||
@@ -313,7 +314,8 @@ public class SettingsGateway {
|
||||
InteractAcrossProfilesSettings.class.getName(),
|
||||
InteractAcrossProfilesDetails.class.getName(),
|
||||
MediaControlsSettings.class.getName(),
|
||||
NetworkProviderSettings.class.getName()
|
||||
NetworkProviderSettings.class.getName(),
|
||||
AlarmsAndRemindersDetails.class.getName(),
|
||||
};
|
||||
|
||||
public static final String[] SETTINGS_FOR_RESTRICTED = {
|
||||
|
@@ -25,10 +25,13 @@ import android.app.AppOpsManager;
|
||||
import android.content.Context;
|
||||
import android.content.pm.IPackageManager;
|
||||
import android.os.RemoteException;
|
||||
import android.os.UserHandle;
|
||||
import android.os.UserManager;
|
||||
|
||||
import com.android.settingslib.applications.ApplicationsState.AppEntry;
|
||||
|
||||
import com.google.common.truth.Truth;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
@@ -60,6 +63,58 @@ public final class AppStateAppOpsBridgeTest {
|
||||
// should not crash
|
||||
}
|
||||
|
||||
@Test
|
||||
public void permissionState_modeDefault_IsPermissible() {
|
||||
AppStateAppOpsBridge.PermissionState permissionState =
|
||||
new AppStateAppOpsBridge.PermissionState("pkg1", UserHandle.of(123));
|
||||
permissionState.appOpMode = AppOpsManager.MODE_DEFAULT;
|
||||
|
||||
permissionState.staticPermissionGranted = true;
|
||||
Truth.assertThat(permissionState.isPermissible()).isTrue();
|
||||
|
||||
permissionState.staticPermissionGranted = false;
|
||||
Truth.assertThat(permissionState.isPermissible()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void permissionState_modeErrored_IsPermissible() {
|
||||
AppStateAppOpsBridge.PermissionState permissionState =
|
||||
new AppStateAppOpsBridge.PermissionState("pkg1", UserHandle.of(123));
|
||||
permissionState.appOpMode = AppOpsManager.MODE_ERRORED;
|
||||
|
||||
permissionState.staticPermissionGranted = true;
|
||||
Truth.assertThat(permissionState.isPermissible()).isFalse();
|
||||
|
||||
permissionState.staticPermissionGranted = false;
|
||||
Truth.assertThat(permissionState.isPermissible()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void permissionState_modeAllowed_IsPermissible() {
|
||||
AppStateAppOpsBridge.PermissionState permissionState =
|
||||
new AppStateAppOpsBridge.PermissionState("pkg1", UserHandle.of(123));
|
||||
permissionState.appOpMode = AppOpsManager.MODE_ALLOWED;
|
||||
|
||||
permissionState.staticPermissionGranted = true;
|
||||
Truth.assertThat(permissionState.isPermissible()).isTrue();
|
||||
|
||||
permissionState.staticPermissionGranted = false;
|
||||
Truth.assertThat(permissionState.isPermissible()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void permissionState_modeIgnored_IsPermissible() {
|
||||
AppStateAppOpsBridge.PermissionState permissionState =
|
||||
new AppStateAppOpsBridge.PermissionState("pkg1", UserHandle.of(123));
|
||||
permissionState.appOpMode = AppOpsManager.MODE_IGNORED;
|
||||
|
||||
permissionState.staticPermissionGranted = true;
|
||||
Truth.assertThat(permissionState.isPermissible()).isFalse();
|
||||
|
||||
permissionState.staticPermissionGranted = false;
|
||||
Truth.assertThat(permissionState.isPermissible()).isFalse();
|
||||
}
|
||||
|
||||
private class TestAppStateAppOpsBridge extends AppStateAppOpsBridge {
|
||||
private TestAppStateAppOpsBridge() {
|
||||
super(mContext, null, null, AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
|
||||
|
@@ -0,0 +1,125 @@
|
||||
/*
|
||||
* 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 static org.mockito.ArgumentMatchers.anyInt;
|
||||
import static org.mockito.ArgumentMatchers.nullable;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.pm.ApplicationInfo;
|
||||
import android.content.pm.PackageInfo;
|
||||
|
||||
import com.android.settings.applications.AppStateAlarmsAndRemindersBridge;
|
||||
import com.android.settings.applications.AppStateAppOpsBridge;
|
||||
import com.android.settingslib.RestrictedSwitchPreference;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.util.ReflectionHelpers;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class AlarmsAndRemindersDetailsTest {
|
||||
|
||||
@Mock
|
||||
private RestrictedSwitchPreference mSwitchPref;
|
||||
@Mock
|
||||
private PackageInfo mPackageInfo;
|
||||
@Mock
|
||||
private AppStateAlarmsAndRemindersBridge mAppStateBridge;
|
||||
@Mock
|
||||
private AppStateAppOpsBridge.PermissionState mPermissionState;
|
||||
|
||||
private AlarmsAndRemindersDetails mFragment = new AlarmsAndRemindersDetails();
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
|
||||
ReflectionHelpers.setField(mFragment, "mSwitchPref", mSwitchPref);
|
||||
ReflectionHelpers.setField(mFragment, "mAppBridge", mAppStateBridge);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void refreshUi_noPackageInfo_shouldReturnFalseAndNoCrash() {
|
||||
mFragment.refreshUi();
|
||||
|
||||
assertThat(mFragment.refreshUi()).isFalse();
|
||||
// should not crash
|
||||
}
|
||||
|
||||
@Test
|
||||
public void refreshUi_noApplicationInfo_shouldReturnFalseAndNoCrash() {
|
||||
ReflectionHelpers.setField(mFragment, "mPackageInfo", mPackageInfo);
|
||||
|
||||
mFragment.refreshUi();
|
||||
|
||||
assertThat(mFragment.refreshUi()).isFalse();
|
||||
// should not crash
|
||||
}
|
||||
|
||||
@Test
|
||||
public void refreshUi_hasApplicationInfo_shouldReturnTrue() {
|
||||
ReflectionHelpers.setField(mFragment, "mPackageInfo", mPackageInfo);
|
||||
mPackageInfo.applicationInfo = new ApplicationInfo();
|
||||
when(mAppStateBridge.createPermissionState(nullable(String.class), anyInt()))
|
||||
.thenReturn(mPermissionState);
|
||||
|
||||
mFragment.refreshUi();
|
||||
|
||||
assertThat(mFragment.refreshUi()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void refreshUi_switchPreferenceEnabled() {
|
||||
ReflectionHelpers.setField(mFragment, "mPackageInfo", mPackageInfo);
|
||||
mPackageInfo.applicationInfo = new ApplicationInfo();
|
||||
when(mAppStateBridge.createPermissionState(nullable(String.class), anyInt()))
|
||||
.thenReturn(mPermissionState);
|
||||
mPermissionState.permissionDeclared = false;
|
||||
|
||||
mFragment.refreshUi();
|
||||
verify(mSwitchPref).setEnabled(false);
|
||||
|
||||
mPermissionState.permissionDeclared = true;
|
||||
|
||||
mFragment.refreshUi();
|
||||
verify(mSwitchPref).setEnabled(true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void refreshUi_switchPreferenceChecked() {
|
||||
ReflectionHelpers.setField(mFragment, "mPackageInfo", mPackageInfo);
|
||||
mPackageInfo.applicationInfo = new ApplicationInfo();
|
||||
when(mAppStateBridge.createPermissionState(nullable(String.class), anyInt()))
|
||||
.thenReturn(mPermissionState);
|
||||
|
||||
when(mPermissionState.isPermissible()).thenReturn(true);
|
||||
mFragment.refreshUi();
|
||||
verify(mSwitchPref).setChecked(true);
|
||||
|
||||
when(mPermissionState.isPermissible()).thenReturn(false);
|
||||
mFragment.refreshUi();
|
||||
verify(mSwitchPref).setChecked(false);
|
||||
}
|
||||
}
|
@@ -16,6 +16,7 @@
|
||||
|
||||
package com.android.settings.applications.manageapplications;
|
||||
|
||||
import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_ALARMS_AND_REMINDERS;
|
||||
import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_ALL;
|
||||
import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_INSTALL_SOURCES;
|
||||
import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_POWER_ALLOWLIST;
|
||||
@@ -23,6 +24,7 @@ import static com.android.settings.applications.manageapplications.AppFilterRegi
|
||||
import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_USAGE_ACCESS;
|
||||
import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_WITH_OVERLAY;
|
||||
import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_WRITE_SETTINGS;
|
||||
import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_ALARMS_AND_REMINDERS;
|
||||
import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_GAMES;
|
||||
import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_HIGH_POWER;
|
||||
import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MAIN;
|
||||
@@ -59,6 +61,9 @@ public class AppFilterRegistryTest {
|
||||
assertThat(registry.getDefaultFilterType(LIST_TYPE_MANAGE_SOURCES))
|
||||
.isEqualTo(FILTER_APPS_INSTALL_SOURCES);
|
||||
|
||||
assertThat(registry.getDefaultFilterType(LIST_TYPE_ALARMS_AND_REMINDERS))
|
||||
.isEqualTo(FILTER_ALARMS_AND_REMINDERS);
|
||||
|
||||
assertThat(registry.getDefaultFilterType(LIST_TYPE_MAIN)).isEqualTo(FILTER_APPS_ALL);
|
||||
assertThat(registry.getDefaultFilterType(LIST_TYPE_NOTIFICATION))
|
||||
.isEqualTo(FILTER_APPS_RECENT);
|
||||
|
Reference in New Issue
Block a user