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

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

Merge "Delete dead code related to CarStatusBar" into rvc-qpr-dev

parents 2e6e7534 df8d0777

packages/CarSystemUI/res/layout/super_notification_shade.xml

deleted100644 → 0
+0 −80
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

**

** Copyright 2020, 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.

*/

-->



<!-- This is the notification shade window. -->

<com.android.systemui.statusbar.phone.NotificationShadeWindowView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:sysui="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fitsSystemWindows="true">



    <com.android.systemui.statusbar.BackDropView

        android:id="@+id/backdrop"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:visibility="gone"

        sysui:ignoreRightInset="true"

    >

        <ImageView android:id="@+id/backdrop_back"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:scaleType="centerCrop"/>

        <ImageView android:id="@+id/backdrop_front"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:scaleType="centerCrop"

            android:visibility="invisible"/>

    </com.android.systemui.statusbar.BackDropView>



    <com.android.systemui.statusbar.ScrimView

        android:id="@+id/scrim_behind"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:importantForAccessibility="no"

        sysui:ignoreRightInset="true"

    />



    <include layout="@layout/brightness_mirror"/>



    <ViewStub android:id="@+id/fullscreen_user_switcher_stub"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout="@layout/car_fullscreen_user_switcher"/>



    <include layout="@layout/notification_center_activity"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_marginBottom="@dimen/navigation_bar_height"

        android:visibility="invisible"/>



    <include layout="@layout/status_bar_expanded"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:visibility="invisible"/>



    <com.android.systemui.statusbar.ScrimView

        android:id="@+id/scrim_in_front"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:importantForAccessibility="no"

        sysui:ignoreRightInset="true"

    />



</com.android.systemui.statusbar.phone.NotificationShadeWindowView>

packages/CarSystemUI/res/layout/super_status_bar.xml

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

**

** Copyright 2020, 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.

*/

-->



<!-- This is the status bar window. -->

<com.android.systemui.statusbar.phone.StatusBarWindowView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:sysui="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fitsSystemWindows="true">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical"

    >

        <FrameLayout

            android:id="@+id/status_bar_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:visibility="gone"

        />



        <FrameLayout

            android:id="@+id/car_top_navigation_bar_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"/>

    </LinearLayout>



</com.android.systemui.statusbar.phone.StatusBarWindowView>

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

+3 −17
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ import com.android.systemui.bubbles.dagger.BubbleModule; 
import com.android.systemui.car.navigationbar.CarNavigationBar;

import com.android.systemui.car.notification.CarNotificationModule;

import com.android.systemui.car.sideloaded.SideLoadedAppController;

import com.android.systemui.car.statusbar.CarStatusBar;

import com.android.systemui.car.statusbar.CarStatusBarModule;

import com.android.systemui.car.voicerecognition.ConnectedDeviceVoiceRecognitionNotifier;

import com.android.systemui.car.volume.VolumeUI;

import com.android.systemui.car.window.OverlayWindowModule;
@@ -36,10 +34,10 @@ import com.android.systemui.recents.Recents; 
import com.android.systemui.recents.RecentsModule;

import com.android.systemui.shortcut.ShortcutKeyDispatcher;

import com.android.systemui.stackdivider.Divider;

import com.android.systemui.statusbar.dagger.StatusBarModule;

import com.android.systemui.statusbar.notification.InstantAppNotifier;

import com.android.systemui.statusbar.notification.dagger.NotificationsModule;

import com.android.systemui.statusbar.phone.StatusBar;

import com.android.systemui.statusbar.tv.TvStatusBar;

import com.android.systemui.theme.ThemeOverlayController;

import com.android.systemui.toast.ToastUI;

import com.android.systemui.util.leak.GarbageMonitor;
@@ -50,7 +48,7 @@ import dagger.multibindings.ClassKey; 
import dagger.multibindings.IntoMap;



/** Binder for car specific {@link SystemUI} modules. */

@Module(includes = {RecentsModule.class, CarStatusBarModule.class, NotificationsModule.class,

@Module(includes = {RecentsModule.class, StatusBarModule.class, NotificationsModule.class,

        BubbleModule.class, KeyguardModule.class, OverlayWindowModule.class,

        CarNotificationModule.class})

public abstract class CarSystemUIBinder {
@@ -155,19 +153,7 @@ public abstract class CarSystemUIBinder { 
    @Binds

    @IntoMap

    @ClassKey(StatusBar.class)

    public abstract SystemUI bindsStatusBar(CarStatusBar sysui);



    /** Inject into TvStatusBar. */

    @Binds

    @IntoMap

    @ClassKey(TvStatusBar.class)

    public abstract SystemUI bindsTvStatusBar(TvStatusBar sysui);



    /** Inject into StatusBarGoogle. */

    @Binds

    @IntoMap

    @ClassKey(CarStatusBar.class)

    public abstract SystemUI bindsCarStatusBar(CarStatusBar sysui);

    public abstract SystemUI bindsStatusBar(StatusBar sysui);



    /** Inject into VolumeUI. */

    @Binds

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

+0 −11
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ import com.android.systemui.broadcast.BroadcastDispatcher; 
import com.android.systemui.car.CarDeviceProvisionedController;

import com.android.systemui.car.CarDeviceProvisionedControllerImpl;

import com.android.systemui.car.keyguard.CarKeyguardViewController;

import com.android.systemui.car.statusbar.CarStatusBar;

import com.android.systemui.car.statusbar.CarStatusBarKeyguardViewManager;

import com.android.systemui.car.statusbar.DozeServiceHost;

import com.android.systemui.car.statusbar.DummyNotificationShadeWindowController;

import com.android.systemui.car.volume.CarVolumeDialogComponent;
@@ -59,8 +57,6 @@ import com.android.systemui.statusbar.phone.NotificationGroupManager; 
import com.android.systemui.statusbar.phone.NotificationShadeWindowController;

import com.android.systemui.statusbar.phone.ShadeController;

import com.android.systemui.statusbar.phone.ShadeControllerImpl;

import com.android.systemui.statusbar.phone.StatusBar;

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;

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

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

import com.android.systemui.statusbar.policy.ConfigurationController;
@@ -157,17 +153,10 @@ public abstract class CarSystemUIModule { 
    abstract SystemUIRootComponent bindSystemUIRootComponent(

            CarSystemUIRootComponent systemUIRootComponent);



    @Binds

    public abstract StatusBar bindStatusBar(CarStatusBar statusBar);



    @Binds

    abstract VolumeDialogComponent bindVolumeDialogComponent(

            CarVolumeDialogComponent carVolumeDialogComponent);



    @Binds

    abstract StatusBarKeyguardViewManager bindStatusBarKeyguardViewManager(

            CarStatusBarKeyguardViewManager keyguardViewManager);



    @Binds

    abstract KeyguardViewController bindKeyguardViewController(

            CarKeyguardViewController carKeyguardViewController);

packages/CarSystemUI/src/com/android/systemui/car/statusbar/CarStatusBar.java

deleted100644 → 0
+0 −519

File deleted.

Preview size limit exceeded, changes collapsed.