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

Commit 5db341ed authored by Ioana Alexandru's avatar Ioana Alexandru
Browse files

Move FooterView to its own directory. 

This matches the recommended architecture structure. It was weird that
the footer was part of the notification row anyway.

Included some small formatting changes because the presubmit hooks were
complaining.

Bug: 293167744
Test: builds
Change-Id: Ib82e401bfb06892bcf4ba0b5b890077a26f3cbc6
parent 9611f4c1

packages/SystemUI/res/layout/status_bar_notification_footer.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  -->



<!-- Extends Framelayout -->

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

<com.android.systemui.statusbar.notification.footer.ui.view.FooterView

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

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

        android:layout_width="match_parent"
@@ -76,4 +76,4 @@ 
                />

        </androidx.constraintlayout.widget.ConstraintLayout>

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

</com.android.systemui.statusbar.notification.row.FooterView>
 
</com.android.systemui.statusbar.notification.footer.ui.view.FooterView>

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/FooterView.java→packages/SystemUI/src/com/android/systemui/statusbar/notification/footer/ui/view/FooterView.java

+15 −2
Original line number Diff line number Diff line
@@ -11,10 +11,10 @@ 
 * 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

 * limitations under the License.

 */



package com.android.systemui.statusbar.notification.row;

package com.android.systemui.statusbar.notification.footer.ui.view;



import static android.graphics.PorterDuff.Mode.SRC_ATOP;
@@ -35,6 +35,8 @@ import androidx.annotation.NonNull; 


import com.android.settingslib.Utils;

import com.android.systemui.res.R;

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

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

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

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

import com.android.systemui.util.DumpUtilsKt;
@@ -93,6 +95,7 @@ public class FooterView extends StackScrollerDecorView { 
        updateColors();

    }



    /** Show a message instead of the footer buttons. */

    public void setFooterLabelVisible(boolean isVisible) {

        if (isVisible) {

            mManageButton.setVisibility(View.GONE);
@@ -105,14 +108,22 @@ public class FooterView extends StackScrollerDecorView { 
        }

    }



    /** Set onClickListener for the manage/history button. */

    public void setManageButtonClickListener(OnClickListener listener) {

        mManageButton.setOnClickListener(listener);

    }



    /** Set onClickListener for the clear all (end) button. */

    public void setClearAllButtonClickListener(OnClickListener listener) {

        mClearAllButton.setOnClickListener(listener);

    }



    /**

     * Whether the touch is outside the Clear all button.

     *

     * TODO(b/293167744): This is an artifact from the time when we could press underneath the

     * shade to dismiss it. Check if it's safe to remove.

     */

    public boolean isOnEmptySpace(float touchX, float touchY) {

        return touchX < mContent.getX()

                || touchX > mContent.getX() + mContent.getWidth()
@@ -120,6 +131,7 @@ public class FooterView extends StackScrollerDecorView { 
                || touchY > mContent.getY() + mContent.getHeight();

    }



    /** Show "History" instead of "Manage" on the start button. */

    public void showHistory(boolean showHistory) {

        if (mShowHistory == showHistory) {

            return;
@@ -141,6 +153,7 @@ public class FooterView extends StackScrollerDecorView { 
                .setCompoundDrawablesRelative(mSeenNotifsFilteredIcon, null, null, null);

    }



    /** Whether the start button shows "History" (true) or "Manage" (false). */

    public boolean isHistoryShown() {

        return mShowHistory;

    }

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/StackScrollerDecorView.java

+3 −2
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ public abstract class StackScrollerDecorView extends ExpandableView { 
    }



    @VisibleForTesting

    boolean isSecondaryVisible() {

    public boolean isSecondaryVisible() {

        return mIsSecondaryVisible;

    }
@@ -179,7 +179,8 @@ public abstract class StackScrollerDecorView extends ExpandableView { 
        return mIsVisible;

    }



    void setDuration(int duration) {

    @VisibleForTesting

    public void setDuration(int duration) {

        mDuration = duration;

    }

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+2 −2
Original line number Diff line number Diff line
@@ -86,12 +86,12 @@ import com.android.settingslib.Utils; 
import com.android.systemui.Dependency;

import com.android.systemui.Dumpable;

import com.android.systemui.ExpandHelper;

import com.android.systemui.res.R;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.flags.ViewRefactorFlag;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper;

import com.android.systemui.res.R;

import com.android.systemui.shade.ShadeController;

import com.android.systemui.shade.TouchLogger;

import com.android.systemui.statusbar.CommandQueue;
@@ -106,12 +106,12 @@ import com.android.systemui.statusbar.notification.NotificationUtils; 
import com.android.systemui.statusbar.notification.collection.NotificationEntry;

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

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

import com.android.systemui.statusbar.notification.footer.ui.view.FooterView;

import com.android.systemui.statusbar.notification.init.NotificationsController;

import com.android.systemui.statusbar.notification.logging.NotificationLogger;

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

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

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

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

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

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

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

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java

+2 −2
Original line number Diff line number Diff line
@@ -27,16 +27,16 @@ import android.view.ViewGroup; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.policy.SystemBarUtils;

import com.android.keyguard.BouncerPanelExpansionCalculator;

import com.android.systemui.res.R;

import com.android.systemui.animation.ShadeInterpolation;

import com.android.systemui.res.R;

import com.android.systemui.shade.transition.LargeScreenShadeInterpolator;

import com.android.systemui.statusbar.EmptyShadeView;

import com.android.systemui.statusbar.NotificationShelf;

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

import com.android.systemui.statusbar.notification.footer.ui.view.FooterView;

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

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

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

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



import java.util.ArrayList;

import java.util.List;