From: jeffreyhuang Date: Fri, 20 Oct 2017 21:10:25 +0000 (-0700) Subject: Introduce MemoryUsagePreferenceController X-Git-Tag: android-x86-9.0-r1~170^2~18^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c57f18d8536f3bda8167488f4939bbd729a9140e;p=android-x86%2Fpackages-apps-Settings.git Introduce MemoryUsagePreferenceController - Use a hard-coded preference instead of injecting so that search can index the preference - Create a preference controller to update the summary Change-Id: Idf822ccbb7a58a9ec561d5c2c2948dbc3272544f fixes: 36463051 Test: Manual using settings app --- diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f07c39f0f9..68e41bbd42 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1025,10 +1025,6 @@ - - diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml index e60dbe35ac..20482b7c10 100644 --- a/res/xml/development_prefs.xml +++ b/res/xml/development_prefs.xml @@ -18,6 +18,14 @@ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" android:key="development_prefs_screen" android:title="@string/development_settings_title"> + + + controllers = new ArrayList<>(); + controllers.add(new MemoryUsagePreferenceController(context)); controllers.add(new BugReportPreferenceControllerV2(context)); controllers.add(new LocalBackupPasswordPreferenceController(context)); controllers.add(new StayAwakePreferenceController(context, lifecycle)); diff --git a/src/com/android/settings/development/MemoryUsagePreferenceController.java b/src/com/android/settings/development/MemoryUsagePreferenceController.java new file mode 100644 index 0000000000..1b589fd329 --- /dev/null +++ b/src/com/android/settings/development/MemoryUsagePreferenceController.java @@ -0,0 +1,78 @@ +/* + * 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.development; + +import android.content.Context; +import android.support.annotation.VisibleForTesting; +import android.support.v7.preference.Preference; +import android.support.v7.preference.PreferenceScreen; +import android.text.format.Formatter; + +import com.android.settings.R; +import com.android.settings.applications.ProcStatsData; +import com.android.settings.applications.ProcessStatsBase; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + +public class MemoryUsagePreferenceController extends DeveloperOptionsPreferenceController implements + PreferenceControllerMixin { + + private static final String MEMORY_USAGE_KEY = "memory"; + + private Preference mPreference; + private ProcStatsData mProcStatsData; + + public MemoryUsagePreferenceController(Context context) { + super(context); + } + + @Override + public String getPreferenceKey() { + return MEMORY_USAGE_KEY; + } + + @Override + public void displayPreference(PreferenceScreen screen) { + super.displayPreference(screen); + + mPreference = screen.findPreference(getPreferenceKey()); + mProcStatsData = getProcStatsData(); + setDuration(); + } + + @Override + public void updateState(Preference preference) { + mProcStatsData.refreshStats(true); + final ProcStatsData.MemInfo memInfo = mProcStatsData.getMemInfo(); + final String usedResult = Formatter.formatShortFileSize(mContext, + (long) memInfo.realUsedRam); + final String totalResult = Formatter.formatShortFileSize(mContext, + (long) memInfo.realTotalRam); + mPreference.setSummary(mContext.getString(R.string.memory_summary, + usedResult, totalResult)); + } + + @VisibleForTesting + void setDuration() { + mProcStatsData.setDuration(ProcessStatsBase.sDurations[0] /* 3 hours */); + } + + @VisibleForTesting + ProcStatsData getProcStatsData() { + return new ProcStatsData(mContext, false); + } +} diff --git a/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java new file mode 100644 index 0000000000..a949eef817 --- /dev/null +++ b/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java @@ -0,0 +1,76 @@ +/* + * 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.development; + +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.content.Context; +import android.support.v7.preference.Preference; +import android.support.v7.preference.PreferenceScreen; + +import com.android.settings.TestConfig; +import com.android.settings.applications.ProcStatsData; +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; + +@RunWith(SettingsRobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +public class MemoryUsagePreferenceControllerTest { + + @Mock + private Preference mPreference; + @Mock + private PreferenceScreen mScreen; + @Mock + private ProcStatsData mProcStatsData; + @Mock + private ProcStatsData.MemInfo mMemInfo; + + private Context mContext; + private MemoryUsagePreferenceController mController; + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + mContext = RuntimeEnvironment.application; + mController = spy(new MemoryUsagePreferenceController(mContext)); + doReturn(mProcStatsData).when(mController).getProcStatsData(); + doNothing().when(mController).setDuration(); + when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); + when(mProcStatsData.getMemInfo()).thenReturn(mMemInfo); + mController.displayPreference(mScreen); + } + + @Test + public void updateState_shouldUpdatePreferenceSummary() { + mController.updateState(mPreference); + + verify(mPreference).setSummary(anyString()); + } +}