Remove "Battery optimization" from Special app access page
Bug: 179459867 Test: make RunSettingsRoboTests -j40 Change-Id: I715694289f4d893c4606446c0bc9a0bd21bafe7b
This commit is contained in:
committed by
Wesley Wang
parent
65c570117e
commit
3e31334065
@@ -28,17 +28,6 @@
|
|||||||
android:value="com.android.settings.Settings$ManageExternalStorageActivity" />
|
android:value="com.android.settings.Settings$ManageExternalStorageActivity" />
|
||||||
</Preference>
|
</Preference>
|
||||||
|
|
||||||
<Preference
|
|
||||||
android:key="high_power_apps"
|
|
||||||
android:title="@string/high_power_apps"
|
|
||||||
android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
|
|
||||||
settings:keywords="@string/keywords_ignore_optimizations"
|
|
||||||
settings:controller="com.android.settings.applications.specialaccess.HighPowerAppsController">
|
|
||||||
<extra
|
|
||||||
android:name="classname"
|
|
||||||
android:value="com.android.settings.Settings$HighPowerApplicationsActivity" />
|
|
||||||
</Preference>
|
|
||||||
|
|
||||||
<Preference
|
<Preference
|
||||||
android:key="interact_across_profiles"
|
android:key="interact_across_profiles"
|
||||||
android:title="@string/interact_across_profiles_title"
|
android:title="@string/interact_across_profiles_title"
|
||||||
|
@@ -1,36 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2017 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 com.android.settings.R;
|
|
||||||
import com.android.settings.core.BasePreferenceController;
|
|
||||||
|
|
||||||
public class HighPowerAppsController extends BasePreferenceController {
|
|
||||||
|
|
||||||
public HighPowerAppsController(Context context, String key) {
|
|
||||||
super(context, key);
|
|
||||||
}
|
|
||||||
|
|
||||||
@AvailabilityStatus
|
|
||||||
public int getAvailabilityStatus() {
|
|
||||||
return mContext.getResources().getBoolean(R.bool.config_show_high_power_apps)
|
|
||||||
? AVAILABLE
|
|
||||||
: UNSUPPORTED_ON_DEVICE;
|
|
||||||
}
|
|
||||||
}
|
|
@@ -1,56 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2017 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 static com.google.common.truth.Truth.assertThat;
|
|
||||||
|
|
||||||
import static org.mockito.Mockito.spy;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
|
|
||||||
import org.junit.Before;
|
|
||||||
import org.junit.Test;
|
|
||||||
import org.junit.runner.RunWith;
|
|
||||||
import org.mockito.MockitoAnnotations;
|
|
||||||
import org.robolectric.RobolectricTestRunner;
|
|
||||||
import org.robolectric.RuntimeEnvironment;
|
|
||||||
import org.robolectric.annotation.Config;
|
|
||||||
|
|
||||||
@RunWith(RobolectricTestRunner.class)
|
|
||||||
public class HighPowerAppsControllerTest {
|
|
||||||
|
|
||||||
private Context mContext;
|
|
||||||
private HighPowerAppsController mController;
|
|
||||||
|
|
||||||
@Before
|
|
||||||
public void setUp() {
|
|
||||||
MockitoAnnotations.initMocks(this);
|
|
||||||
mContext = spy(RuntimeEnvironment.application.getApplicationContext());
|
|
||||||
mController = new HighPowerAppsController(mContext, "key");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testHighPowerApps_byDefault_shouldBeShown() {
|
|
||||||
assertThat(mController.isAvailable()).isTrue();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
@Config(qualifiers = "mcc999")
|
|
||||||
public void testHighPowerApps_ifDisabled_shouldNotBeShown() {
|
|
||||||
assertThat(mController.isAvailable()).isFalse();
|
|
||||||
}
|
|
||||||
}
|
|
Reference in New Issue
Block a user