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

Commit c007634d authored by Fan Zhang's avatar Fan Zhang
Browse files

Fix UniquePreferenceTest

Bug: 70638967
Test: atest UniquePreferenceTest
Change-Id: Idf06ccd9580d66c051f9b7c910c567f321da6cc5
parent bbdeafe5
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -41,7 +41,8 @@
            android:layout="@layout/zen_mode_settings_button" />
    </PreferenceCategory>

    <PreferenceCategory>
    <PreferenceCategory
        android:key="zen_mode_footer_container">
        <com.android.settingslib.widget.FooterPreference />
    </PreferenceCategory>

+13 −1
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ import java.util.Set;
public class UniquePreferenceTest {

    private static final String TAG = "UniquePreferenceTest";
    private static final List<String> IGNORE_PREF_TYPES = Arrays.asList(
            "com.android.settingslib.widget.FooterPreference");
    private static final List<String> SUPPORTED_PREF_TYPES = Arrays.asList(
            "Preference", "PreferenceCategory", "PreferenceScreen");
    private static final List<String> WHITELISTED_DUPLICATE_KEYS = Arrays.asList(
@@ -63,8 +65,15 @@ public class UniquePreferenceTest {
                                            // should be formed as one single xml and this entry
                                            // should be removed.

            "dashboard_tile_placeholder"    // This is the placeholder pref for injecting dynamic
            "dashboard_tile_placeholder",   // This is the placeholder pref for injecting dynamic
                                            // tiles.
            // Dup keys from connected device page experiment.
            "usb_mode",
            "connected_devices_screen",
            "toggle_bluetooth",
            "toggle_nfc",
            "android_beam_settings",
            "sms_mirroring"
    );

    private Context mContext;
@@ -158,6 +167,9 @@ public class UniquePreferenceTest {
                    continue;
                }
                final String nodeName = parser.getName();
                if (IGNORE_PREF_TYPES.contains(nodeName)) {
                    continue;
                }
                if (!SUPPORTED_PREF_TYPES.contains(nodeName) && !nodeName.endsWith("Preference")) {
                    continue;
                }
+1 −1

File changed.

Contains only whitespace changes.