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

Commit f114e3d9 authored by Chris Wren's avatar Chris Wren Committed by Android Git Automerger
Browse files

am b1ad8e9e: Merge changes from topic \'tron\' into mnc-dev 

* commit 'b1ad8e9e':
  remove unused edge border dimension.
  log clear all button
parents aeedef55 b1ad8e9e

core/java/com/android/internal/logging/MetricsLogger.java

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ public class MetricsLogger implements MetricsConstants { 
    public static final int NOTIFICATION_ZEN_MODE_EXTERNAL_RULE = 145;

    public static final int ACTION_BAN_APP_NOTES = 146;

    public static final int NOTIFICATION_ZEN_MODE_EVENT_RULE = 147;

    public static final int ACTION_DISMISS_ALL_NOTES = 148;



    public static void visible(Context context, int category) throws IllegalArgumentException {

        if (Build.IS_DEBUGGABLE && category == VIEW_UNKNOWN) {

packages/SystemUI/res/values/dimens.xml

+0 −3
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 
*/

-->

<resources>

    <!-- Margin at the edge of the screen to ignore touch events for in the windowshade. -->

    <dimen name="status_bar_edge_ignore">5dp</dimen>



    <!-- Recent Applications parameters -->

    <!-- Upper width limit for application icon -->

    <dimen name="status_bar_recents_app_icon_max_width">48dp</dimen>

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+2 −5
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ import android.view.animation.PathInterpolator; 
import android.widget.ImageView;

import android.widget.TextView;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.statusbar.StatusBarIcon;

import com.android.keyguard.KeyguardHostView.OnDismissAction;

import com.android.keyguard.ViewMediatorCallback;
@@ -297,7 +298,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    int mTrackingPosition; // the position of the top of the tracking view.



    // Tracking finger for opening/closing.

    int mEdgeBorder; // corresponds to R.dimen.status_bar_edge_ignore

    boolean mTracking;

    VelocityTracker mVelocityTracker;
@@ -691,6 +691,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        mDismissView.setOnButtonClickListener(new View.OnClickListener() {

            @Override

            public void onClick(View v) {

                MetricsLogger.action(mContext, MetricsLogger.ACTION_DISMISS_ALL_NOTES);

                clearAllNotifications();

            }

        });
@@ -724,8 +725,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
                        R.id.keyguard_indication_text));

        mKeyguardBottomArea.setKeyguardIndicationController(mKeyguardIndicationController);



        mEdgeBorder = res.getDimensionPixelSize(R.dimen.status_bar_edge_ignore);



        // set the inital view visibility

        setAreThereNotifications();
@@ -2818,8 +2817,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        mNaturalBarHeight = res.getDimensionPixelSize(

                com.android.internal.R.dimen.status_bar_height);



        mEdgeBorder = res.getDimensionPixelSize(R.dimen.status_bar_edge_ignore);



        mRowMinHeight =  res.getDimensionPixelSize(R.dimen.notification_min_height);

        mRowMaxHeight =  res.getDimensionPixelSize(R.dimen.notification_max_height);