Merge "SystemUI garbage collection." (1f75d030) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values/dimens.xml

+0 −28

Original line number	Diff line number	Diff line
		@@ -97,34 +97,6 @@
		<!-- half the distance between notifications in the panel -->
		<dimen name="notification_divider_height">2dp</dimen>

		<!-- Notification drawer tuning parameters (phone UI) -->
		<!-- Initial velocity of the shade when expanding on its own -->
		<dimen name="self_expand_velocity">2000dp</dimen>
		<!-- Initial velocity of the shade when collapsing on its own -->
		<dimen name="self_collapse_velocity">2000dp</dimen>
		<!-- Minimum final velocity of gestures interpreted as expand requests -->
		<dimen name="fling_expand_min_velocity">100dp</dimen>
		<!-- Minimum final velocity of gestures interpreted as collapse requests -->
		<dimen name="fling_collapse_min_velocity">100dp</dimen>
		<!-- Cap on contribution of x dimension of gesture to overall velocity -->
		<dimen name="fling_gesture_max_x_velocity">200dp</dimen>
		<!-- Cap on overall resulting fling speed (s^-1) -->
		<dimen name="fling_gesture_max_output_velocity">3000dp</dimen>

		<!-- Minimum distance a fling must travel (anti-jitter) -->
		<dimen name="fling_gesture_min_dist">20dp</dimen>

		<!-- Minimum fraction of the display a gesture must travel, at any velocity, to qualify as a
		collapse request -->
		<item type="dimen" name="collapse_min_display_fraction">10%</item>
		<!-- Minimum fraction of the display a gesture must travel to qualify as an expand request -->
		<item type="dimen" name="expand_min_display_fraction">50%</item>

		<!-- Initial acceleration of an expand animation after fling -->
		<dimen name="expand_accel">2000dp</dimen>
		<!-- Initial acceleration of an collapse animation after fling -->
		<dimen name="collapse_accel">2000dp</dimen>

		<!-- The padding on the global screenshot background image -->
		<dimen name="global_screenshot_bg_padding">20dp</dimen>

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

+0 −12

Original line number	Diff line number	Diff line
		@@ -109,7 +109,6 @@ public class NotificationPanelView extends PanelView implements
		new KeyguardClockPositionAlgorithm();
		private KeyguardClockPositionAlgorithm.Result mClockPositionResult =
		new KeyguardClockPositionAlgorithm.Result();
		private boolean mIsSwipedHorizontally;
		private boolean mIsExpanding;

		private boolean mBlockTouches;
		@@ -122,18 +121,7 @@ public class NotificationPanelView extends PanelView implements
		}

		public void setStatusBar(PhoneStatusBar bar) {
		if (mStatusBar != null) {
		mStatusBar.setOnFlipRunnable(null);
		}
		mStatusBar = bar;
		if (bar != null) {
		mStatusBar.setOnFlipRunnable(new Runnable() {
		@Override
		public void run() {
		requestPanelHeightUpdate();
		}
		});
		}
		}

		@Override

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

+0 −84

Original line number	Diff line number	Diff line
		@@ -64,7 +64,6 @@ import android.os.RemoteException;
		import android.os.SystemClock;
		import android.os.UserHandle;
		import android.provider.Settings;
		import android.provider.Settings.Global;
		import android.provider.Settings.SettingNotFoundException;
		import android.service.notification.NotificationListenerService.RankingMap;
		import android.service.notification.StatusBarNotification;
		@@ -169,11 +168,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		private static final int NOTIFICATION_PRIORITY_MULTIPLIER = 10; // see NotificationManagerService
		private static final int HIDE_ICONS_BELOW_SCORE = Notification.PRIORITY_LOW * NOTIFICATION_PRIORITY_MULTIPLIER;

		/**
		* Default value of {@link android.provider.Settings.Global#LOCK_SCREEN_SHOW_NOTIFICATIONS}.
		*/
		private static final boolean ALLOW_NOTIFICATIONS_DEFAULT = false;

		private static final int STATUS_OR_NAV_TRANSIENT =
		View.STATUS_BAR_TRANSIENT \| View.NAVIGATION_BAR_TRANSIENT;
		private static final long AUTOHIDE_TIMEOUT_MS = 3000;
		@@ -186,21 +180,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		*/
		private static final int HINT_RESET_DELAY_MS = 1200;

		// fling gesture tuning parameters, scaled to display density
		private float mSelfExpandVelocityPx; // classic value: 2000px/s
		private float mSelfCollapseVelocityPx; // classic value: 2000px/s (will be negated to collapse "up")
		private float mFlingExpandMinVelocityPx; // classic value: 200px/s
		private float mFlingCollapseMinVelocityPx; // classic value: 200px/s
		private float mCollapseMinDisplayFraction; // classic value: 0.08 (25px/min(320px,480px) on G1)
		private float mExpandMinDisplayFraction; // classic value: 0.5 (drag open halfway to expand)
		private float mFlingGestureMaxXVelocityPx; // classic value: 150px/s

		private float mExpandAccelPx; // classic value: 2000px/s/s
		private float mCollapseAccelPx; // classic value: 2000px/s/s (will be negated to collapse "up")

		private float mFlingGestureMaxOutputVelocityPx; // how fast can it really go? (should be a little
		// faster than mSelfCollapseVelocityPx)

		PhoneStatusBarPolicy mIconPolicy;

		// These are no longer handled by the policy, because we need custom strategies for them
		@@ -399,12 +378,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		}
		}};

		private Runnable mOnFlipRunnable;
		private VelocityTracker mSettingsTracker;
		private float mSettingsDownY;
		private boolean mSettingsStarted;
		private boolean mSettingsCancelled;
		private boolean mSettingsClosing;
		private boolean mVisible;
		private boolean mWaitingForKeyguardExit;
		private boolean mDozing;
		@@ -423,10 +396,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,

		private int mDisabledUnmodified;

		public void setOnFlipRunnable(Runnable onFlipRunnable) {
		mOnFlipRunnable = onFlipRunnable;
		}

		/** Keys of notifications currently visible to the user. */
		private final ArraySet<String> mCurrentlyVisibleNotifications = new ArraySet<String>();
		private long mLastVisibilityReportUptimeMs;
		@@ -1635,10 +1604,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		}
		}

		private Handler getHandler() {
		return mHandler;
		}

		View.OnFocusChangeListener mFocusChangeListener = new View.OnFocusChangeListener() {
		public void onFocusChange(View v, boolean hasFocus) {
		// Because 'v' is a ViewGroup, all its children will be (un)selected
		@@ -1783,12 +1748,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		if (false) postStartTracing();
		}

		private static void cancelAnim(Animator anim) {
		if (anim != null) {
		anim.cancel();
		}
		}

		public void flipToNotifications(boolean animate) {
		// TODO: Animation
		mNotificationPanel.closeQs();
		@@ -2416,28 +2375,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		}
		}

		private View.OnClickListener mClearButtonListener = new View.OnClickListener() {
		public void onClick(View v) {
		synchronized (mNotificationData) {
		mPostCollapseCleanup = new Runnable() {
		@Override
		public void run() {
		if (DEBUG) {
		Log.v(TAG, "running post-collapse cleanup");
		}
		try {
		mBarService.onClearAllNotifications(mCurrentUserId);
		} catch (Exception ex) { }
		}
		};

		animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE);
		return;
		// TODO: Handle this better with notification stack scroller
		}
		}
		};

		public void startActivityDismissingKeyguard(final Intent intent, boolean onlyProvisioned) {
		if (onlyProvisioned && !isDeviceProvisioned()) return;

		@@ -2465,12 +2402,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		}
		};

		private View.OnClickListener mNotificationButtonListener = new View.OnClickListener() {
		public void onClick(View v) {
		animateExpandNotificationsPanel();
		}
		};

		private BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
		public void onReceive(Context context, Intent intent) {
		if (DEBUG) Log.v(TAG, "onReceive: " + intent);
		@@ -2604,21 +2535,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,

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

		mSelfExpandVelocityPx = res.getDimension(R.dimen.self_expand_velocity);
		mSelfCollapseVelocityPx = res.getDimension(R.dimen.self_collapse_velocity);
		mFlingExpandMinVelocityPx = res.getDimension(R.dimen.fling_expand_min_velocity);
		mFlingCollapseMinVelocityPx = res.getDimension(R.dimen.fling_collapse_min_velocity);

		mCollapseMinDisplayFraction = res.getFraction(R.dimen.collapse_min_display_fraction, 1, 1);
		mExpandMinDisplayFraction = res.getFraction(R.dimen.expand_min_display_fraction, 1, 1);

		mExpandAccelPx = res.getDimension(R.dimen.expand_accel);
		mCollapseAccelPx = res.getDimension(R.dimen.collapse_accel);

		mFlingGestureMaxXVelocityPx = res.getDimension(R.dimen.fling_gesture_max_x_velocity);

		mFlingGestureMaxOutputVelocityPx = res.getDimension(R.dimen.fling_gesture_max_output_velocity);

		mNotificationPanelGravity = res.getInteger(R.integer.notification_panel_layout_gravity);
		if (mNotificationPanelGravity <= 0) {
		mNotificationPanelGravity = Gravity.START \| Gravity.TOP;