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

Commit 56df32dc authored by Doris Ling's avatar Doris Ling Committed by android-build-merger
Browse files

Merge "Map the new category keys to the corresponding fragment." into pi-dev am: be5fa599 

am: b0452867

Change-Id: I44e1cc9b2e631b19bb51079230821d5e59f496ec
parents 8dc15da1 b0452867

src/com/android/settings/dashboard/DashboardFragmentRegistry.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -27,7 +27,9 @@ import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFrag 
import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;

import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;

import com.android.settings.development.DevelopmentSettingsDashboardFragment;

import com.android.settings.development.DevelopmentSettingsDashboardFragment;

import com.android.settings.deviceinfo.StorageDashboardFragment;

import com.android.settings.deviceinfo.StorageDashboardFragment;

import com.android.settings.display.NightDisplaySettings;

import com.android.settings.fuelgauge.PowerUsageSummary;

import com.android.settings.fuelgauge.PowerUsageSummary;

import com.android.settings.gestures.GestureSettings;

import com.android.settings.language.LanguageAndInputSettings;

import com.android.settings.language.LanguageAndInputSettings;

import com.android.settings.network.NetworkDashboardFragment;

import com.android.settings.network.NetworkDashboardFragment;

import com.android.settings.notification.ConfigureNotificationSettings;

import com.android.settings.notification.ConfigureNotificationSettings;
@@ -95,6 +97,10 @@ public class DashboardFragmentRegistry { 
                CategoryKey.CATEGORY_SECURITY_LOCKSCREEN);

                CategoryKey.CATEGORY_SECURITY_LOCKSCREEN);

        PARENT_TO_CATEGORY_KEY_MAP.put(ZenModeSettings.class.getName(),

        PARENT_TO_CATEGORY_KEY_MAP.put(ZenModeSettings.class.getName(),

                CategoryKey.CATEGORY_DO_NOT_DISTURB);

                CategoryKey.CATEGORY_DO_NOT_DISTURB);

        PARENT_TO_CATEGORY_KEY_MAP.put(GestureSettings.class.getName(),

            CategoryKey.CATEGORY_GESTURES);

        PARENT_TO_CATEGORY_KEY_MAP.put(NightDisplaySettings.class.getName(),

            CategoryKey.CATEGORY_NIGHT_LIGHT);





        CATEGORY_KEY_TO_PARENT_MAP = new ArrayMap<>(PARENT_TO_CATEGORY_KEY_MAP.size());

        CATEGORY_KEY_TO_PARENT_MAP = new ArrayMap<>(PARENT_TO_CATEGORY_KEY_MAP.size());

tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ import android.provider.SearchIndexableResource; 
import com.android.settings.R;

import com.android.settings.R;

import com.android.settings.testutils.SettingsRobolectricTestRunner;

import com.android.settings.testutils.SettingsRobolectricTestRunner;





import com.android.settingslib.drawer.CategoryKey;

import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.RuntimeEnvironment;
@@ -45,4 +46,10 @@ public class NightDisplaySettingsTest { 




        assertThat(indexedXml).contains(R.xml.night_display_settings);

        assertThat(indexedXml).contains(R.xml.night_display_settings);

    }

    }



    @Test

    public void getCategoryKey_isCategoryNightLight() {

        NightDisplaySettings settings = new NightDisplaySettings();

        assertThat(settings.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_NIGHT_LIGHT);

    }

}
 
}

tests/robotests/src/com/android/settings/gestures/GestureSettingsTest.java

0 → 100644
+34 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.gestures;



import static com.google.common.truth.Truth.assertThat;



import com.android.settings.testutils.SettingsRobolectricTestRunner;

import com.android.settingslib.drawer.CategoryKey;

import org.junit.Test;

import org.junit.runner.RunWith;



@RunWith(SettingsRobolectricTestRunner.class)

public class GestureSettingsTest {



    @Test

    public void getCategoryKey_isCategoryGestures() {

        GestureSettings settings = new GestureSettings();

        assertThat(settings.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_GESTURES);

    }

}