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

Merge changes I4ae01109,Ib45289c3 into oc-dev am: eda3e8c3d9

Browse Source 
am: 7d04b2dab0

Change-Id: Ieece29f0f8488a9932aa96be6958430337df8d4e
This commit is contained in:
Fan Zhang
2017-04-26 10:55:34 +00:00
committed by android-build-merger
parent 068ba85a7e 7d04b2dab0
commit 2e02794115
3 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/layout/app_details.xml
View File

@@ -112,9 +112,4 @@
</RelativeLayout>
<!-- Drop shadow -->
<View android:layout_width="match_parent"
android:layout_height="5dp"
android:background="@drawable/action_bar_dropshadow"/>
</LinearLayout>

4
src/com/android/settings/applications/InstalledAppDetails.java
View File

@@ -454,6 +454,10 @@ public class InstalledAppDetails extends AppInfoBase
@Override
public void onPackageSizeChanged(String packageName) {
if (!TextUtils.equals(packageName, mPackageName)) {
Log.d(LOG_TAG, "Package change irrelevant, skipping");
return;
}
refreshUi();
}

22
tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.applications;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
@@ -69,6 +68,9 @@ import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class InstalledAppDetailsTest {
private static final String PACKAGE_NAME = "test_package_name";
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
@Mock
@@ -181,6 +183,24 @@ public final class InstalledAppDetailsTest {
verify(mActivity, never()).finishAndRemoveTask();
}
@Test
public void packageSizeChange_isOtherPackage_shouldNotRefreshUi() {
ReflectionHelpers.setField(mAppDetail, "mPackageName", PACKAGE_NAME);
mAppDetail.onPackageSizeChanged("Not_" + PACKAGE_NAME);
verify(mAppDetail, never()).refreshUi();
}
@Test
public void packageSizeChange_isOwnPackage_shouldRefreshUi() {
doReturn(Boolean.TRUE).when(mAppDetail).refreshUi();
ReflectionHelpers.setField(mAppDetail, "mPackageName", PACKAGE_NAME);
mAppDetail.onPackageSizeChanged(PACKAGE_NAME);
verify(mAppDetail).refreshUi();
}
@Test
public void launchPowerUsageDetailFragment_shouldNotCrash() {
mAppDetail.mBatteryPreference = mBatteryPreference;