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

Merge changes from topic "slice-highlight" into sc-v2-dev am: 6821b6be32 am: 026b1b5df6

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

Change-Id: If46903bb26371ea90075d1c6cc063af4d10a88d4
This commit is contained in:
Jason Chiu
2021-11-02 02:43:42 +00:00
committed by Automerger Merge Worker
parent ae5f30b15a 026b1b5df6
commit 7f6b9e26c9
124 changed files with 760 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/unit/src/com/android/settings/core/TogglePreferenceControllerTest.java
View File

@@ -119,6 +119,11 @@ public class TogglePreferenceControllerTest {
return true;
}
@Override
public int getSliceHighlightMenuRes() {
return 5678;
}
@Override
public int getAvailabilityStatus() {
return AVAILABLE;

5
tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java
View File

@@ -302,6 +302,11 @@ public class ProviderModelSliceHelperTest {
public Intent getIntent() {
return new Intent();
}
@Override
public int getSliceHighlightMenuRes() {
return 0;
}
}
private class MockProviderModelSliceHelper extends ProviderModelSliceHelper {

3
tests/unit/src/com/android/settings/slices/SliceTestUtils.java
View File

@@ -35,6 +35,7 @@ class SliceTestUtils {
public static final int FAKE_ICON = 1234;
public static final String FAKE_FRAGMENT_NAME = FakeIndexProvider.class.getName();
public static final String FAKE_CONTROLLER_NAME = FakeToggleController.class.getName();
public static final int FAKE_HIGHLIGHT_MENU_RES = FakeToggleController.HIGHLIGHT_MENU_RES;
public static void insertSliceToDb(Context context, String key) {
@@ -75,6 +76,8 @@ class SliceTestUtils {
values.put(SlicesDatabaseHelper.IndexColumns.UNAVAILABLE_SLICE_SUBTITLE,
customizedUnavailableSliceSubtitle);
values.put(SlicesDatabaseHelper.IndexColumns.PUBLIC_SLICE, isPublicSlice);
values.put(SlicesDatabaseHelper.IndexColumns.HIGHLIGHT_MENU_RESOURCE,
FAKE_HIGHLIGHT_MENU_RES);
db.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, values);
db.close();

5
tests/unit/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java
View File

@@ -143,5 +143,10 @@ public class SpecialCaseSliceManagerTest {
public Intent getIntent() {
return null;
}
@Override
public int getSliceHighlightMenuRes() {
return 0;
}
}
}

6
tests/unit/src/com/android/settings/testutils/FakeToggleController.java
View File

@@ -27,6 +27,7 @@ import com.android.settings.slices.SliceBackgroundWorker;
public class FakeToggleController extends TogglePreferenceController {
public static final String AVAILABILITY_KEY = "fake_toggle_availability_key";
public static final int HIGHLIGHT_MENU_RES = 5678;
public static final IntentFilter INTENT_FILTER = new IntentFilter(
WifiManager.WIFI_AP_STATE_CHANGED_ACTION);
@@ -70,6 +71,11 @@ public class FakeToggleController extends TogglePreferenceController {
return true;
}
@Override
public int getSliceHighlightMenuRes() {
return HIGHLIGHT_MENU_RES;
}
@Override
public Class<? extends SliceBackgroundWorker> getBackgroundWorkerClass() {
return TestWorker.class;