diff options
author | John Spurlock <jspurlock@google.com> | 2013-08-29 20:47:03 -0400 |
---|---|---|
committer | John Spurlock <jspurlock@google.com> | 2013-08-29 21:02:15 -0400 |
commit | 8f1f0109d3c124bfcb09c99e69e6ad51b8208c24 (patch) | |
tree | 172e10ce05ee4fb701eefd1a4be333f1fef5719d /packages/SystemUI/src | |
parent | fda4698c255075d7f0209834b364dfe344e3ee75 (diff) | |
download | frameworks_base-8f1f0109d3c124bfcb09c99e69e6ad51b8208c24.zip frameworks_base-8f1f0109d3c124bfcb09c99e69e6ad51b8208c24.tar.gz frameworks_base-8f1f0109d3c124bfcb09c99e69e6ad51b8208c24.tar.bz2 |
Remove unused status bar help and obsolete resources.
Bug:10502089
Change-Id: I813244c4d5535256a56b242b92e6373edbbaba93
Diffstat (limited to 'packages/SystemUI/src')
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 89 | ||||
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/Prefs.java | 2 |
2 files changed, 0 insertions, 91 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index 4b0a2b7..870202a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -37,7 +37,6 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.content.SharedPreferences; import android.content.res.Resources; import android.database.ContentObserver; import android.graphics.Canvas; @@ -97,7 +96,6 @@ import com.android.systemui.statusbar.policy.LocationController; import com.android.systemui.statusbar.policy.NetworkController; import com.android.systemui.statusbar.policy.NotificationRowLayout; import com.android.systemui.statusbar.policy.OnSizeChangedListener; -import com.android.systemui.statusbar.policy.Prefs; import com.android.systemui.statusbar.policy.RotationLockController; import java.io.FileDescriptor; @@ -111,11 +109,8 @@ public class PhoneStatusBar extends BaseStatusBar { public static final boolean DUMPTRUCK = true; // extra dumpsys info public static final boolean DEBUG_GESTURES = false; - public static final boolean DEBUG_CLINGS = false; public static final boolean DEBUG_WINDOW_STATE = true; - public static final boolean ENABLE_NOTIFICATION_PANEL_CLING = false; - public static final boolean SETTINGS_DRAG_SHORTCUT = true; // additional instrumentation for testing purposes; intended to be left on during development @@ -251,11 +246,6 @@ public class PhoneStatusBar extends BaseStatusBar { boolean mTracking; VelocityTracker mVelocityTracker; - // help screen - private boolean mClingShown; - private ViewGroup mCling; - private boolean mSuppressStatusBarDrags; // while a cling is up, briefly deaden the bar to give things time to settle - int[] mAbsPos = new int[2]; Runnable mPostCollapseCleanup = null; @@ -615,13 +605,6 @@ public class PhoneStatusBar extends BaseStatusBar { } } - mClingShown = ! (DEBUG_CLINGS - || !Prefs.read(mContext).getBoolean(Prefs.SHOWN_QUICK_SETTINGS_HELP, false)); - - if (!ENABLE_NOTIFICATION_PANEL_CLING || ActivityManager.isRunningInTestHarness()) { - mClingShown = true; - } - // final ImageView wimaxRSSI = // (ImageView)sb.findViewById(R.id.wimax_signal); // if (wimaxRSSI != null) { @@ -1733,63 +1716,6 @@ public class PhoneStatusBar extends BaseStatusBar { } } - public boolean isClinging() { - return mCling != null && mCling.getVisibility() == View.VISIBLE; - } - - public void hideCling() { - if (isClinging()) { - mCling.animate().alpha(0f).setDuration(250).start(); - mCling.setVisibility(View.GONE); - mSuppressStatusBarDrags = false; - } - } - - public void showCling() { - // lazily inflate this to accommodate orientation change - final ViewStub stub = (ViewStub) mStatusBarWindow.findViewById(R.id.status_bar_cling_stub); - if (stub == null) { - mClingShown = true; - return; // no clings on this device - } - - mSuppressStatusBarDrags = true; - - mHandler.postDelayed(new Runnable() { - @Override - public void run() { - mCling = (ViewGroup) stub.inflate(); - - mCling.setOnTouchListener(new View.OnTouchListener() { - @Override - public boolean onTouch(View v, MotionEvent event) { - return true; // e eats everything - }}); - mCling.findViewById(R.id.ok).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - hideCling(); - }}); - - mCling.setAlpha(0f); - mCling.setVisibility(View.VISIBLE); - mCling.animate().alpha(1f); - - mClingShown = true; - SharedPreferences.Editor editor = Prefs.edit(mContext); - editor.putBoolean(Prefs.SHOWN_QUICK_SETTINGS_HELP, true); - editor.apply(); - - makeExpandedVisible(); // enforce visibility in case the shade is still animating closed - animateExpandNotificationsPanel(); - - mSuppressStatusBarDrags = false; - } - }, 500); - - animateExpandNotificationsPanel(); - } - public boolean interceptTouchEvent(MotionEvent event) { if (DEBUG_GESTURES) { if (event.getActionMasked() != MotionEvent.ACTION_MOVE) { @@ -1815,21 +1741,6 @@ public class PhoneStatusBar extends BaseStatusBar { mGestureRec.add(event); } - // Cling (first-run help) handling. - // The cling is supposed to show the first time you drag, or even tap, the status bar. - // It should show the notification panel, then fade in after half a second, giving you - // an explanation of what just happened, as well as teach you how to access quick - // settings (another drag). The user can dismiss the cling by clicking OK or by - // dragging quick settings into view. - final int act = event.getActionMasked(); - if (mSuppressStatusBarDrags) { - return true; - } else if (act == MotionEvent.ACTION_UP && !mClingShown) { - showCling(); - } else { - hideCling(); - } - setInteracting(true); return false; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Prefs.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Prefs.java index 73979a6..f339401 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Prefs.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Prefs.java @@ -22,8 +22,6 @@ import android.content.SharedPreferences; public class Prefs { private static final String SHARED_PREFS_NAME = "status_bar"; - public static final String SHOWN_QUICK_SETTINGS_HELP = "shown_quick_settings_help"; - public static SharedPreferences read(Context context) { return context.getSharedPreferences(Prefs.SHARED_PREFS_NAME, Context.MODE_PRIVATE); } |