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

Commit b8a3b67f authored by Michal Brzezinski's avatar Michal Brzezinski
Browse files

Removing unnecessary modules from SystemUIModule 

Keyboard and touchpad modules bloat other SysUI variants even though they are not needed there.
- creating TouchpadKeyboardTutorialModule
- making KeyboardModule and TouchpadKeyboardTutorialModule optional for SysUI variants

Fixes: 354911134
Test: APK size decreases for other sysui variants
Flag: EXEMPT dagger graph change
Change-Id: I410a2d84542b588f73f7ed7890375d4abfcda8fd
parent e78e520d

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

+0 −7
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import com.android.systemui.screenshot.scroll.LongScreenshotActivity; 
import com.android.systemui.sensorprivacy.SensorUseStartedActivity;

import com.android.systemui.settings.brightness.BrightnessDialog;

import com.android.systemui.telephony.ui.activity.SwitchToManagedProfileForCallActivity;

import com.android.systemui.touchpad.tutorial.ui.view.TouchpadTutorialActivity;

import com.android.systemui.tuner.TunerActivity;

import com.android.systemui.usb.UsbAccessoryUriActivity;

import com.android.systemui.usb.UsbConfirmActivity;
@@ -157,10 +156,4 @@ public abstract class DefaultActivityBinder { 
    @ClassKey(SwitchToManagedProfileForCallActivity.class)

    public abstract Activity bindSwitchToManagedProfileForCallActivity(

            SwitchToManagedProfileForCallActivity activity);



    /** Inject into TouchpadTutorialActivity. */

    @Binds

    @IntoMap

    @ClassKey(TouchpadTutorialActivity.class)

    public abstract Activity bindTouchpadTutorialActivity(TouchpadTutorialActivity activity);

}

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

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ import com.android.systemui.statusbar.policy.IndividualSensorPrivacyControllerIm 
import com.android.systemui.statusbar.policy.SensorPrivacyController;

import com.android.systemui.statusbar.policy.SensorPrivacyControllerImpl;

import com.android.systemui.toast.ToastModule;

import com.android.systemui.touchpad.tutorial.TouchpadKeyboardTutorialModule;

import com.android.systemui.unfold.SysUIUnfoldStartableModule;

import com.android.systemui.unfold.UnfoldTransitionModule;

import com.android.systemui.util.kotlin.SysUICoroutinesModule;
@@ -141,6 +142,7 @@ import javax.inject.Named; 
        SysUIUnfoldStartableModule.class,

        UnfoldTransitionModule.Startables.class,

        ToastModule.class,

        TouchpadKeyboardTutorialModule.class,

        VolumeModule.class,

        WallpaperModule.class,

        ShortcutHelperModule.class,

packages/SystemUI/src/com/android/systemui/touchpad/tutorial/TouchpadKeyboardTutorialModule.kt

0 → 100644
+33 −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.touchpad.tutorial



import android.app.Activity

import com.android.systemui.touchpad.tutorial.ui.view.TouchpadTutorialActivity

import dagger.Binds

import dagger.Module

import dagger.multibindings.ClassKey

import dagger.multibindings.IntoMap



@Module

interface TouchpadKeyboardTutorialModule {



    @Binds

    @IntoMap

    @ClassKey(TouchpadTutorialActivity::class)

    fun activity(impl: TouchpadTutorialActivity): Activity

}