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

Commit e880831d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Creates test service for on-device intelligence to request handles"

parents 02ef708e bb1588b0

packages/SystemUI/AndroidManifest.xml

+5 −0
Original line number Original line Diff line number Diff line
@@ -288,6 +288,11 @@ 
            android:exported="false"

            android:exported="false"

            android:permission="com.android.systemui.permission.SELF" />

            android:permission="com.android.systemui.permission.SELF" />





        <service android:name=".assist.AssistHandleService"

            android:exported="true"

            android:enabled="false"

        />



        <!-- started from PhoneWindowManager

        <!-- started from PhoneWindowManager

             TODO: Should have an android:permission attribute -->

             TODO: Should have an android:permission attribute -->

        <service android:name=".screenshot.TakeScreenshotService"

        <service android:name=".screenshot.TakeScreenshotService"

packages/SystemUI/src/com/android/systemui/assist/AssistHandleService.kt

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

 * Copyright (C) 2019 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.systemui.assist



import android.app.Service

import android.content.Intent

import android.os.IBinder

import dagger.Lazy

import javax.inject.Inject



class AssistHandleService @Inject constructor(private val assistManager: Lazy<AssistManager>)

    : Service() {



    private val binder = object : IAssistHandleService.Stub() {

        override fun requestAssistHandles() {

            assistManager.get().requestAssistHandles()

        }

    }



    override fun onBind(intent: Intent?): IBinder? {

        return binder

    }

}
 
 No newline at end of file

packages/SystemUI/src/com/android/systemui/assist/AssistModule.java

+9 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




package com.android.systemui.assist;

package com.android.systemui.assist;





import android.app.Service;

import android.content.Context;

import android.content.Context;

import android.os.Handler;

import android.os.Handler;

import android.os.HandlerThread;

import android.os.HandlerThread;
@@ -33,8 +34,11 @@ import java.util.Map; 
import javax.inject.Named;

import javax.inject.Named;

import javax.inject.Singleton;

import javax.inject.Singleton;





import dagger.Binds;

import dagger.Module;

import dagger.Module;

import dagger.Provides;

import dagger.Provides;

import dagger.multibindings.ClassKey;

import dagger.multibindings.IntoMap;





/** Module for dagger injections related to the Assistant. */

/** Module for dagger injections related to the Assistant. */

@Module

@Module
@@ -87,4 +91,9 @@ public abstract class AssistModule { 
    static Clock provideSystemClock() {

    static Clock provideSystemClock() {

        return SystemClock::uptimeMillis;

        return SystemClock::uptimeMillis;

    }

    }



    @Binds

    @IntoMap

    @ClassKey(AssistHandleService.class)

    abstract Service bindAssistHandleService(AssistHandleService assistHandleService);

}
 
}

packages/SystemUI/src/com/android/systemui/assist/IAssistHandleService.aidl

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

 * Copyright (c) 2009, 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.systemui.assist;



/** Interface implemented by AssisthandleService and called by on-device intelligence. */

interface IAssistHandleService {



    /** Request that the Assistant Handles be shown. */

    oneway void requestAssistHandles();

}
 
 No newline at end of file