am d14508f8: Merge "Disable statusbar pulldown gesture tracking." into jb-mr1-dev (26d4083a) · Commits · e / os / android_frameworks_base

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

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -24,6 +24,7 @@ import android.util.AttributeSet;
	import android.view.View;		import android.view.View;

	import com.android.systemui.R;		import com.android.systemui.R;
			import com.android.systemui.statusbar.GestureRecorder;

	public class NotificationPanelView extends PanelView {		public class NotificationPanelView extends PanelView {

	@@ -47,9 +48,12 @@ public class NotificationPanelView extends PanelView {

	@Override		@Override
	public void fling(float vel, boolean always) {		public void fling(float vel, boolean always) {
	((PhoneStatusBarView) mBar).mBar.getGestureRecorder().tag(		GestureRecorder gr = ((PhoneStatusBarView) mBar).mBar.getGestureRecorder();
			if (gr != null) {
			gr.tag(
	"fling " + ((vel > 0) ? "open" : "closed"),		"fling " + ((vel > 0) ? "open" : "closed"),
	"notifications,v=" + vel);		"notifications,v=" + vel);
			}
	super.fling(vel, always);		super.fling(vel, always);
	}		}

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

+15 −6

Original line number	Original line	Diff line number	Diff line
	@@ -99,6 +99,7 @@ public class PhoneStatusBar extends BaseStatusBar {
	public static final boolean DEBUG = BaseStatusBar.DEBUG;		public static final boolean DEBUG = BaseStatusBar.DEBUG;
	public static final boolean SPEW = DEBUG;		public static final boolean SPEW = DEBUG;
	public static final boolean DUMPTRUCK = true; // extra dumpsys info		public static final boolean DUMPTRUCK = true; // extra dumpsys info
			public static final boolean DEBUG_GESTURES = false;

	// additional instrumentation for testing purposes; intended to be left on during development		// additional instrumentation for testing purposes; intended to be left on during development
	public static final boolean CHATTY = DEBUG;		public static final boolean CHATTY = DEBUG;
	@@ -247,7 +248,9 @@ public class PhoneStatusBar extends BaseStatusBar {
	DisplayMetrics mDisplayMetrics = new DisplayMetrics();		DisplayMetrics mDisplayMetrics = new DisplayMetrics();

	// XXX: gesture research		// XXX: gesture research
	private GestureRecorder mGestureRec = new GestureRecorder("/sdcard/statusbar_gestures.dat");		private final GestureRecorder mGestureRec = DEBUG_GESTURES
			? new GestureRecorder("/sdcard/statusbar_gestures.dat")
			: null;

	private int mNavigationIconHints = 0;		private int mNavigationIconHints = 0;
	private final Animator.AnimatorListener mMakeIconsInvisible = new AnimatorListenerAdapter() {		private final Animator.AnimatorListener mMakeIconsInvisible = new AnimatorListenerAdapter() {
	@@ -1350,7 +1353,9 @@ public class PhoneStatusBar extends BaseStatusBar {
	}		}
	}		}

			if (DEBUG_GESTURES) {
	mGestureRec.add(event);		mGestureRec.add(event);
			}

	return false;		return false;
	}		}
	@@ -1630,8 +1635,10 @@ public class PhoneStatusBar extends BaseStatusBar {
	}		}
	}		}

			if (DEBUG_GESTURES) {
	pw.print(" status bar gestures: ");		pw.print(" status bar gestures: ");
	mGestureRec.dump(fd, pw, args);		mGestureRec.dump(fd, pw, args);
			}

	mNetworkController.dump(fd, pw, args);		mNetworkController.dump(fd, pw, args);
	}		}
	@@ -1713,9 +1720,11 @@ public class PhoneStatusBar extends BaseStatusBar {
	// called by makeStatusbar and also by PhoneStatusBarView		// called by makeStatusbar and also by PhoneStatusBarView
	void updateDisplaySize() {		void updateDisplaySize() {
	mDisplay.getMetrics(mDisplayMetrics);		mDisplay.getMetrics(mDisplayMetrics);
			if (DEBUG_GESTURES) {
	mGestureRec.tag("display",		mGestureRec.tag("display",
	String.format("%dx%d", mDisplayMetrics.widthPixels, mDisplayMetrics.heightPixels));		String.format("%dx%d", mDisplayMetrics.widthPixels, mDisplayMetrics.heightPixels));
	}		}
			}

	private View.OnClickListener mClearButtonListener = new View.OnClickListener() {		private View.OnClickListener mClearButtonListener = new View.OnClickListener() {
	public void onClick(View v) {		public void onClick(View v) {

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

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -29,6 +29,7 @@ import android.view.ViewGroup;

	import com.android.systemui.R;		import com.android.systemui.R;
	import com.android.systemui.statusbar.BaseStatusBar;		import com.android.systemui.statusbar.BaseStatusBar;
			import com.android.systemui.statusbar.GestureRecorder;
	import com.android.systemui.statusbar.policy.BatteryController;		import com.android.systemui.statusbar.policy.BatteryController;
	import com.android.systemui.statusbar.policy.BluetoothController;		import com.android.systemui.statusbar.policy.BluetoothController;
	import com.android.systemui.statusbar.policy.LocationController;		import com.android.systemui.statusbar.policy.LocationController;
	@@ -95,9 +96,12 @@ public class SettingsPanelView extends PanelView {

	@Override		@Override
	public void fling(float vel, boolean always) {		public void fling(float vel, boolean always) {
	((PhoneStatusBarView) mBar).mBar.getGestureRecorder().tag(		GestureRecorder gr = ((PhoneStatusBarView) mBar).mBar.getGestureRecorder();
			if (gr != null) {
			gr.tag(
	"fling " + ((vel > 0) ? "open" : "closed"),		"fling " + ((vel > 0) ? "open" : "closed"),
	"settings,v=" + vel);		"settings,v=" + vel);
			}
	super.fling(vel, always);		super.fling(vel, always);
	}		}