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

Commit f788d809 authored by Jason Hsu's avatar Jason Hsu Committed by Android (Google) Code Review
Browse files

Merge "Implement Hearing Devices Quick Settings Tile (5/n)" into main

parents 9c699ddf 048e1760

packages/SystemUI/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -1059,6 +1059,13 @@ 
            </intent-filter>

        </receiver>



        <receiver android:name=".accessibility.hearingaid.HearingDevicesDialogReceiver"

            android:exported="false">

            <intent-filter android:priority="1">

                <action android:name="com.android.systemui.action.LAUNCH_HEARING_DEVICES_DIALOG" />

            </intent-filter>

        </receiver>



        <activity android:name=".logcat.LogAccessDialogActivity"

                  android:theme="@android:style/Theme.Translucent.NoTitleBar"

                  android:excludeFromRecents="true"

packages/SystemUI/aconfig/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ package { 
        "//visibility:override",

        "//frameworks/base/packages/SystemUI:__subpackages__",

        "//frameworks/libs/systemui/tracinglib:__subpackages__",

        "//frameworks/base/services/accessibility:__subpackages__",

        "//frameworks/base/services/tests:__subpackages__",

        "//platform_testing:__subpackages__",

        "//vendor:__subpackages__",

        "//cts:__subpackages__",

packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogReceiver.java

0 → 100644
+52 −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.systemui.accessibility.hearingaid;



import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;



import com.android.systemui.Flags;



import javax.inject.Inject;



/**

 * BroadcastReceiver for handling hearing devices dialog intent.

 *

 * <p> This is not exported. Need to call from framework and use SYSTEM user to send the intent.

 */

public class HearingDevicesDialogReceiver extends BroadcastReceiver {

    public static String ACTION = "com.android.systemui.action.LAUNCH_HEARING_DEVICES_DIALOG";



    private final HearingDevicesDialogManager mDialogManager;

    @Inject

    public HearingDevicesDialogReceiver(

            HearingDevicesDialogManager hearingDevicesDialogManager) {

        mDialogManager = hearingDevicesDialogManager;

    }



    @Override

    public void onReceive(Context context, Intent intent) {

        if (!Flags.hearingAidsQsTileDialog()) {

            return;

        }



        if (ACTION.equals(intent.getAction())) {

            mDialogManager.showDialog(/* view= */ null);

        }

    }

}

packages/SystemUI/src/com/android/systemui/dagger/DefaultBroadcastReceiverBinder.java

+10 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui.dagger; 
import android.content.BroadcastReceiver;



import com.android.systemui.GuestResetOrExitSessionReceiver;

import com.android.systemui.accessibility.hearingaid.HearingDevicesDialogReceiver;

import com.android.systemui.media.dialog.MediaOutputDialogReceiver;

import com.android.systemui.people.widget.PeopleSpaceWidgetPinnedReceiver;

import com.android.systemui.people.widget.PeopleSpaceWidgetProvider;
@@ -88,4 +89,13 @@ public abstract class DefaultBroadcastReceiverBinder { 
    @ClassKey(GuestResetOrExitSessionReceiver.class)

    public abstract BroadcastReceiver bindGuestResetOrExitSessionReceiver(

            GuestResetOrExitSessionReceiver broadcastReceiver);



    /**

     *

     */

    @Binds

    @IntoMap

    @ClassKey(HearingDevicesDialogReceiver.class)

    public abstract BroadcastReceiver bindHearingDevicesDialogReceiver(

            HearingDevicesDialogReceiver broadcastReceiver);

}

services/accessibility/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ java_library_static { 
    ],

    static_libs: [

        "com_android_server_accessibility_flags_lib",

        "//frameworks/base/packages/SystemUI/aconfig:com_android_systemui_flags_lib",



    ],

}