diff options
11 files changed, 28 insertions, 31 deletions
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index ab23cd61d90d..5519b5171090 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -459,7 +459,7 @@ android:label="@string/screenshot_scroll_label" android:finishOnTaskLaunch="true" /> - <service android:name=".screenshot.ScreenshotProxyService" + <service android:name=".screenshot.proxy.ScreenshotProxyService" android:permission="com.android.systemui.permission.SELF" android:exported="false" /> diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/screenshot/ActionIntentExecutorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/screenshot/ActionIntentExecutorTest.kt index 612d646bb7d4..53a083f9ceae 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/screenshot/ActionIntentExecutorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/screenshot/ActionIntentExecutorTest.kt @@ -17,13 +17,13 @@ package com.android.systemui.screenshot import android.content.Intent -import androidx.test.ext.junit.runners.AndroidJUnit4 import android.os.Process.myUserHandle import android.platform.test.annotations.EnableFlags import android.testing.TestableContext +import androidx.test.ext.junit.runners.AndroidJUnit4 import com.android.systemui.Flags import com.android.systemui.SysuiTestCase -import com.android.systemui.screenshot.proxy.SystemUiProxy +import com.android.systemui.screenshot.proxy.ScreenshotProxy import com.android.systemui.settings.DisplayTracker import com.android.systemui.shared.system.ActivityManagerWrapper import com.android.systemui.statusbar.phone.CentralSurfaces @@ -45,7 +45,7 @@ class ActionIntentExecutorTest : SysuiTestCase() { private val testableContext = TestableContext(mContext) private val activityManagerWrapper = mock<ActivityManagerWrapper>() - private val systemUiProxy = mock<SystemUiProxy>() + private val screenshotProxy = mock<ScreenshotProxy>() private val displayTracker = mock<DisplayTracker>() @@ -55,7 +55,7 @@ class ActionIntentExecutorTest : SysuiTestCase() { activityManagerWrapper, testScope, mainDispatcher, - systemUiProxy, + screenshotProxy, displayTracker, ) diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ActionIntentExecutor.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ActionIntentExecutor.kt index 7b01c36489fb..a365b7c5e9a1 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ActionIntentExecutor.kt +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ActionIntentExecutor.kt @@ -37,7 +37,7 @@ import com.android.systemui.Flags import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Main -import com.android.systemui.screenshot.proxy.SystemUiProxy +import com.android.systemui.screenshot.proxy.ScreenshotProxy import com.android.systemui.settings.DisplayTracker import com.android.systemui.shared.system.ActivityManagerWrapper import com.android.systemui.statusbar.phone.CentralSurfaces @@ -55,7 +55,7 @@ constructor( private val activityManagerWrapper: ActivityManagerWrapper, @Application private val applicationScope: CoroutineScope, @Main private val mainDispatcher: CoroutineDispatcher, - private val systemUiProxy: SystemUiProxy, + private val screenshotProxy: ScreenshotProxy, private val displayTracker: DisplayTracker, ) { /** @@ -89,7 +89,7 @@ constructor( CentralSurfaces.SYSTEM_DIALOG_REASON_SCREENSHOT ) } - systemUiProxy.dismissKeyguard() + screenshotProxy.dismissKeyguard() var transitionOptions: ActivityOptions? = null if (transitionCoordinator?.decor?.isAttachedToWindow == true) { transitionCoordinator.startExit() @@ -127,7 +127,7 @@ constructor( private suspend fun launchCrossProfileIntent( user: UserHandle, intent: Intent, - bundle: Bundle? + bundle: Bundle?, ) { val connector = getCrossProfileConnector(user) val completion = CompletableDeferred<Unit>() diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/dagger/ScreenshotModule.java b/packages/SystemUI/src/com/android/systemui/screenshot/dagger/ScreenshotModule.java index 90695fa00ceb..253e3a613083 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/dagger/ScreenshotModule.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/dagger/ScreenshotModule.java @@ -38,7 +38,7 @@ import com.android.systemui.screenshot.appclips.AppClipsScreenshotHelperService; import com.android.systemui.screenshot.appclips.AppClipsService; import com.android.systemui.screenshot.message.MessageModule; import com.android.systemui.screenshot.policy.ScreenshotPolicyModule; -import com.android.systemui.screenshot.proxy.SystemUiProxyModule; +import com.android.systemui.screenshot.proxy.ScreenshotProxyModule; import com.android.systemui.screenshot.ui.viewmodel.ScreenshotViewModel; import dagger.Binds; @@ -50,7 +50,7 @@ import dagger.multibindings.IntoMap; /** * Defines injectable resources for Screenshots */ -@Module(includes = {ScreenshotPolicyModule.class, SystemUiProxyModule.class, MessageModule.class}) +@Module(includes = {ScreenshotPolicyModule.class, ScreenshotProxyModule.class, MessageModule.class}) public abstract class ScreenshotModule { @Binds diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/data/repository/DisplayContentRepositoryImpl.kt b/packages/SystemUI/src/com/android/systemui/screenshot/data/repository/DisplayContentRepositoryImpl.kt index e9599dcb026d..ec34808459c8 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/data/repository/DisplayContentRepositoryImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/screenshot/data/repository/DisplayContentRepositoryImpl.kt @@ -22,21 +22,21 @@ import android.app.IActivityTaskManager import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.screenshot.data.model.DisplayContentModel import com.android.systemui.screenshot.data.model.SystemUiState -import com.android.systemui.screenshot.proxy.SystemUiProxy +import com.android.systemui.screenshot.proxy.ScreenshotProxy import javax.inject.Inject import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.withContext /** * Implements DisplayTaskRepository using [IActivityTaskManager], along with [ProfileTypeRepository] - * and [SystemUiProxy]. + * and [ScreenshotProxy]. */ @SuppressLint("MissingPermission") class DisplayContentRepositoryImpl @Inject constructor( private val atmService: IActivityTaskManager, - private val systemUiProxy: SystemUiProxy, + private val screenshotProxy: ScreenshotProxy, @Background private val background: CoroutineDispatcher, ) : DisplayContentRepository { @@ -53,8 +53,8 @@ constructor( ): DisplayContentModel { return DisplayContentModel( displayId, - SystemUiState(systemUiProxy.isNotificationShadeExpanded()), - rootTasks + SystemUiState(screenshotProxy.isNotificationShadeExpanded()), + rootTasks, ) } } diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/IOnDoneCallback.aidl b/packages/SystemUI/src/com/android/systemui/screenshot/proxy/IOnDoneCallback.aidl index e15030f78234..fb97fa71480b 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/IOnDoneCallback.aidl +++ b/packages/SystemUI/src/com/android/systemui/screenshot/proxy/IOnDoneCallback.aidl @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.screenshot; +package com.android.systemui.screenshot.proxy; interface IOnDoneCallback { void onDone(boolean success); diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/IScreenshotProxy.aidl b/packages/SystemUI/src/com/android/systemui/screenshot/proxy/IScreenshotProxy.aidl index d2e3fbd65762..7b2f7e699521 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/IScreenshotProxy.aidl +++ b/packages/SystemUI/src/com/android/systemui/screenshot/proxy/IScreenshotProxy.aidl @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.systemui.screenshot; +package com.android.systemui.screenshot.proxy; -import com.android.systemui.screenshot.IOnDoneCallback; +import com.android.systemui.screenshot.proxy.IOnDoneCallback; /** Interface implemented by ScreenshotProxyService */ interface IScreenshotProxy { diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/proxy/SystemUiProxy.kt b/packages/SystemUI/src/com/android/systemui/screenshot/proxy/ScreenshotProxy.kt index e3eb3c4de80a..b44168f70ce3 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/proxy/SystemUiProxy.kt +++ b/packages/SystemUI/src/com/android/systemui/screenshot/proxy/ScreenshotProxy.kt @@ -24,7 +24,7 @@ package com.android.systemui.screenshot.proxy * * TODO: Rename and relocate 'ScreenshotProxyService' to this package and remove duplicate clients. */ -interface SystemUiProxy { +interface ScreenshotProxy { /** Indicate if the notification shade is "open"... (not in the fully collapsed position) */ suspend fun isNotificationShadeExpanded(): Boolean diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/proxy/SystemUiProxyClient.kt b/packages/SystemUI/src/com/android/systemui/screenshot/proxy/ScreenshotProxyClient.kt index dcf58bde5f70..1158e2eb0ae5 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/proxy/SystemUiProxyClient.kt +++ b/packages/SystemUI/src/com/android/systemui/screenshot/proxy/ScreenshotProxyClient.kt @@ -22,9 +22,6 @@ import android.content.Intent import android.util.Log import com.android.internal.infra.ServiceConnector import com.android.systemui.dagger.qualifiers.Application -import com.android.systemui.screenshot.IOnDoneCallback -import com.android.systemui.screenshot.IScreenshotProxy -import com.android.systemui.screenshot.ScreenshotProxyService import javax.inject.Inject import kotlin.coroutines.resume import kotlin.coroutines.suspendCoroutine @@ -32,8 +29,8 @@ import kotlinx.coroutines.CompletableDeferred private const val TAG = "SystemUiProxy" -/** An implementation of [SystemUiProxy] using [ScreenshotProxyService]. */ -class SystemUiProxyClient @Inject constructor(@Application context: Context) : SystemUiProxy { +/** An implementation of [ScreenshotProxy] using [ScreenshotProxyService]. */ +class ScreenshotProxyClient @Inject constructor(@Application context: Context) : ScreenshotProxy { @SuppressLint("ImplicitSamInstance") private val proxyConnector: ServiceConnector<IScreenshotProxy> = ServiceConnector.Impl( @@ -41,7 +38,7 @@ class SystemUiProxyClient @Inject constructor(@Application context: Context) : S Intent(context, ScreenshotProxyService::class.java), Context.BIND_AUTO_CREATE or Context.BIND_WAIVE_PRIORITY or Context.BIND_NOT_VISIBLE, context.userId, - IScreenshotProxy.Stub::asInterface + IScreenshotProxy.Stub::asInterface, ) override suspend fun isNotificationShadeExpanded(): Boolean = suspendCoroutine { k -> diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/proxy/SystemUiProxyModule.kt b/packages/SystemUI/src/com/android/systemui/screenshot/proxy/ScreenshotProxyModule.kt index 4dd5cc4b55b4..797be9121ae8 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/proxy/SystemUiProxyModule.kt +++ b/packages/SystemUI/src/com/android/systemui/screenshot/proxy/ScreenshotProxyModule.kt @@ -18,14 +18,13 @@ package com.android.systemui.screenshot.proxy import android.app.Service import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.screenshot.ScreenshotProxyService import dagger.Binds import dagger.Module import dagger.multibindings.ClassKey import dagger.multibindings.IntoMap @Module -interface SystemUiProxyModule { +interface ScreenshotProxyModule { @Binds @IntoMap @@ -34,5 +33,5 @@ interface SystemUiProxyModule { @Binds @SysUISingleton - fun bindSystemUiProxy(systemUiProxyClient: SystemUiProxyClient): SystemUiProxy + fun bindSystemUiProxy(screenshotProxyClient: ScreenshotProxyClient): ScreenshotProxy } diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotProxyService.kt b/packages/SystemUI/src/com/android/systemui/screenshot/proxy/ScreenshotProxyService.kt index 6df22f036273..a84f55268678 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotProxyService.kt +++ b/packages/SystemUI/src/com/android/systemui/screenshot/proxy/ScreenshotProxyService.kt @@ -13,7 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.systemui.screenshot + +package com.android.systemui.screenshot.proxy import android.content.Intent import android.os.IBinder @@ -67,7 +68,7 @@ constructor( null, true /* dismissShade */, true /* afterKeyguardGone */, - true /* deferred */ + true, /* deferred */ ) } |