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

Merge "Refine layouts for large screen" into tm-dev am: 51316c13a1 am: 187b39edc2

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17374489

Change-Id: I525dbf313c7865746f33425a85052dc73a51f41e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jason Chiu
2022-03-30 08:22:22 +00:00
committed by Automerger Merge Worker
parent 075f6d8b2f 187b39edc2
commit e60dd45156
17 changed files with 441 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java
View File

@@ -30,6 +30,7 @@ import android.graphics.drawable.Drawable;
import android.os.Bundle;
import androidx.preference.Preference;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
@@ -73,6 +74,7 @@ public class TopLevelSettingsTest {
doReturn(1).when(screen).getPreferenceCount();
doReturn(preference).when(screen).getPreference(anyInt());
doReturn(screen).when(mSettings).getPreferenceScreen();
doReturn(new PreferenceManager(mContext)).when(mSettings).getPreferenceManager();
doReturn(0).when(mSettings).getPreferenceScreenResId();
mSettings.onCreatePreferences(new Bundle(), "rootKey");