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

Commit 9c9c0a3d authored by Jason Chiu's avatar Jason Chiu
Browse files

[Catalyst] Network and Intenet screen migration 

- Add a flag for the migration
- Add the skeleton of the screen

Test: atest NetworkDashboardScreenTest
Bug: 368355361
Flag: com.android.settings.flags.catalyst_network_provider_and_internet_screen
Change-Id: I37622d318f2a52a7c60c9fa965b94fd135ce0b60
parent 17476190

aconfig/catalyst/network_and_internet.aconfig

0 → 100644
+9 −0
Original line number Diff line number Diff line 
package: "com.android.settings.flags"

container: "system"



flag {

  name: "catalyst_network_provider_and_internet_screen"

  namespace: "android_settings"

  description: "Flag for Network & Internet"

  bug: "323791114"

}

src/com/android/settings/network/NetworkDashboardFragment.java

+7 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import android.app.settings.SettingsEnums; 
import android.content.Context;

import android.content.Intent;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import com.android.settings.R;
@@ -115,4 +116,10 @@ public class NetworkDashboardFragment extends DashboardFragment implements 
                    return buildPreferenceControllers(context, null /* lifecycle */);

                }

            };



    @Nullable

    @Override

    public String getPreferenceScreenBindingKey(@NonNull Context context) {

        return NetworkDashboardScreen.KEY;

    }

}

src/com/android/settings/network/NetworkDashboardScreen.kt

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

 * Copyright (C) 2024 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.network



import android.content.Context

import com.android.settings.R

import com.android.settings.flags.Flags

import com.android.settingslib.metadata.ProvidePreferenceScreen

import com.android.settingslib.metadata.preferenceHierarchy

import com.android.settingslib.preference.PreferenceScreenCreator



@ProvidePreferenceScreen

class NetworkDashboardScreen : PreferenceScreenCreator {

    override val key: String

        get() = KEY



    override val title: Int

        get() = R.string.network_dashboard_title



    override val icon: Int

        get() = R.drawable.ic_settings_wireless_filled



    override fun isFlagEnabled(context: Context) = Flags.catalystNetworkProviderAndInternetScreen()



    override fun hasCompleteHierarchy() = false



    override fun fragmentClass() = NetworkDashboardFragment::class.java



    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}



    companion object {

        const val KEY = "network_provider_and_internet_screen"

    }

}

tests/robotests/src/com/android/settings/network/NetworkDashboardScreenTest.kt

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

 * Copyright (C) 2024 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.network



import androidx.test.ext.junit.runners.AndroidJUnit4

import com.android.settings.flags.Flags

import com.android.settingslib.preference.CatalystScreenTestCase

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

import org.junit.Test

import org.junit.runner.RunWith



@RunWith(AndroidJUnit4::class)

class NetworkDashboardScreenTest : CatalystScreenTestCase() {

    override val preferenceScreenCreator = NetworkDashboardScreen()



    override val flagName: String

        get() = Flags.FLAG_CATALYST_NETWORK_PROVIDER_AND_INTERNET_SCREEN



    @Test

    fun key() {

        assertThat(preferenceScreenCreator.key).isEqualTo(NetworkDashboardScreen.KEY)

    }



    override fun migration() {

    }

}