PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce MemoryUsagePreferenceController

Browse Source 
- 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
This commit is contained in:
jeffreyhuang
2017-10-20 14:10:25 -07:00
parent 012fe11939
commit c57f18d853
6 changed files with 164 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@@ -1025,10 +1025,6 @@
<intent-filter android:priority="3">
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.development" />
<meta-data android:name="com.android.settings.summary"
android:resource="@string/summary_empty" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.applications.ProcessStatsSummary" />
</activity>

8
res/xml/development_prefs.xml
View File

@@ -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">
<Preference
android:key="memory"
android:icon="@drawable/ic_settings_memory"
android:title="@string/memory_settings_title"
android:summary="@string/summary_empty"
android:fragment="com.android.settings.applications.ProcessStatsSummary" />
<com.android.settings.BugreportPreference
android:key="bugreport"
android:title="@*android:string/bugreport_title"

2
src/com/android/settings/applications/ProcessStatsBase.java
View File

@@ -44,7 +44,7 @@ public abstract class ProcessStatsBase extends SettingsPreferenceFragment
// smaller than the actual time selected instead of bumping up to 3 hours
// beyond it.
private static final long DURATION_QUANTUM = ProcessStats.COMMIT_PERIOD;
protected static long[] sDurations = new long[] {
public static long[] sDurations = new long[] {
3 * 60 * 60 * 1000 - DURATION_QUANTUM / 2, 6 * 60 *60 * 1000 - DURATION_QUANTUM / 2,
12 * 60 * 60 * 1000 - DURATION_QUANTUM / 2, 24 * 60 * 60 * 1000 - DURATION_QUANTUM / 2
};

1
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -352,6 +352,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
Activity activity, Lifecycle lifecycle, DevelopmentSettingsDashboardFragment fragment,
BluetoothA2dpConfigStore bluetoothA2dpConfigStore) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new MemoryUsagePreferenceController(context));
controllers.add(new BugReportPreferenceControllerV2(context));
controllers.add(new LocalBackupPasswordPreferenceController(context));
controllers.add(new StayAwakePreferenceController(context, lifecycle));

78
src/com/android/settings/development/MemoryUsagePreferenceController.java Normal file
View File

@@ -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);
}
}

76
tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java Normal file
View File

@@ -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());
}
}