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

Merge "Use ThreadUtils instead of AsyncTask to get app title/icon"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-14 22:38:11 +00:00
committed by Android (Google) Code Review
parent 073c5cbe30 97e535b603
commit f621e94873
2 changed files with 112 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/com/android/settings/datausage/AppDataUsagePreference.java
View File

@@ -15,38 +15,46 @@
package com.android.settings.datausage;
import android.content.Context;
import android.os.AsyncTask;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
import android.text.format.Formatter;
import android.view.View;
import android.widget.ProgressBar;
import com.android.settings.R;
import com.android.settingslib.AppItem;
import com.android.settingslib.net.UidDetail;
import com.android.settingslib.net.UidDetailProvider;
import static com.android.internal.util.Preconditions.checkNotNull;
import com.android.settingslib.utils.ThreadUtils;
public class AppDataUsagePreference extends Preference {
private final AppItem mItem;
private final int mPercent;
private UidDetail mDetail;
public AppDataUsagePreference(Context context, AppItem item, int percent,
UidDetailProvider provider) {
super(context);
mItem = item;
mPercent = percent;
setLayoutResource(com.android.settings.R.layout.data_usage_item);
setWidgetLayoutResource(com.android.settings.R.layout.widget_progress_bar);
setLayoutResource(R.layout.data_usage_item);
setWidgetLayoutResource(R.layout.widget_progress_bar);
if (item.restricted && item.total <= 0) {
setSummary(com.android.settings.R.string.data_usage_app_restricted);
} else {
setSummary(Formatter.formatFileSize(context, item.total));
}
// kick off async load of app details
UidDetailTask.bindView(provider, item, this);
mDetail = provider.getUidDetail(item.key, false /* blocking */);
if (mDetail != null) {
setAppInfo();
} else {
ThreadUtils.postOnBackgroundThread(() -> {
mDetail = provider.getUidDetail(mItem.key, true /* blocking */);
ThreadUtils.postOnMainThread(() -> setAppInfo());
});
}
}
@Override
@@ -64,59 +72,17 @@ public class AppDataUsagePreference extends Preference {
progress.setProgress(mPercent);
}
private void setAppInfo() {
if (mDetail != null) {
setIcon(mDetail.icon);
setTitle(mDetail.label);
} else {
setIcon(null);
setTitle(null);
}
}
public AppItem getItem() {
return mItem;
}
/**
* Background task that loads {@link UidDetail}, binding to
* {@link DataUsageAdapter} row item when finished.
*/
private static class UidDetailTask extends AsyncTask<Void, Void, UidDetail> {
private final UidDetailProvider mProvider;
private final AppItem mItem;
private final AppDataUsagePreference mTarget;
private UidDetailTask(UidDetailProvider provider, AppItem item,
AppDataUsagePreference target) {
mProvider = checkNotNull(provider);
mItem = checkNotNull(item);
mTarget = checkNotNull(target);
}
public static void bindView(UidDetailProvider provider, AppItem item,
AppDataUsagePreference target) {
final UidDetail cachedDetail = provider.getUidDetail(item.key, false);
if (cachedDetail != null) {
bindView(cachedDetail, target);
} else {
new UidDetailTask(provider, item, target).execute();
}
}
private static void bindView(UidDetail detail, Preference target) {
if (detail != null) {
target.setIcon(detail.icon);
target.setTitle(detail.label);
} else {
target.setIcon(null);
target.setTitle(null);
}
}
@Override
protected void onPreExecute() {
bindView(null, mTarget);
}
@Override
protected UidDetail doInBackground(Void... params) {
return mProvider.getUidDetail(mItem.key, true);
}
@Override
protected void onPostExecute(UidDetail result) {
bindView(result, mTarget);
}
}
}

86
tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java Normal file
View File

@@ -0,0 +1,86 @@
/*
* 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.datausage;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowThreadUtils;
import com.android.settingslib.AppItem;
import com.android.settingslib.net.UidDetail;
import com.android.settingslib.net.UidDetailProvider;
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,
shadows = ShadowThreadUtils.class)
public class AppDataUsagePreferenceTest {
@Mock
private UidDetailProvider mUidDetailProvider;
private AppItem mAppItem;
private UidDetail mUidDetail;
private AppDataUsagePreference mPreference;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mAppItem = new AppItem(123);
mUidDetail = new UidDetail();
mUidDetail.icon = new ColorDrawable(Color.BLUE);
mUidDetail.label = "title";
}
@Test
public void createPref_hasCachedUidDetail_shouldSetAppInfo() {
when(mUidDetailProvider.getUidDetail(mAppItem.key, false /* blocking */))
.thenReturn(mUidDetail);
mPreference = new AppDataUsagePreference(RuntimeEnvironment.application, mAppItem,
50 /* percent */, mUidDetailProvider);
assertThat(mPreference.getTitle()).isEqualTo(mUidDetail.label);
assertThat(mPreference.getIcon()).isEqualTo(mUidDetail.icon);
}
@Test
public void createPref_noCachedUidDetail_shouldSetAppInfo() {
when(mUidDetailProvider.getUidDetail(mAppItem.key, true /* blocking */))
.thenReturn(mUidDetail);
mPreference = new AppDataUsagePreference(RuntimeEnvironment.application, mAppItem,
50 /* percent */, mUidDetailProvider);
assertThat(mPreference.getTitle()).isEqualTo(mUidDetail.label);
assertThat(mPreference.getIcon()).isEqualTo(mUidDetail.icon);
}
}