Add app restrict tip and detector
1. Add RestrictAppTip with two state(new and handled) 2. Add RestrictAppDetector, and future cl will hook up it with anomaly database 3. Add related dialog in BatteryTipDialogFragment Bug: 72385333 Test: RunSettingsRoboTests Change-Id: Ic10efc6387150e62b6c6ad8d4c0d16ff75564fac
This commit is contained in:
@@ -27,7 +27,9 @@ import android.text.format.DateUtils;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
|
||||
import com.android.settings.fuelgauge.batterytip.tips.HighUsageTip;
|
||||
import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.testutils.shadow.ShadowRuntimePermissionPresenter;
|
||||
@@ -55,6 +57,7 @@ public class BatteryTipDialogFragmentTest {
|
||||
private BatteryTipDialogFragment mDialogFragment;
|
||||
private Context mContext;
|
||||
private HighUsageTip mHighUsageTip;
|
||||
private RestrictAppTip mRestrictedAppTip;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
@@ -67,6 +70,7 @@ public class BatteryTipDialogFragmentTest {
|
||||
highUsageTips.add(new AppInfo.Builder().setScreenOnTimeMs(SCREEN_TIME_MS).setPackageName(
|
||||
PACKAGE_NAME).build());
|
||||
mHighUsageTip = new HighUsageTip(SCREEN_TIME_MS, highUsageTips);
|
||||
mRestrictedAppTip = new RestrictAppTip(BatteryTip.StateType.NEW, highUsageTips);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -82,5 +86,19 @@ public class BatteryTipDialogFragmentTest {
|
||||
mContext.getString(R.string.battery_tip_dialog_message, "1h"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testOnCreateDialog_restrictAppTip_fireRestrictAppDialog() {
|
||||
mDialogFragment = BatteryTipDialogFragment.newInstance(mRestrictedAppTip);
|
||||
|
||||
FragmentTestUtil.startFragment(mDialogFragment);
|
||||
|
||||
final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
|
||||
ShadowAlertDialog shadowDialog = shadowOf(dialog);
|
||||
|
||||
assertThat(shadowDialog.getTitle()).isEqualTo("Restrict 1 app");
|
||||
assertThat(shadowDialog.getMessage()).isEqualTo(
|
||||
mContext.getString(R.string.battery_tip_restrict_app_dialog_message));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
@@ -51,6 +51,7 @@ import java.util.List;
|
||||
public class BatteryTipLoaderTest {
|
||||
private static final int[] TIP_ORDER = {
|
||||
BatteryTip.TipType.SMART_BATTERY_MANAGER,
|
||||
BatteryTip.TipType.APP_RESTRICTION,
|
||||
BatteryTip.TipType.HIGH_DEVICE_USAGE,
|
||||
BatteryTip.TipType.BATTERY_SAVER,
|
||||
BatteryTip.TipType.LOW_BATTERY,
|
||||
|
@@ -0,0 +1,111 @@
|
||||
/*
|
||||
* 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.fuelgauge.batterytip.tips;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.spy;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.pm.ApplicationInfo;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.os.Parcel;
|
||||
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.fuelgauge.batterytip.AppInfo;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class RestrictAppTipTest {
|
||||
private static final String PACKAGE_NAME = "com.android.app";
|
||||
private static final String DISPLAY_NAME = "app";
|
||||
|
||||
private Context mContext;
|
||||
private RestrictAppTip mNewBatteryTip;
|
||||
private RestrictAppTip mHandledBatteryTip;
|
||||
private List<AppInfo> mUsageAppList;
|
||||
@Mock
|
||||
private ApplicationInfo mApplicationInfo;
|
||||
@Mock
|
||||
private PackageManager mPackageManager;
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
|
||||
mContext = spy(RuntimeEnvironment.application);
|
||||
doReturn(mPackageManager).when(mContext).getPackageManager();
|
||||
doReturn(mApplicationInfo).when(mPackageManager).getApplicationInfo(PACKAGE_NAME,
|
||||
PackageManager.MATCH_DISABLED_COMPONENTS | PackageManager.MATCH_ANY_USER);
|
||||
doReturn(DISPLAY_NAME).when(mApplicationInfo).loadLabel(mPackageManager);
|
||||
|
||||
mUsageAppList = new ArrayList<>();
|
||||
mUsageAppList.add(new AppInfo.Builder()
|
||||
.setPackageName(PACKAGE_NAME)
|
||||
.build());
|
||||
mNewBatteryTip = new RestrictAppTip(BatteryTip.StateType.NEW, mUsageAppList);
|
||||
mHandledBatteryTip = new RestrictAppTip(BatteryTip.StateType.HANDLED, mUsageAppList);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testParcelable() {
|
||||
Parcel parcel = Parcel.obtain();
|
||||
mNewBatteryTip.writeToParcel(parcel, mNewBatteryTip.describeContents());
|
||||
parcel.setDataPosition(0);
|
||||
|
||||
final RestrictAppTip parcelTip = new RestrictAppTip(parcel);
|
||||
|
||||
assertThat(parcelTip.getType()).isEqualTo(BatteryTip.TipType.APP_RESTRICTION);
|
||||
assertThat(parcelTip.getState()).isEqualTo(BatteryTip.StateType.NEW);
|
||||
final AppInfo app = parcelTip.getRestrictAppList().get(0);
|
||||
assertThat(app.packageName).isEqualTo(PACKAGE_NAME);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetTitle_stateNew_showRestrictTitle() {
|
||||
assertThat(mNewBatteryTip.getTitle(mContext)).isEqualTo("Restrict 1 app");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetTitle_stateHandled_showHandledTitle() {
|
||||
assertThat(mHandledBatteryTip.getTitle(mContext)).isEqualTo("1 recently restricted");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetSummary_stateNew_showRestrictSummary() {
|
||||
assertThat(mNewBatteryTip.getSummary(mContext)).isEqualTo(
|
||||
"app has high battery usage");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetSummary_stateHandled_showHandledSummary() {
|
||||
assertThat(mHandledBatteryTip.getSummary(mContext)).isEqualTo(
|
||||
"App changes are in progress");
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user