From e6b32b7d3dad7d86876e9ad745a09069939887f1 Mon Sep 17 00:00:00 2001
From: Zoey Chen <zoeychen@google.com>
Date: Tue, 14 Feb 2023 11:35:51 +0000
Subject: [PATCH] [SPA] Move the network folder to spa/

Bug: 268144349
Test: manual
Change-Id: I97dcd047a35ff94f5f6bb7c304a81679f72b10a4
---
 .../settings/spa/{app => }/network/AirplaneModePreference.kt   | 3 +--
 .../settings/spa/{app => }/network/NetworkAndInternet.kt       | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
 rename src/com/android/settings/spa/{app => }/network/AirplaneModePreference.kt (98%)
 rename src/com/android/settings/spa/{app => }/network/NetworkAndInternet.kt (98%)

diff --git a/src/com/android/settings/spa/app/network/AirplaneModePreference.kt b/src/com/android/settings/spa/network/AirplaneModePreference.kt
similarity index 98%
rename from src/com/android/settings/spa/app/network/AirplaneModePreference.kt
rename to src/com/android/settings/spa/network/AirplaneModePreference.kt
index 9cdf76dd8b5..4af32211829 100644
--- a/src/com/android/settings/spa/app/network/AirplaneModePreference.kt
+++ b/src/com/android/settings/spa/network/AirplaneModePreference.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.settings.spa.app.network
+package com.android.settings.spa.network
 
 import android.content.Context
 import android.content.pm.PackageManager
@@ -66,7 +66,6 @@ private class AirplaneModeController(private val context: Context) : OnAirplaneM
                 && !context.packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
     }
 
-
     fun isAirplaneModeOn(): Boolean {
         return airplaneModeEnabler.isAirplaneModeOn()
     }
diff --git a/src/com/android/settings/spa/app/network/NetworkAndInternet.kt b/src/com/android/settings/spa/network/NetworkAndInternet.kt
similarity index 98%
rename from src/com/android/settings/spa/app/network/NetworkAndInternet.kt
rename to src/com/android/settings/spa/network/NetworkAndInternet.kt
index 307a2f7b935..9a3770e3120 100644
--- a/src/com/android/settings/spa/app/network/NetworkAndInternet.kt
+++ b/src/com/android/settings/spa/network/NetworkAndInternet.kt
@@ -27,7 +27,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.res.stringResource
 import com.android.settings.R
-import com.android.settings.spa.app.network.AirplaneModePreference
+import com.android.settings.spa.network.AirplaneModePreference
 import com.android.settingslib.RestrictedLockUtilsInternal
 import com.android.settingslib.Utils
 import com.android.settingslib.spa.framework.common.SettingsEntryBuilder