Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d04b2da authored by Fan Zhang's avatar Fan Zhang Committed by android-build-merger
Browse files

Merge changes I4ae01109,Ib45289c3 into oc-dev 

am: eda3e8c3

Change-Id: I897373ce37fd8352edb27ef954b1dc7792ea7026
parents 7094f1d1 eda3e8c3

res/layout/app_details.xml

+0 −5
Original line number Diff line number Diff line
@@ -112,9 +112,4 @@ 


    </RelativeLayout>



    <!-- Drop shadow -->

    <View android:layout_width="match_parent"

          android:layout_height="5dp"

          android:background="@drawable/action_bar_dropshadow"/>



</LinearLayout>
 
 No newline at end of file

src/com/android/settings/applications/InstalledAppDetails.java

+4 −0
Original line number Diff line number Diff line
@@ -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();

    }

tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java

+21 −1
Original line number Diff line number Diff line
@@ -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;