summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanesh Mondegarian <daneshm90@gmail.com>2012-12-16 12:33:53 -0500
committerDanesh Mondegarian <daneshm90@gmail.com>2012-12-16 18:48:31 -0500
commit780d0e089b520358a61e80fbf94bccfc69f87852 (patch)
tree48388c7711b22317cba53d395b5da7b60903b525
parent385ad47ef699e05ad7450805b3f90db14761b64d (diff)
downloadframeworks_base-780d0e089b520358a61e80fbf94bccfc69f87852.zip
frameworks_base-780d0e089b520358a61e80fbf94bccfc69f87852.tar.gz
frameworks_base-780d0e089b520358a61e80fbf94bccfc69f87852.tar.bz2
QuickSettings : Dismiss notification panel upon toggle
Automatically dismisses the notification panel after selecting a toggle, if the option is enabled. Patchset 2 : Rename to "panel" Rename onclick/onlongclick to mOnClick/mOnLongClick Change-Id: Iaf211db99e45ef464cbc59aa2ee26899f1e44d22
-rw-r--r--core/java/android/provider/Settings.java7
-rw-r--r--packages/SystemUI/src/com/android/systemui/quicksettings/AirplaneModeTile.java4
-rw-r--r--packages/SystemUI/src/com/android/systemui/quicksettings/AlarmTile.java2
-rw-r--r--packages/SystemUI/src/com/android/systemui/quicksettings/AutoRotateTile.java4
-rw-r--r--packages/SystemUI/src/com/android/systemui/quicksettings/BatteryTile.java2
-rw-r--r--packages/SystemUI/src/com/android/systemui/quicksettings/BluetoothTile.java4
-rw-r--r--packages/SystemUI/src/com/android/systemui/quicksettings/BrightnessTile.java2
-rw-r--r--packages/SystemUI/src/com/android/systemui/quicksettings/BugReportTile.java2
-rw-r--r--packages/SystemUI/src/com/android/systemui/quicksettings/FlashLightTile.java4
-rw-r--r--packages/SystemUI/src/com/android/systemui/quicksettings/GPSTile.java4
-rw-r--r--packages/SystemUI/src/com/android/systemui/quicksettings/InputMethodTile.java2
-rw-r--r--packages/SystemUI/src/com/android/systemui/quicksettings/MobileNetworkTile.java4
-rw-r--r--packages/SystemUI/src/com/android/systemui/quicksettings/MobileNetworkTypeTile.java2
-rw-r--r--packages/SystemUI/src/com/android/systemui/quicksettings/PreferencesTile.java2
-rw-r--r--packages/SystemUI/src/com/android/systemui/quicksettings/QuickSettingsTile.java23
-rw-r--r--packages/SystemUI/src/com/android/systemui/quicksettings/RingerModeTile.java4
-rw-r--r--packages/SystemUI/src/com/android/systemui/quicksettings/RingerVibrationModeTile.java4
-rw-r--r--packages/SystemUI/src/com/android/systemui/quicksettings/SleepScreenTile.java4
-rw-r--r--packages/SystemUI/src/com/android/systemui/quicksettings/ToggleLockscreenTile.java4
-rw-r--r--packages/SystemUI/src/com/android/systemui/quicksettings/UserTile.java2
-rw-r--r--packages/SystemUI/src/com/android/systemui/quicksettings/VibrationModeTile.java4
-rw-r--r--packages/SystemUI/src/com/android/systemui/quicksettings/WiFiDisplayTile.java2
-rw-r--r--packages/SystemUI/src/com/android/systemui/quicksettings/WiFiTile.java4
-rw-r--r--packages/SystemUI/src/com/android/systemui/quicksettings/WifiAPTile.java4
24 files changed, 60 insertions, 40 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index e7d2a2a..07f7d0b 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2618,6 +2618,13 @@ public final class Settings {
public static final String QS_QUICK_PULLDOWN = "qs_quick_pulldown";
/**
+ * Quick Settings Collapse Pane
+ *
+ * @hide
+ */
+ public static final String QS_COLLAPSE_PANEL = "qs_collapse_panel";
+
+ /**
* Use the Notification Power Widget? (Who wouldn't!)
*
* @hide
diff --git a/packages/SystemUI/src/com/android/systemui/quicksettings/AirplaneModeTile.java b/packages/SystemUI/src/com/android/systemui/quicksettings/AirplaneModeTile.java
index 91033c2..a4d64c0 100644
--- a/packages/SystemUI/src/com/android/systemui/quicksettings/AirplaneModeTile.java
+++ b/packages/SystemUI/src/com/android/systemui/quicksettings/AirplaneModeTile.java
@@ -24,7 +24,7 @@ public class AirplaneModeTile extends QuickSettingsTile implements NetworkSignal
mLabel = mContext.getString(R.string.quick_settings_airplane_mode_label);
- onClick = new View.OnClickListener() {
+ mOnClick = new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -38,7 +38,7 @@ public class AirplaneModeTile extends QuickSettingsTile implements NetworkSignal
mContext.sendBroadcast(intent);
}
};
- onLongClick = new OnLongClickListener() {
+ mOnLongClick = new OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
diff --git a/packages/SystemUI/src/com/android/systemui/quicksettings/AlarmTile.java b/packages/SystemUI/src/com/android/systemui/quicksettings/AlarmTile.java
index d59777f..ebdc5fb 100644
--- a/packages/SystemUI/src/com/android/systemui/quicksettings/AlarmTile.java
+++ b/packages/SystemUI/src/com/android/systemui/quicksettings/AlarmTile.java
@@ -34,7 +34,7 @@ public class AlarmTile extends QuickSettingsTile{
mLabel = nextAlarmTime;
}
- onClick = new View.OnClickListener() {
+ mOnClick = new View.OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/packages/SystemUI/src/com/android/systemui/quicksettings/AutoRotateTile.java b/packages/SystemUI/src/com/android/systemui/quicksettings/AutoRotateTile.java
index ffa29d6..96c34b6 100644
--- a/packages/SystemUI/src/com/android/systemui/quicksettings/AutoRotateTile.java
+++ b/packages/SystemUI/src/com/android/systemui/quicksettings/AutoRotateTile.java
@@ -25,14 +25,14 @@ public class AutoRotateTile extends QuickSettingsTile {
new AutoRotationObserver(handler);
- onClick = new OnClickListener() {
+ mOnClick = new OnClickListener() {
@Override
public void onClick(View v) {
RotationPolicy.setRotationLock(mContext, getAutoRotation());
}
};
- onLongClick = new OnLongClickListener() {
+ mOnLongClick = new OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
startSettingsActivity(Settings.ACTION_DISPLAY_SETTINGS);
diff --git a/packages/SystemUI/src/com/android/systemui/quicksettings/BatteryTile.java b/packages/SystemUI/src/com/android/systemui/quicksettings/BatteryTile.java
index f42b208..89fc546 100644
--- a/packages/SystemUI/src/com/android/systemui/quicksettings/BatteryTile.java
+++ b/packages/SystemUI/src/com/android/systemui/quicksettings/BatteryTile.java
@@ -35,7 +35,7 @@ public class BatteryTile extends QuickSettingsTile implements BatteryStateChange
BatteryController controller = new BatteryController(mContext);
controller.addStateChangedCallback(this);
- onClick = new View.OnClickListener() {
+ mOnClick = new View.OnClickListener() {
@Override
public void onClick(View v) {
startSettingsActivity(Intent.ACTION_POWER_USAGE_SUMMARY);
diff --git a/packages/SystemUI/src/com/android/systemui/quicksettings/BluetoothTile.java b/packages/SystemUI/src/com/android/systemui/quicksettings/BluetoothTile.java
index 9b5f237..ab3dee1 100644
--- a/packages/SystemUI/src/com/android/systemui/quicksettings/BluetoothTile.java
+++ b/packages/SystemUI/src/com/android/systemui/quicksettings/BluetoothTile.java
@@ -29,7 +29,7 @@ public class BluetoothTile extends QuickSettingsTile implements BluetoothStateCh
enabled = mBluetoothAdapter.isEnabled();
connected = mBluetoothAdapter.getConnectionState() == BluetoothAdapter.STATE_CONNECTED;
- onClick = new OnClickListener() {
+ mOnClick = new OnClickListener() {
@Override
public void onClick(View v) {
@@ -41,7 +41,7 @@ public class BluetoothTile extends QuickSettingsTile implements BluetoothStateCh
}
};
- onLongClick = new OnLongClickListener() {
+ mOnLongClick = new OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
diff --git a/packages/SystemUI/src/com/android/systemui/quicksettings/BrightnessTile.java b/packages/SystemUI/src/com/android/systemui/quicksettings/BrightnessTile.java
index 16032df..2f49fb3 100644
--- a/packages/SystemUI/src/com/android/systemui/quicksettings/BrightnessTile.java
+++ b/packages/SystemUI/src/com/android/systemui/quicksettings/BrightnessTile.java
@@ -45,7 +45,7 @@ public class BrightnessTile extends QuickSettingsTile implements BrightnessState
mBrightnessObserver = new BrightnessObserver(mHandler);
- onClick = new OnClickListener() {
+ mOnClick = new OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/packages/SystemUI/src/com/android/systemui/quicksettings/BugReportTile.java b/packages/SystemUI/src/com/android/systemui/quicksettings/BugReportTile.java
index 7db66e3..616ad32 100644
--- a/packages/SystemUI/src/com/android/systemui/quicksettings/BugReportTile.java
+++ b/packages/SystemUI/src/com/android/systemui/quicksettings/BugReportTile.java
@@ -43,7 +43,7 @@ public class BugReportTile extends QuickSettingsTile{
BugreportObserver observer = new BugreportObserver(mHandler);
observer.startObserving();
- onClick = new View.OnClickListener() {
+ mOnClick = new View.OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/packages/SystemUI/src/com/android/systemui/quicksettings/FlashLightTile.java b/packages/SystemUI/src/com/android/systemui/quicksettings/FlashLightTile.java
index b7c5447..3c370c0 100644
--- a/packages/SystemUI/src/com/android/systemui/quicksettings/FlashLightTile.java
+++ b/packages/SystemUI/src/com/android/systemui/quicksettings/FlashLightTile.java
@@ -25,14 +25,14 @@ public class FlashLightTile extends QuickSettingsTile {
TorchObserver observer = new TorchObserver(handler);
observer.startObserving();
updateTileState();
- onClick = new View.OnClickListener() {
+ mOnClick = new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent i = new Intent("net.cactii.flash2.TOGGLE_FLASHLIGHT");
mContext.sendBroadcast(i);
}
};
- onLongClick = new View.OnLongClickListener() {
+ mOnLongClick = new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
Intent intent = new Intent(Intent.ACTION_MAIN);
diff --git a/packages/SystemUI/src/com/android/systemui/quicksettings/GPSTile.java b/packages/SystemUI/src/com/android/systemui/quicksettings/GPSTile.java
index 0f934aa..318a557 100644
--- a/packages/SystemUI/src/com/android/systemui/quicksettings/GPSTile.java
+++ b/packages/SystemUI/src/com/android/systemui/quicksettings/GPSTile.java
@@ -37,7 +37,7 @@ public class GPSTile extends QuickSettingsTile implements LocationGpsStateChange
mLabel = mContext.getString(R.string.quick_settings_gps);
enabled = Settings.Secure.isLocationProviderEnabled(mContentResolver, LocationManager.GPS_PROVIDER);
- onClick = new OnClickListener() {
+ mOnClick = new OnClickListener() {
@Override
public void onClick(View v) {
@@ -45,7 +45,7 @@ public class GPSTile extends QuickSettingsTile implements LocationGpsStateChange
}
};
- onLongClick = new OnLongClickListener() {
+ mOnLongClick = new OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
diff --git a/packages/SystemUI/src/com/android/systemui/quicksettings/InputMethodTile.java b/packages/SystemUI/src/com/android/systemui/quicksettings/InputMethodTile.java
index 0ab45fc..1a7ed45 100644
--- a/packages/SystemUI/src/com/android/systemui/quicksettings/InputMethodTile.java
+++ b/packages/SystemUI/src/com/android/systemui/quicksettings/InputMethodTile.java
@@ -32,7 +32,7 @@ public class InputMethodTile extends QuickSettingsTile {
mDrawable = R.drawable.ic_qs_ime;
- onClick = new OnClickListener() {
+ mOnClick = new OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/packages/SystemUI/src/com/android/systemui/quicksettings/MobileNetworkTile.java b/packages/SystemUI/src/com/android/systemui/quicksettings/MobileNetworkTile.java
index d882b9e..1d88e61 100644
--- a/packages/SystemUI/src/com/android/systemui/quicksettings/MobileNetworkTile.java
+++ b/packages/SystemUI/src/com/android/systemui/quicksettings/MobileNetworkTile.java
@@ -30,7 +30,7 @@ public class MobileNetworkTile extends QuickSettingsTile implements NetworkSigna
QuickSettingsContainerView container, QuickSettingsController qsc) {
super(context, inflater, container, qsc);
mTileLayout = R.layout.quick_settings_tile_rssi;
- onClick = new View.OnClickListener() {
+ mOnClick = new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -43,7 +43,7 @@ public class MobileNetworkTile extends QuickSettingsTile implements NetworkSigna
}
}
};
- onLongClick = new OnLongClickListener() {
+ mOnLongClick = new OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
diff --git a/packages/SystemUI/src/com/android/systemui/quicksettings/MobileNetworkTypeTile.java b/packages/SystemUI/src/com/android/systemui/quicksettings/MobileNetworkTypeTile.java
index 67a1b22..d96e0de 100644
--- a/packages/SystemUI/src/com/android/systemui/quicksettings/MobileNetworkTypeTile.java
+++ b/packages/SystemUI/src/com/android/systemui/quicksettings/MobileNetworkTypeTile.java
@@ -74,7 +74,7 @@ public class MobileNetworkTypeTile extends QuickSettingsTile {
mLabel = mContext.getString(R.string.quick_settings_network_type);
- onClick = new OnClickListener() {
+ mOnClick = new OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/packages/SystemUI/src/com/android/systemui/quicksettings/PreferencesTile.java b/packages/SystemUI/src/com/android/systemui/quicksettings/PreferencesTile.java
index 804e01c..fbfeb65 100644
--- a/packages/SystemUI/src/com/android/systemui/quicksettings/PreferencesTile.java
+++ b/packages/SystemUI/src/com/android/systemui/quicksettings/PreferencesTile.java
@@ -17,7 +17,7 @@ public class PreferencesTile extends QuickSettingsTile{
mDrawable = R.drawable.ic_qs_settings;
mLabel = mContext.getString(R.string.quick_settings_settings_label);
- onClick = new View.OnClickListener() {
+ mOnClick = new View.OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/packages/SystemUI/src/com/android/systemui/quicksettings/QuickSettingsTile.java b/packages/SystemUI/src/com/android/systemui/quicksettings/QuickSettingsTile.java
index 8811199..158e4b2 100644
--- a/packages/SystemUI/src/com/android/systemui/quicksettings/QuickSettingsTile.java
+++ b/packages/SystemUI/src/com/android/systemui/quicksettings/QuickSettingsTile.java
@@ -2,12 +2,15 @@ package com.android.systemui.quicksettings;
import android.app.ActivityManagerNative;
import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.os.RemoteException;
import android.os.UserHandle;
+import android.provider.Settings;
import android.view.LayoutInflater;
+import android.view.View;
import android.view.View.OnClickListener;
import android.view.View.OnLongClickListener;
import android.view.ViewGroup;
@@ -19,14 +22,14 @@ import com.android.systemui.statusbar.phone.PhoneStatusBar;
import com.android.systemui.statusbar.phone.QuickSettingsContainerView;
import com.android.systemui.statusbar.phone.QuickSettingsTileView;
-public class QuickSettingsTile {
+public class QuickSettingsTile implements OnClickListener {
protected final Context mContext;
protected final ViewGroup mContainerView;
protected final LayoutInflater mInflater;
protected QuickSettingsTileView mTile;
- protected OnClickListener onClick;
- protected OnLongClickListener onLongClick;
+ protected OnClickListener mOnClick;
+ protected OnLongClickListener mOnLongClick;
protected int mTileLayout;
protected BroadcastReceiver mBroadcastReceiver;
protected IntentFilter mIntentFilter;
@@ -51,8 +54,8 @@ public class QuickSettingsTile {
onPostCreate();
registerQuickSettingsReceiver();
updateQuickSettings();
- mTile.setOnClickListener(onClick);
- mTile.setOnLongClickListener(onLongClick);
+ mTile.setOnClickListener(this);
+ mTile.setOnLongClickListener(mOnLongClick);
}
void createQuickSettings(){
@@ -98,4 +101,14 @@ public class QuickSettingsTile {
mStatusbarService.animateCollapsePanels();
}
+ @Override
+ public final void onClick(View v) {
+ mOnClick.onClick(v);
+ ContentResolver resolver = mContext.getContentResolver();
+ boolean shouldCollapse = Settings.System.getInt(resolver, Settings.System.QS_COLLAPSE_PANEL, 0) == 1;
+ if (shouldCollapse) {
+ mQsc.mBar.collapseAllPanels(true);
+ }
+ }
+
}
diff --git a/packages/SystemUI/src/com/android/systemui/quicksettings/RingerModeTile.java b/packages/SystemUI/src/com/android/systemui/quicksettings/RingerModeTile.java
index 77d7084..633ec9a 100644
--- a/packages/SystemUI/src/com/android/systemui/quicksettings/RingerModeTile.java
+++ b/packages/SystemUI/src/com/android/systemui/quicksettings/RingerModeTile.java
@@ -23,7 +23,7 @@ public class RingerModeTile extends QuickSettingsTile {
mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
- onClick = new View.OnClickListener() {
+ mOnClick = new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -39,7 +39,7 @@ public class RingerModeTile extends QuickSettingsTile {
}
};
- onLongClick = new OnLongClickListener() {
+ mOnLongClick = new OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
diff --git a/packages/SystemUI/src/com/android/systemui/quicksettings/RingerVibrationModeTile.java b/packages/SystemUI/src/com/android/systemui/quicksettings/RingerVibrationModeTile.java
index 0cb9e66..8b59ea2 100644
--- a/packages/SystemUI/src/com/android/systemui/quicksettings/RingerVibrationModeTile.java
+++ b/packages/SystemUI/src/com/android/systemui/quicksettings/RingerVibrationModeTile.java
@@ -60,7 +60,7 @@ public class RingerVibrationModeTile extends QuickSettingsTile {
mSoundModesChangedObserver.startObserving();
// Tile actions
- onClick = new View.OnClickListener() {
+ mOnClick = new View.OnClickListener() {
@Override
public void onClick(View v) {
toggleState();
@@ -68,7 +68,7 @@ public class RingerVibrationModeTile extends QuickSettingsTile {
}
};
- onLongClick = new OnLongClickListener() {
+ mOnLongClick = new OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
startSettingsActivity(android.provider.Settings.ACTION_SOUND_SETTINGS);
diff --git a/packages/SystemUI/src/com/android/systemui/quicksettings/SleepScreenTile.java b/packages/SystemUI/src/com/android/systemui/quicksettings/SleepScreenTile.java
index 97e6201..2daec1a 100644
--- a/packages/SystemUI/src/com/android/systemui/quicksettings/SleepScreenTile.java
+++ b/packages/SystemUI/src/com/android/systemui/quicksettings/SleepScreenTile.java
@@ -22,13 +22,13 @@ public class SleepScreenTile extends QuickSettingsTile {
mDrawable = R.drawable.ic_qs_sleep;
mLabel = mContext.getString(R.string.quick_settings_screen_sleep);
pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
- onClick = new OnClickListener() {
+ mOnClick = new OnClickListener() {
@Override
public void onClick(View v) {
pm.goToSleep(SystemClock.uptimeMillis());
}
};
- onLongClick = new OnLongClickListener() {
+ mOnLongClick = new OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
diff --git a/packages/SystemUI/src/com/android/systemui/quicksettings/ToggleLockscreenTile.java b/packages/SystemUI/src/com/android/systemui/quicksettings/ToggleLockscreenTile.java
index 6a429da..0a25a1f 100644
--- a/packages/SystemUI/src/com/android/systemui/quicksettings/ToggleLockscreenTile.java
+++ b/packages/SystemUI/src/com/android/systemui/quicksettings/ToggleLockscreenTile.java
@@ -31,7 +31,7 @@ public class ToggleLockscreenTile extends QuickSettingsTile {
mKeyguardManager = (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE);
- onClick = new OnClickListener() {
+ mOnClick = new OnClickListener() {
@Override
public void onClick(View v) {
@@ -46,7 +46,7 @@ public class ToggleLockscreenTile extends QuickSettingsTile {
}
};
- onLongClick = new OnLongClickListener() {
+ mOnLongClick = new OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
diff --git a/packages/SystemUI/src/com/android/systemui/quicksettings/UserTile.java b/packages/SystemUI/src/com/android/systemui/quicksettings/UserTile.java
index 64bd922..9c91815 100644
--- a/packages/SystemUI/src/com/android/systemui/quicksettings/UserTile.java
+++ b/packages/SystemUI/src/com/android/systemui/quicksettings/UserTile.java
@@ -43,7 +43,7 @@ public class UserTile extends QuickSettingsTile {
mTileLayout = R.layout.quick_settings_tile_user;
- onClick = new View.OnClickListener() {
+ mOnClick = new View.OnClickListener() {
@Override
public void onClick(View v) {
mQsc.mBar.collapseAllPanels(true);
diff --git a/packages/SystemUI/src/com/android/systemui/quicksettings/VibrationModeTile.java b/packages/SystemUI/src/com/android/systemui/quicksettings/VibrationModeTile.java
index 0eba739..e903545 100644
--- a/packages/SystemUI/src/com/android/systemui/quicksettings/VibrationModeTile.java
+++ b/packages/SystemUI/src/com/android/systemui/quicksettings/VibrationModeTile.java
@@ -25,7 +25,7 @@ public class VibrationModeTile extends QuickSettingsTile {
mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
- onClick = new View.OnClickListener() {
+ mOnClick = new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -58,7 +58,7 @@ public class VibrationModeTile extends QuickSettingsTile {
}
};
- onLongClick = new OnLongClickListener() {
+ mOnLongClick = new OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
diff --git a/packages/SystemUI/src/com/android/systemui/quicksettings/WiFiDisplayTile.java b/packages/SystemUI/src/com/android/systemui/quicksettings/WiFiDisplayTile.java
index c72bf93..52a4120 100644
--- a/packages/SystemUI/src/com/android/systemui/quicksettings/WiFiDisplayTile.java
+++ b/packages/SystemUI/src/com/android/systemui/quicksettings/WiFiDisplayTile.java
@@ -24,7 +24,7 @@ public class WiFiDisplayTile extends QuickSettingsTile{
QuickSettingsController qsc) {
super(context, inflater, container, qsc);
- onClick = new OnClickListener() {
+ mOnClick = new OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/packages/SystemUI/src/com/android/systemui/quicksettings/WiFiTile.java b/packages/SystemUI/src/com/android/systemui/quicksettings/WiFiTile.java
index adc5b25..5e75970 100644
--- a/packages/SystemUI/src/com/android/systemui/quicksettings/WiFiTile.java
+++ b/packages/SystemUI/src/com/android/systemui/quicksettings/WiFiTile.java
@@ -17,7 +17,7 @@ public class WiFiTile extends QuickSettingsTile implements NetworkSignalChangedC
public WiFiTile(Context context, LayoutInflater inflater,
QuickSettingsContainerView container, QuickSettingsController qsc) {
super(context, inflater, container, qsc);
- onClick = new View.OnClickListener() {
+ mOnClick = new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -25,7 +25,7 @@ public class WiFiTile extends QuickSettingsTile implements NetworkSignalChangedC
wfm.setWifiEnabled(!wfm.isWifiEnabled());
}
};
- onLongClick = new OnLongClickListener() {
+ mOnLongClick = new OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
diff --git a/packages/SystemUI/src/com/android/systemui/quicksettings/WifiAPTile.java b/packages/SystemUI/src/com/android/systemui/quicksettings/WifiAPTile.java
index 3f90b5d..ece06ee 100644
--- a/packages/SystemUI/src/com/android/systemui/quicksettings/WifiAPTile.java
+++ b/packages/SystemUI/src/com/android/systemui/quicksettings/WifiAPTile.java
@@ -25,7 +25,7 @@ public class WifiAPTile extends QuickSettingsTile {
mWifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
updateTileState();
- onClick = new View.OnClickListener() {
+ mOnClick = new View.OnClickListener() {
@Override
public void onClick(View v) {
int state = mWifiManager.getWifiApState();
@@ -41,7 +41,7 @@ public class WifiAPTile extends QuickSettingsTile {
}
}
};
- onLongClick = new View.OnLongClickListener() {
+ mOnLongClick = new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
Intent intent = new Intent(Intent.ACTION_MAIN);