From 7a851dd202276b91250a177bf82b1777eb3cbc56 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Sat, 17 Dec 2022 11:59:59 +0900 Subject: [PATCH] universal7885: parts: Fix compilation for QPR1 merge --- .../src/com/eurekateam/samsungextras/DeviceSettingsActivity.kt | 2 +- .../src/com/eurekateam/samsungextras/battery/BatteryActivity.kt | 2 +- .../src/com/eurekateam/samsungextras/dolby/DolbyActivity.kt | 2 +- .../eurekateam/samsungextras/flashlight/FlashLightActivity.kt | 2 +- .../eurekateam/samsungextras/smartcharge/SmartChargeActivity.kt | 2 +- .../eurekateam/samsungextras/speaker/ClearSpeakerActivity.kt | 2 +- .../src/com/eurekateam/samsungextras/swap/SwapActivity.kt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/DeviceSettingsActivity.kt b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/DeviceSettingsActivity.kt index 23e2e36..fe52965 100644 --- a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/DeviceSettingsActivity.kt +++ b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/DeviceSettingsActivity.kt @@ -17,7 +17,7 @@ package com.eurekateam.samsungextras import android.os.Bundle import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity -import com.android.settingslib.collapsingtoolbar.R +import com.android.settingslib.widget.R class DeviceSettingsActivity : CollapsingToolbarBaseActivity() { public override fun onCreate(savedInstanceState: Bundle?) { diff --git a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/battery/BatteryActivity.kt b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/battery/BatteryActivity.kt index c549065..1e74284 100644 --- a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/battery/BatteryActivity.kt +++ b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/battery/BatteryActivity.kt @@ -17,7 +17,7 @@ package com.eurekateam.samsungextras.battery import android.os.Bundle import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity -import com.android.settingslib.collapsingtoolbar.R +import com.android.settingslib.widget.R class BatteryActivity : CollapsingToolbarBaseActivity() { private var mInstance : BatteryFragment? = null diff --git a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/dolby/DolbyActivity.kt b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/dolby/DolbyActivity.kt index 669635b..8f76b1d 100644 --- a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/dolby/DolbyActivity.kt +++ b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/dolby/DolbyActivity.kt @@ -18,7 +18,7 @@ package com.eurekateam.samsungextras.dolby import android.os.Bundle import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity -import com.android.settingslib.collapsingtoolbar.R +import com.android.settingslib.widget.R class DolbyActivity : CollapsingToolbarBaseActivity() { private var mInstance : DolbyFragment? = null diff --git a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/flashlight/FlashLightActivity.kt b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/flashlight/FlashLightActivity.kt index f5d5623..3ecd79f 100644 --- a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/flashlight/FlashLightActivity.kt +++ b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/flashlight/FlashLightActivity.kt @@ -17,7 +17,7 @@ package com.eurekateam.samsungextras.flashlight import android.os.Bundle import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity -import com.android.settingslib.collapsingtoolbar.R +import com.android.settingslib.widget.R class FlashLightActivity : CollapsingToolbarBaseActivity() { private var mInstance : FlashLightFragment? = null diff --git a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/smartcharge/SmartChargeActivity.kt b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/smartcharge/SmartChargeActivity.kt index 32b3c63..839d62c 100644 --- a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/smartcharge/SmartChargeActivity.kt +++ b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/smartcharge/SmartChargeActivity.kt @@ -17,7 +17,7 @@ package com.eurekateam.samsungextras.smartcharge import android.os.Bundle import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity -import com.android.settingslib.collapsingtoolbar.R +import com.android.settingslib.widget.R class SmartChargeActivity : CollapsingToolbarBaseActivity() { private var mInstance : SmartChargeFragment? = null diff --git a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/speaker/ClearSpeakerActivity.kt b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/speaker/ClearSpeakerActivity.kt index 1de01ec..b55b4b3 100644 --- a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/speaker/ClearSpeakerActivity.kt +++ b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/speaker/ClearSpeakerActivity.kt @@ -17,7 +17,7 @@ package com.eurekateam.samsungextras.speaker import android.os.Bundle import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity -import com.android.settingslib.collapsingtoolbar.R +import com.android.settingslib.widget.R class ClearSpeakerActivity : CollapsingToolbarBaseActivity() { private var mInstance : ClearSpeakerFragment? = null diff --git a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/swap/SwapActivity.kt b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/swap/SwapActivity.kt index 09795b8..1c8123d 100644 --- a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/swap/SwapActivity.kt +++ b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/swap/SwapActivity.kt @@ -17,7 +17,7 @@ package com.eurekateam.samsungextras.swap import android.os.Bundle import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity -import com.android.settingslib.collapsingtoolbar.R +import com.android.settingslib.widget.R class SwapActivity : CollapsingToolbarBaseActivity() { private var mInstance : SwapFragment? = null