From ec84f5b3c65250ee5e115ed5e3e00adc7143b954 Mon Sep 17 00:00:00 2001 From: Michael W Date: Tue, 3 Jan 2017 03:12:22 +0100 Subject: msm8996-common: doze: Cleanup * Rename missing OnePlus occurance * Remove unneccessary newlines * Remove redundancy * Remove unused variables and imports * Make variables local when sufficient Change-Id: I48f5dfc24275388f1deb31dc27716ed75aae898e Signed-off-by: Davide Garberi --- .../cyanogenmod/settings/doze/DozeReceiver.java | 3 ++- .../cyanogenmod/settings/doze/DozeSettings.java | 5 +---- .../settings/doze/DozeSettingsFragment.java | 22 ++++++++-------------- .../cyanogenmod/settings/doze/ProximitySensor.java | 16 ++++++---------- .../com/cyanogenmod/settings/doze/TiltSensor.java | 9 +-------- doze/src/com/cyanogenmod/settings/doze/Utils.java | 2 +- 6 files changed, 19 insertions(+), 38 deletions(-) (limited to 'doze') diff --git a/doze/src/com/cyanogenmod/settings/doze/DozeReceiver.java b/doze/src/com/cyanogenmod/settings/doze/DozeReceiver.java index 6ab3e0d..ee92ab4 100644 --- a/doze/src/com/cyanogenmod/settings/doze/DozeReceiver.java +++ b/doze/src/com/cyanogenmod/settings/doze/DozeReceiver.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 The CyanogenMod Project + * Copyright (C) 2017 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,7 +25,7 @@ import cyanogenmod.preference.RemotePreferenceUpdater; public class DozeReceiver extends RemotePreferenceUpdater { private static final boolean DEBUG = false; - private static final String TAG = "OneplusDoze"; + private static final String TAG = "XiaomiDoze"; private static final String DOZE_CATEGORY_KEY = "doze_device_settings"; diff --git a/doze/src/com/cyanogenmod/settings/doze/DozeSettings.java b/doze/src/com/cyanogenmod/settings/doze/DozeSettings.java index 76ac5fe..603e5ef 100644 --- a/doze/src/com/cyanogenmod/settings/doze/DozeSettings.java +++ b/doze/src/com/cyanogenmod/settings/doze/DozeSettings.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 The CyanogenMod Project + * Copyright (C) 2017 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,10 +22,6 @@ import android.view.MenuItem; import com.android.settingslib.drawer.SettingsDrawerActivity; -/** - * Created by shade on 10/14/16. - */ - public class DozeSettings extends SettingsDrawerActivity { private static final String TAG_DOZE = "doze"; diff --git a/doze/src/com/cyanogenmod/settings/doze/DozeSettingsFragment.java b/doze/src/com/cyanogenmod/settings/doze/DozeSettingsFragment.java index 0da6f69..8b56e67 100644 --- a/doze/src/com/cyanogenmod/settings/doze/DozeSettingsFragment.java +++ b/doze/src/com/cyanogenmod/settings/doze/DozeSettingsFragment.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 The CyanogenMod Project + * Copyright (C) 2017 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,8 +43,6 @@ public class DozeSettingsFragment extends PreferenceFragment implements OnPrefer private SharedPreferences mPreferences; - private Switch mSwitch; - private SwitchPreference mPickUpPreference; private SwitchPreference mHandwavePreference; private SwitchPreference mPocketPreference; @@ -53,8 +52,6 @@ public class DozeSettingsFragment extends PreferenceFragment implements OnPrefer public void onChange(boolean selfChange) { super.onChange(selfChange); - boolean enabled = Utils.isDozeEnabled(getActivity()); - updateSwitches(Utils.isDozeEnabled(getActivity())); DozeReceiver.notifyChanged(getActivity()); } @@ -92,16 +89,13 @@ public class DozeSettingsFragment extends PreferenceFragment implements OnPrefer showHelp(); } - mPickUpPreference = - (SwitchPreference) findPreference(Utils.GESTURE_PICK_UP_KEY); + mPickUpPreference = (SwitchPreference) findPreference(Utils.GESTURE_PICK_UP_KEY); mPickUpPreference.setOnPreferenceChangeListener(this); - mHandwavePreference = - (SwitchPreference) findPreference(Utils.GESTURE_HAND_WAVE_KEY); + mHandwavePreference = (SwitchPreference) findPreference(Utils.GESTURE_HAND_WAVE_KEY); mHandwavePreference.setOnPreferenceChangeListener(this); - mPocketPreference = - (SwitchPreference) findPreference(Utils.GESTURE_POCKET_KEY); + mPocketPreference = (SwitchPreference) findPreference(Utils.GESTURE_POCKET_KEY); mPocketPreference.setOnPreferenceChangeListener(this); } @@ -130,14 +124,14 @@ public class DozeSettingsFragment extends PreferenceFragment implements OnPrefer super.onViewCreated(view, savedInstanceState); View switchBar = view.findViewById(R.id.switch_bar); - mSwitch = (Switch) switchBar.findViewById(android.R.id.switch_widget); - mSwitch.setChecked(Utils.isDozeEnabled(getActivity())); - mSwitch.setOnCheckedChangeListener(this); + Switch switchWidget = (Switch) switchBar.findViewById(android.R.id.switch_widget); + switchWidget.setChecked(Utils.isDozeEnabled(getActivity())); + switchWidget.setOnCheckedChangeListener(this); switchBar.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - mSwitch.setChecked(!mSwitch.isChecked()); + switchWidget.setChecked(!switchWidget.isChecked()); } }); } diff --git a/doze/src/com/cyanogenmod/settings/doze/ProximitySensor.java b/doze/src/com/cyanogenmod/settings/doze/ProximitySensor.java index 0f62b11..eb33027 100644 --- a/doze/src/com/cyanogenmod/settings/doze/ProximitySensor.java +++ b/doze/src/com/cyanogenmod/settings/doze/ProximitySensor.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2015 The CyanogenMod Project + * Copyright (C) 2017 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,8 +40,7 @@ public class ProximitySensor implements SensorEventListener { public ProximitySensor(Context context) { mContext = context; - mSensorManager = (SensorManager) - mContext.getSystemService(Context.SENSOR_SERVICE); + mSensorManager = (SensorManager) mContext.getSystemService(Context.SENSOR_SERVICE); mSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY); } @@ -60,14 +60,11 @@ public class ProximitySensor implements SensorEventListener { private boolean shouldPulse(long timestamp) { long delta = timestamp - mInPocketTime; - if (Utils.handwaveGestureEnabled(mContext) - && Utils.pocketGestureEnabled(mContext)) { + if (Utils.handwaveGestureEnabled(mContext) && Utils.pocketGestureEnabled(mContext)) { return true; - } else if (Utils.handwaveGestureEnabled(mContext) - && !Utils.pocketGestureEnabled(mContext)) { + } else if (Utils.handwaveGestureEnabled(mContext)) { return delta < POCKET_DELTA_NS; - } else if (!Utils.handwaveGestureEnabled(mContext) - && Utils.pocketGestureEnabled(mContext)) { + } else if (Utils.pocketGestureEnabled(mContext)) { return delta >= POCKET_DELTA_NS; } return false; @@ -80,8 +77,7 @@ public class ProximitySensor implements SensorEventListener { protected void enable() { if (DEBUG) Log.d(TAG, "Enabling"); - mSensorManager.registerListener(this, mSensor, - SensorManager.SENSOR_DELAY_NORMAL); + mSensorManager.registerListener(this, mSensor, SensorManager.SENSOR_DELAY_NORMAL); } protected void disable() { diff --git a/doze/src/com/cyanogenmod/settings/doze/TiltSensor.java b/doze/src/com/cyanogenmod/settings/doze/TiltSensor.java index 443a10d..b3316e8 100644 --- a/doze/src/com/cyanogenmod/settings/doze/TiltSensor.java +++ b/doze/src/com/cyanogenmod/settings/doze/TiltSensor.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2015 The CyanogenMod Project + * Copyright (C) 2017 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,8 +22,6 @@ import android.hardware.Sensor; import android.hardware.SensorEvent; import android.hardware.SensorEventListener; import android.hardware.SensorManager; -import android.os.PowerManager; -import android.os.PowerManager.WakeLock; import android.os.SystemClock; import android.util.Log; @@ -31,25 +30,19 @@ public class TiltSensor implements SensorEventListener { private static final boolean DEBUG = false; private static final String TAG = "TiltSensor"; - private static final int SENSOR_WAKELOCK_DURATION = 200; private static final int BATCH_LATENCY_IN_MS = 100; private static final int MIN_PULSE_INTERVAL_MS = 2500; - private PowerManager mPowerManager; private SensorManager mSensorManager; private Sensor mSensor; - private WakeLock mSensorWakeLock; private Context mContext; private long mEntryTimestamp; public TiltSensor(Context context) { mContext = context; - mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE); mSensorManager = (SensorManager) mContext.getSystemService(Context.SENSOR_SERVICE); mSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_TILT_DETECTOR); - mSensorWakeLock = mPowerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, - "SensorWakeLock"); } @Override diff --git a/doze/src/com/cyanogenmod/settings/doze/Utils.java b/doze/src/com/cyanogenmod/settings/doze/Utils.java index 538eaea..caa12bb 100644 --- a/doze/src/com/cyanogenmod/settings/doze/Utils.java +++ b/doze/src/com/cyanogenmod/settings/doze/Utils.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2015 The CyanogenMod Project + * Copyright (C) 2017 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +34,6 @@ public final class Utils { private static final String DOZE_INTENT = "com.android.systemui.doze.pulse"; - protected static final String AMBIENT_DISPLAY_KEY = "doze_enabled"; protected static final String GESTURE_PICK_UP_KEY = "gesture_pick_up"; protected static final String GESTURE_HAND_WAVE_KEY = "gesture_hand_wave"; protected static final String GESTURE_POCKET_KEY = "gesture_pocket"; -- cgit v1.2.3