Merge "sysui: remove some dead code" (7ef70d15) · Commits · e / os / android_frameworks_base

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

+0 −17

Original line number	Diff line number	Diff line
		@@ -122,9 +122,6 @@ public abstract class BaseStatusBar extends SystemUI implements
		public static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
		public static final boolean MULTIUSER_DEBUG = false;

		// STOPSHIP disable once we resolve b/18102199
		private static final boolean NOTIFICATION_CLICK_DEBUG = true;

		public static final boolean ENABLE_REMOTE_INPUT =
		SystemProperties.getBoolean("debug.enable_remote_input", true);
		public static final boolean ENABLE_CHILD_NOTIFICATIONS
		@@ -140,8 +137,6 @@ public abstract class BaseStatusBar extends SystemUI implements
		protected static final int MSG_TOGGLE_KEYBOARD_SHORTCUTS_MENU = 1026;

		protected static final boolean ENABLE_HEADS_UP = true;
		// scores above this threshold should be displayed in heads up mode.
		protected static final int INTERRUPTION_THRESHOLD = 10;
		protected static final String SETTING_HEADS_UP_TICKER = "ticker_gets_heads_up";

		// Should match the values in PhoneWindowManager
		@@ -196,14 +191,10 @@ public abstract class BaseStatusBar extends SystemUI implements
		protected IDreamManager mDreamManager;
		PowerManager mPowerManager;
		protected StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;
		protected int mRowMinHeightLegacy;
		protected int mRowMinHeight;
		protected int mRowMaxHeight;

		// public mode, private notifications, etc
		private boolean mLockscreenPublicMode = false;
		private final SparseBooleanArray mUsersAllowingPrivateNotifications = new SparseBooleanArray();
		private NotificationColorUtil mNotificationColorUtil;

		private UserManager mUserManager;

		@@ -355,9 +346,6 @@ public abstract class BaseStatusBar extends SystemUI implements
		ViewGroup actionGroup = (ViewGroup) parent;
		index = actionGroup.indexOfChild(view);
		}
		if (NOTIFICATION_CLICK_DEBUG) {
		Log.d(TAG, "Clicked on button " + index + " for " + key);
		}
		try {
		mBarService.onNotificationActionClick(key, index);
		} catch (RemoteException e) {
		@@ -615,8 +603,6 @@ public abstract class BaseStatusBar extends SystemUI implements
		mDevicePolicyManager = (DevicePolicyManager)mContext.getSystemService(
		Context.DEVICE_POLICY_SERVICE);

		mNotificationColorUtil = NotificationColorUtil.getInstance(mContext);

		mNotificationData = new NotificationData(this);

		mAccessibilityManager = (AccessibilityManager)
		@@ -1619,9 +1605,6 @@ public abstract class BaseStatusBar extends SystemUI implements
		}
		});

		if (NOTIFICATION_CLICK_DEBUG) {
		Log.d(TAG, "Clicked on content of " + notificationKey);
		}
		final boolean keyguardShowing = mStatusBarKeyguardViewManager.isShowing();
		final boolean afterKeyguardGone = intent.isActivity()
		&& PreviewInflater.wouldLaunchResolverActivity(mContext, intent.getIntent(),

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

+0 −7

Original line number	Diff line number	Diff line
		@@ -1318,7 +1318,6 @@ public class NotificationPanelView extends PanelView implements
		mHeader.setExpansion(getHeaderExpansionFraction());
		setQsTranslation(height);
		requestScrollerTopPaddingUpdate(false /* animate */);
		updateNotificationScrim(height);
		if (mKeyguardShowing) {
		updateHeaderKeyguard();
		}
		@@ -1355,12 +1354,6 @@ public class NotificationPanelView extends PanelView implements
		}
		}

		private void updateNotificationScrim(float height) {
		int startDistance = mQsMinExpansionHeight + mNotificationScrimWaitDistance;
		float progress = (height - startDistance) / (mQsMaxExpansionHeight - startDistance);
		progress = Math.max(0.0f, Math.min(progress, 1.0f));
		}

		private float getHeaderExpansionFraction() {
		if (!mKeyguardShowing) {
		return getQsExpansionFraction();

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -71,7 +71,6 @@ public abstract class PanelBar extends FrameLayout {
		Log.e(TAG, "setPanelHolder: null PanelHolder", new Throwable());
		return;
		}
		ph.setBar(this);
		mPanelHolder = ph;
		final int N = ph.getChildCount();
		for (int i=0; i<N; i++) {

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

+0 −5

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ public class PanelHolder extends FrameLayout {
		public static final boolean DEBUG_GESTURES = true;

		private int mSelectedPanelIndex = -1;
		private PanelBar mBar;

		public PanelHolder(Context context, AttributeSet attrs) {
		super(context, attrs);
		@@ -79,8 +78,4 @@ public class PanelHolder extends FrameLayout {
		}
		return false;
		}

		public void setBar(PanelBar panelBar) {
		mBar = panelBar;
		}
		}

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -58,7 +58,6 @@ public abstract class PanelView extends FrameLayout {

		private float mPeekHeight;
		private float mHintDistance;
		private int mEdgeTapAreaWidth;
		private float mInitialOffsetOnTouch;
		private boolean mCollapsedAndHeadsUpOnDown;
		private float mExpandedFraction = 0;
		@@ -202,7 +201,6 @@ public abstract class PanelView extends FrameLayout {
		final ViewConfiguration configuration = ViewConfiguration.get(getContext());
		mTouchSlop = configuration.getScaledTouchSlop();
		mHintDistance = res.getDimension(R.dimen.hint_move_distance);
		mEdgeTapAreaWidth = res.getDimensionPixelSize(R.dimen.edge_tap_area_width);
		mUnlockFalsingThreshold = res.getDimensionPixelSize(R.dimen.unlock_falsing_threshold);
		}