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

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

Merge "DO NOT MERGE Remove unused code" into tm-dev

parents 51f68390 bb774a90

packages/SystemUI/res/drawable/notif_dungeon_bg_gradient.xml

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

<!--

  ~ Copyright (C) 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.

  -->

<shape

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

    android:shape="rectangle">

    <gradient

        android:angle="90"

        android:startColor="#ff000000"

        android:endColor="#00000000"

        android:type="linear" />

</shape>

packages/SystemUI/res/layout/foreground_service_dungeon.xml

deleted100644 → 0
+0 −61
Original line number Original line Diff line number Diff line 
<!--

  ~ Copyright (C) 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.

  -->



<com.android.systemui.statusbar.notification.row.ForegroundServiceDungeonView

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

    android:id="@+id/foreground_service_dungeon"

    android:layout_width="@dimen/qs_panel_width"

    android:layout_height="wrap_content"

    android:layout_gravity="center_horizontal|bottom"

    android:visibility="visible"

>

    <LinearLayout

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:orientation="vertical"

        android:gravity="bottom"

        android:visibility="visible"

        android:background="@drawable/notif_dungeon_bg_gradient"

    >



        <!-- divider view -->

        <View

            android:layout_width="match_parent"

            android:layout_height="1dp"

            android:background="@color/GM2_grey_200"

            android:visibility="visible"

        />



        <TextView

            android:id="@+id/dungeon_title"

            android:layout_height="48dp"

            android:layout_width="match_parent"

            android:padding="8dp"

            android:text="Apps active in background"

            android:textColor="@color/GM2_grey_200"

        />



        <!--  List containing the actual foreground service notifications  -->

        <LinearLayout

            android:id="@+id/entry_list"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:gravity="bottom"

            android:orientation="vertical" >

        </LinearLayout>



    </LinearLayout>

</com.android.systemui.statusbar.notification.row.ForegroundServiceDungeonView>

packages/SystemUI/res/layout/foreground_service_dungeon_row.xml

deleted100644 → 0
+0 −43
Original line number Original line Diff line number Diff line 
<!--

  ~ Copyright (C) 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.

  -->



<com.android.systemui.statusbar.notification.row.DungeonRow

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

    android:id="@+id/foreground_service_dungeon_row"

    android:layout_width="match_parent"

    android:layout_height="48dp"

    android:padding="8dp"

    android:clickable="true"

    android:orientation="horizontal" >



    <com.android.systemui.statusbar.StatusBarIconView

        android:id="@+id/icon"

        android:layout_width="24dp"

        android:layout_height="24dp"

        android:padding="4dp" />



    <TextView

        android:id="@+id/app_name"

        android:layout_width="0dp"

        android:layout_weight="1"

        android:layout_height="wrap_content"

        android:paddingStart="4dp"

        android:gravity="center_vertical"

        android:layout_gravity="center_vertical"

        android:textColor="@color/GM2_grey_200"

    />



</com.android.systemui.statusbar.notification.row.DungeonRow>

packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewHierarchyManager.java

+1 −6
Original line number Original line Diff line number Diff line
@@ -45,7 +45,6 @@ import com.android.systemui.statusbar.notification.collection.legacy.VisualStabi 
import com.android.systemui.statusbar.notification.collection.render.NotifStackController;

import com.android.systemui.statusbar.notification.collection.render.NotifStackController;

import com.android.systemui.statusbar.notification.collection.render.NotifStats;

import com.android.systemui.statusbar.notification.collection.render.NotifStats;

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;

import com.android.systemui.statusbar.notification.stack.ForegroundServiceSectionController;

import com.android.systemui.statusbar.notification.stack.NotificationListContainer;

import com.android.systemui.statusbar.notification.stack.NotificationListContainer;

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

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

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

import com.android.systemui.statusbar.policy.KeyguardStateController;
@@ -97,7 +96,6 @@ public class NotificationViewHierarchyManager implements DynamicPrivacyControlle 
    private final Optional<Bubbles> mBubblesOptional;

    private final Optional<Bubbles> mBubblesOptional;

    private final DynamicPrivacyController mDynamicPrivacyController;

    private final DynamicPrivacyController mDynamicPrivacyController;

    private final KeyguardBypassController mBypassController;

    private final KeyguardBypassController mBypassController;

    private final ForegroundServiceSectionController mFgsSectionController;

    private final NotifPipelineFlags mNotifPipelineFlags;

    private final NotifPipelineFlags mNotifPipelineFlags;

    private AssistantFeedbackController mAssistantFeedbackController;

    private AssistantFeedbackController mAssistantFeedbackController;

    private final KeyguardStateController mKeyguardStateController;

    private final KeyguardStateController mKeyguardStateController;
@@ -129,7 +127,6 @@ public class NotificationViewHierarchyManager implements DynamicPrivacyControlle 
            KeyguardBypassController bypassController,

            KeyguardBypassController bypassController,

            Optional<Bubbles> bubblesOptional,

            Optional<Bubbles> bubblesOptional,

            DynamicPrivacyController privacyController,

            DynamicPrivacyController privacyController,

            ForegroundServiceSectionController fgsSectionController,

            DynamicChildBindController dynamicChildBindController,

            DynamicChildBindController dynamicChildBindController,

            LowPriorityInflationHelper lowPriorityInflationHelper,

            LowPriorityInflationHelper lowPriorityInflationHelper,

            AssistantFeedbackController assistantFeedbackController,

            AssistantFeedbackController assistantFeedbackController,
@@ -145,7 +142,6 @@ public class NotificationViewHierarchyManager implements DynamicPrivacyControlle 
        mVisualStabilityManager = visualStabilityManager;

        mVisualStabilityManager = visualStabilityManager;

        mStatusBarStateController = (SysuiStatusBarStateController) statusBarStateController;

        mStatusBarStateController = (SysuiStatusBarStateController) statusBarStateController;

        mEntryManager = notificationEntryManager;

        mEntryManager = notificationEntryManager;

        mFgsSectionController = fgsSectionController;

        mNotifPipelineFlags = notifPipelineFlags;

        mNotifPipelineFlags = notifPipelineFlags;

        Resources res = context.getResources();

        Resources res = context.getResources();

        mAlwaysExpandNonGroupedNotification =

        mAlwaysExpandNonGroupedNotification =
@@ -417,8 +413,7 @@ public class NotificationViewHierarchyManager implements DynamicPrivacyControlle 
                && mBubblesOptional.get().isBubbleNotificationSuppressedFromShade(

                && mBubblesOptional.get().isBubbleNotificationSuppressedFromShade(

                        ent.getKey(), ent.getSbn().getGroupKey());

                        ent.getKey(), ent.getSbn().getGroupKey());

        if (ent.isRowDismissed() || ent.isRowRemoved()

        if (ent.isRowDismissed() || ent.isRowRemoved()

                || isBubbleNotificationSuppressedFromShade

                || isBubbleNotificationSuppressedFromShade) {

                || mFgsSectionController.hasEntry(ent)) {

            // we want to suppress removed notifications because they could

            // we want to suppress removed notifications because they could

            // temporarily become children if they were isolated before.

            // temporarily become children if they were isolated before.

            return true;

            return true;

packages/SystemUI/src/com/android/systemui/statusbar/dagger/StatusBarDependenciesModule.java

+0 −3
Original line number Original line Diff line number Diff line
@@ -60,7 +60,6 @@ import com.android.systemui.statusbar.notification.collection.legacy.Notificatio 
import com.android.systemui.statusbar.notification.collection.legacy.VisualStabilityManager;

import com.android.systemui.statusbar.notification.collection.legacy.VisualStabilityManager;

import com.android.systemui.statusbar.notification.collection.notifcollection.CommonNotifCollection;

import com.android.systemui.statusbar.notification.collection.notifcollection.CommonNotifCollection;

import com.android.systemui.statusbar.notification.collection.render.NotificationVisibilityProvider;

import com.android.systemui.statusbar.notification.collection.render.NotificationVisibilityProvider;

import com.android.systemui.statusbar.notification.stack.ForegroundServiceSectionController;

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

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

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

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

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

import com.android.systemui.statusbar.phone.ManagedProfileControllerImpl;
@@ -198,7 +197,6 @@ public interface StatusBarDependenciesModule { 
            KeyguardBypassController bypassController,

            KeyguardBypassController bypassController,

            Optional<Bubbles> bubblesOptional,

            Optional<Bubbles> bubblesOptional,

            DynamicPrivacyController privacyController,

            DynamicPrivacyController privacyController,

            ForegroundServiceSectionController fgsSectionController,

            DynamicChildBindController dynamicChildBindController,

            DynamicChildBindController dynamicChildBindController,

            LowPriorityInflationHelper lowPriorityInflationHelper,

            LowPriorityInflationHelper lowPriorityInflationHelper,

            AssistantFeedbackController assistantFeedbackController,

            AssistantFeedbackController assistantFeedbackController,
@@ -217,7 +215,6 @@ public interface StatusBarDependenciesModule { 
                bypassController,

                bypassController,

                bubblesOptional,

                bubblesOptional,

                privacyController,

                privacyController,

                fgsSectionController,

                dynamicChildBindController,

                dynamicChildBindController,

                lowPriorityInflationHelper,

                lowPriorityInflationHelper,

                assistantFeedbackController,

                assistantFeedbackController,