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

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

Merge "Integrate PipUI PipManager to PipController (7/N)"

parents 7c0b88d0 98adca4c

packages/CarSystemUI/res/values/config.xml

+0 −1
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ 
        <item>com.android.systemui.volume.VolumeUI</item>

        <item>com.android.systemui.statusbar.phone.StatusBar</item>

        <item>com.android.systemui.keyboard.KeyboardUI</item>

        <item>com.android.systemui.pip.PipUI</item>

        <item>com.android.systemui.shortcut.ShortcutKeyDispatcher</item>

        <item>com.android.systemui.LatencyTester</item>

        <item>com.android.systemui.globalactions.GlobalActionsComponent</item>

packages/CarSystemUI/src/com/android/systemui/CarSysUIComponent.java

+0 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import com.android.systemui.dagger.DependencyProvider; 
import com.android.systemui.dagger.SysUIComponent;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.SystemUIModule;

import com.android.systemui.pip.phone.dagger.PipModule;



import dagger.Subcomponent;
@@ -31,7 +30,6 @@ import dagger.Subcomponent; 
@Subcomponent(modules = {

        CarComponentBinder.class,

        DependencyProvider.class,

        PipModule.class,

        SystemUIModule.class,

        CarSystemUIModule.class,

        CarSystemUIBinder.class})

packages/CarSystemUI/src/com/android/systemui/CarSystemUIBinder.java

+0 −7
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import com.android.systemui.globalactions.GlobalActionsComponent; 
import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.keyguard.dagger.KeyguardModule;

import com.android.systemui.onehanded.OneHandedUI;

import com.android.systemui.pip.PipUI;

import com.android.systemui.power.PowerUI;

import com.android.systemui.recents.Recents;

import com.android.systemui.recents.RecentsModule;
@@ -101,12 +100,6 @@ public abstract class CarSystemUIBinder { 
    @ClassKey(OneHandedUI.class)

    public abstract SystemUI bindOneHandedUI(OneHandedUI sysui);



    /** Inject into PipUI. */

    @Binds

    @IntoMap

    @ClassKey(PipUI.class)

    public abstract SystemUI bindPipUI(PipUI sysui);



    /** Inject into PowerUI. */

    @Binds

    @IntoMap

packages/SystemUI/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ 
            android:excludeFromRecents="true"

            android:visibleToInstantApps="true"/>



        <!-- started from PipUI -->

        <!-- started from PipController -->

        <activity

            android:name=".pip.tv.PipMenuActivity"

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

packages/SystemUI/README.md

+0 −4
Original line number Diff line number Diff line
@@ -115,10 +115,6 @@ Shows UI for keyboard shortcuts (triggered by keyboard shortcut). 


Shows the overlay controls when One handed is triggered.



### [com.android.systemui.pip.PipUI](/packages/SystemUI/src/com/android/systemui/pip/PipUI.java)



Shows the overlay controls when Pip is showing.



### [com.android.systemui.shortcut.ShortcutKeyDispatcher](/packages/SystemUI/src/com/android/systemui/shortcut/ShortcutKeyDispatcher.java)



Dispatches shortcut to System UI components.