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

Commit 297d487c authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5753328 from 7c5bb0ec to qt-c2f2-release 

Change-Id: Ieac37f755d436a2d45e81826de64a59eebb22639
parents 191e6682 7c5bb0ec

res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -10683,13 +10683,11 @@ 
    <string-array name="game_driver_all_apps_preference_values">

        <item>@string/game_driver_app_preference_default</item>

        <item>@string/game_driver_app_preference_game_driver</item>

        <item>@string/game_driver_app_preference_prerelease_driver</item>

    </string-array>

    <!-- All the values for Game Driver app preference [CHAR LIMIT=50] -->

    <string-array name="game_driver_app_preference_values">

        <item>@string/game_driver_app_preference_default</item>

        <item>@string/game_driver_app_preference_game_driver</item>

        <item>@string/game_driver_app_preference_prerelease_driver</item>

        <item>@string/game_driver_app_preference_system</item>

    </string-array>

























src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java



+7
−3






























Original line number
Diff line number
Diff line







@@ -31,6 +31,7 @@ import com.android.settings.R;







import com.android.settings.SettingsPreferenceFragment;









import com.android.settings.applications.AppStorageSettings;









import com.android.settings.applications.FetchPackageStorageAsyncLoader;









import com.android.settingslib.applications.ApplicationsState;









import com.android.settingslib.applications.StorageStatsSource;









import com.android.settingslib.core.lifecycle.LifecycleObserver;









import com.android.settingslib.core.lifecycle.events.OnPause;








@@ -48,10 +49,13 @@ public class AppStoragePreferenceController extends AppInfoPreferenceControllerB

















    @Override









    public void updateState(Preference preference) {









        final ApplicationsState.AppEntry entry = mParent.getAppEntry();









        if (entry != null && entry.info != null) {









            final boolean isExternal =









                (mParent.getAppEntry().info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0;









                    (entry.info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0;









            preference.setSummary(getStorageSummary(mLastResult, isExternal));









        }









    }



















    @Override









    public void onResume() {
































tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java



+11
−0






























Original line number
Diff line number
Diff line







@@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat;







import static org.mockito.ArgumentMatchers.any;









import static org.mockito.Mockito.doReturn;









import static org.mockito.Mockito.mock;









import static org.mockito.Mockito.never;









import static org.mockito.Mockito.spy;









import static org.mockito.Mockito.verify;









import static org.mockito.Mockito.when;








@@ -99,6 +100,16 @@ public class AppStoragePreferenceControllerTest {







        verify(preference).setSummary(any());









    }



















    @Test









    public void updateState_entryIsNull_shouldNotUpdatePreferenceSummary() {









        when(mFragment.getAppEntry()).thenReturn(null);









        Preference preference = mock(Preference.class);



















        mController.updateState(preference);



















        verify(preference, never()).setSummary(any());









    }



















    @Test









    public void getStorageSummary_shouldWorkForExternal() {









        final StorageStatsSource.AppStorageStats stats =
































tests/robotests/src/com/android/settings/development/gamedriver/GameDriverAppPreferenceControllerTest.java



+5
−5






























Original line number
Diff line number
Diff line







@@ -56,8 +56,7 @@ public class GameDriverAppPreferenceControllerTest {

















    private static final int DEFAULT = 0;









    private static final int GAME_DRIVER = 1;









    private static final int PRERELEASE_DRIVER = 2;









    private static final int SYSTEM = 3;









    private static final int SYSTEM = 2;









    private static final String TEST_APP_NAME = "testApp";









    private static final String TEST_PKG_NAME = "testPkg";


















@@ -80,6 +79,7 @@ public class GameDriverAppPreferenceControllerTest {







    private GameDriverAppPreferenceController mController;









    private CharSequence[] mValueList;









    private String mDialogTitle;









    private String mPreferencePrereleaseDriver;



















    @Before









    public void setUp() {








@@ -89,6 +89,8 @@ public class GameDriverAppPreferenceControllerTest {







        mValueList =









                mContext.getResources().getStringArray(R.array.game_driver_app_preference_values);









        mDialogTitle = mContext.getResources().getString(R.string.game_driver_app_preference_title);









        mPreferencePrereleaseDriver =









                mContext.getResources().getString(R.string.game_driver_app_preference_prerelease_driver);









    }



















    @Test








@@ -207,9 +209,7 @@ public class GameDriverAppPreferenceControllerTest {







        assertThat(preference.getDialogTitle()).isEqualTo(mDialogTitle);









        assertThat(preference.getEntries()).isEqualTo(mValueList);









        assertThat(preference.getEntryValues()).isEqualTo(mValueList);









        assertThat(preference.getEntry()).isEqualTo(mValueList[PRERELEASE_DRIVER]);









        assertThat(preference.getValue()).isEqualTo(mValueList[PRERELEASE_DRIVER]);









        assertThat(preference.getSummary()).isEqualTo(mValueList[PRERELEASE_DRIVER]);









        assertThat(preference.getSummary()).isEqualTo(mPreferencePrereleaseDriver);









    }



















    @Test