Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'b1ad8e9ea03380f14aae9970e0c112573831c5f9':
  remove unused edge border dimension.
  log clear all button
This commit is contained in:
Chris Wren
2015-05-01 19:02:04 +00:00
committed by Android Git Automerger
parent aeedef552d b1ad8e9ea0
commit f114e3d92d
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/com/android/internal/logging/MetricsLogger.java
View File

@@ -32,6 +32,7 @@ public class MetricsLogger implements MetricsConstants {
public static final int NOTIFICATION_ZEN_MODE_EXTERNAL_RULE = 145; public static final int NOTIFICATION_ZEN_MODE_EXTERNAL_RULE = 145;
public static final int ACTION_BAN_APP_NOTES = 146; public static final int ACTION_BAN_APP_NOTES = 146;
public static final int NOTIFICATION_ZEN_MODE_EVENT_RULE = 147; 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 { public static void visible(Context context, int category) throws IllegalArgumentException {
if (Build.IS_DEBUGGABLE && category == VIEW_UNKNOWN) { if (Build.IS_DEBUGGABLE && category == VIEW_UNKNOWN) {

3
packages/SystemUI/res/values/dimens.xml
View File

@@ -16,9 +16,6 @@
*/ */
--> -->
<resources> <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 --> <!-- Recent Applications parameters -->
<!-- Upper width limit for application icon --> <!-- Upper width limit for application icon -->
<dimen name="status_bar_recents_app_icon_max_width">48dp</dimen> <dimen name="status_bar_recents_app_icon_max_width">48dp</dimen>

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

@@ -91,6 +91,7 @@ import android.view.animation.PathInterpolator;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.statusbar.StatusBarIcon; import com.android.internal.statusbar.StatusBarIcon;
import com.android.keyguard.KeyguardHostView.OnDismissAction; import com.android.keyguard.KeyguardHostView.OnDismissAction;
import com.android.keyguard.ViewMediatorCallback; 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. int mTrackingPosition; // the position of the top of the tracking view.
// Tracking finger for opening/closing. // Tracking finger for opening/closing.
int mEdgeBorder; // corresponds to R.dimen.status_bar_edge_ignore
boolean mTracking; boolean mTracking;
VelocityTracker mVelocityTracker; VelocityTracker mVelocityTracker;
@@ -691,6 +691,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
mDismissView.setOnButtonClickListener(new View.OnClickListener() { mDismissView.setOnButtonClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
MetricsLogger.action(mContext, MetricsLogger.ACTION_DISMISS_ALL_NOTES);
clearAllNotifications(); clearAllNotifications();
} }
}); });
@@ -724,8 +725,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
R.id.keyguard_indication_text)); R.id.keyguard_indication_text));
mKeyguardBottomArea.setKeyguardIndicationController(mKeyguardIndicationController); mKeyguardBottomArea.setKeyguardIndicationController(mKeyguardIndicationController);
mEdgeBorder = res.getDimensionPixelSize(R.dimen.status_bar_edge_ignore);
// set the inital view visibility // set the inital view visibility
setAreThereNotifications(); setAreThereNotifications();
@@ -2818,8 +2817,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
mNaturalBarHeight = res.getDimensionPixelSize( mNaturalBarHeight = res.getDimensionPixelSize(
com.android.internal.R.dimen.status_bar_height); 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); mRowMinHeight = res.getDimensionPixelSize(R.dimen.notification_min_height);
mRowMaxHeight = res.getDimensionPixelSize(R.dimen.notification_max_height); mRowMaxHeight = res.getDimensionPixelSize(R.dimen.notification_max_height);