Add memory settings to developer setting.

Bug: 32623105
Test: make RunSettingsRoboTests
Change-Id: I81e38b1ea4e59c330d0eef078af2751b3de739fe
This commit is contained in:
Fan Zhang
2016-11-02 16:58:53 -07:00
parent 8109a0fb6b
commit 9f74ef8d4b
4 changed files with 129 additions and 0 deletions

View File

@@ -63,6 +63,12 @@
android:summary="@string/runningservices_settings_summary" android:summary="@string/runningservices_settings_summary"
android:fragment="com.android.settings.applications.RunningServices" /> android:fragment="com.android.settings.applications.RunningServices" />
<Preference
android:key="process_stats"
android:title="@string/memory_settings_title"
android:icon="@drawable/ic_settings_memory"
android:fragment="com.android.settings.applications.ProcessStatsSummary"/>
<PreferenceScreen <PreferenceScreen
android:key="convert_to_file_encryption" android:key="convert_to_file_encryption"
android:title="@string/convert_to_file_encryption" android:title="@string/convert_to_file_encryption"

View File

@@ -81,6 +81,7 @@ import android.widget.Toast;
import com.android.internal.app.LocalePicker; import com.android.internal.app.LocalePicker;
import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.applications.BackgroundCheckSummary; import com.android.settings.applications.BackgroundCheckSummary;
import com.android.settings.applications.ProcessStatsPreferenceController;
import com.android.settings.fuelgauge.InactiveApps; import com.android.settings.fuelgauge.InactiveApps;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable; import com.android.settings.search.Indexable;
@@ -307,6 +308,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
private SwitchPreference mForceResizable; private SwitchPreference mForceResizable;
private SwitchPreference mColorTemperaturePreference; private SwitchPreference mColorTemperaturePreference;
private ProcessStatsPreferenceController mProcessStatsPreferenceController;
private final ArrayList<Preference> mAllPrefs = new ArrayList<Preference>(); private final ArrayList<Preference> mAllPrefs = new ArrayList<Preference>();
@@ -360,9 +362,12 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
setPreferenceScreen(new PreferenceScreen(getPrefContext(), null)); setPreferenceScreen(new PreferenceScreen(getPrefContext(), null));
return; return;
} }
mProcessStatsPreferenceController = new ProcessStatsPreferenceController(getActivity());
addPreferencesFromResource(R.xml.development_prefs); addPreferencesFromResource(R.xml.development_prefs);
mProcessStatsPreferenceController.displayPreference(getPreferenceScreen());
final PreferenceGroup debugDebuggingCategory = (PreferenceGroup) final PreferenceGroup debugDebuggingCategory = (PreferenceGroup)
findPreference(DEBUG_DEBUGGING_CATEGORY_KEY); findPreference(DEBUG_DEBUGGING_CATEGORY_KEY);
mEnableAdb = findAndInitSwitchPref(ENABLE_ADB); mEnableAdb = findAndInitSwitchPref(ENABLE_ADB);

View File

@@ -0,0 +1,50 @@
/*
* 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.content.Context;
import android.support.v7.preference.Preference;
import com.android.settings.core.PreferenceController;
import com.android.settings.dashboard.DashboardFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
public class ProcessStatsPreferenceController extends PreferenceController {
private final DashboardFeatureProvider mDashboardFeatureProvider;
public ProcessStatsPreferenceController(Context context) {
super(context);
mDashboardFeatureProvider = FeatureFactory.getFactory(context)
.getDashboardFeatureProvider(context);
}
@Override
public boolean isAvailable() {
return mDashboardFeatureProvider.isEnabled();
}
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override
public String getPreferenceKey() {
return "process_stats";
}
}

View File

@@ -0,0 +1,68 @@
/*
* 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.content.Context;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ProcessStatsPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
private FakeFeatureFactory mFactory;
private ProcessStatsPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
FakeFeatureFactory.setupForTest(mContext);
mFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
mController = new ProcessStatsPreferenceController(mContext);
}
@Test
public void testIsAvailble_dashboardFeatureEnabled_shouldReturnTrue() {
when(mFactory.dashboardFeatureProvider.isEnabled()).thenReturn(true);
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void testIsAvailble_dashboardFeatureDisabled_shouldReturnFalse() {
when(mFactory.dashboardFeatureProvider.isEnabled()).thenReturn(false);
assertThat(mController.isAvailable()).isFalse();
}
}