BOBtheBlinker/android_device_oneplus_dre
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sdm845-common: doze: Add missing pocket mode hooks

Browse source 
Change-Id: I81af20cb9f737e0a2260c42fc91530572b16ec5e
This commit is contained in:
Luca Stefani 2019-01-08 12:39:55 +01:00
parent 7eac1259ab
commit 8e87bbae81
3 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
doze/src/org/lineageos/settings/doze/BootCompletedReceiver.java
View file

@ -29,10 +29,7 @@ public class BootCompletedReceiver extends BroadcastReceiver {
@Override @Override
public void onReceive(final Context context, Intent intent) { public void onReceive(final Context context, Intent intent) {
if (Utils.isDozeEnabled(context) && Utils.isPickUpEnabled(context)) { if (DEBUG) Log.d(TAG, "Received boot completed intent");
if (DEBUG) Log.d(TAG, "Starting service"); Utils.checkDozeService(context);
Utils.startService(context);
}
} }
} }

8
doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java
View file

@ -45,6 +45,7 @@ public class DozeSettingsFragment extends PreferenceFragment implements OnPrefer
private View mSwitchBar; private View mSwitchBar;
private SwitchPreference mPickUpPreference; private SwitchPreference mPickUpPreference;
private SwitchPreference mPocketPreference;
@Override @Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
@ -63,6 +64,10 @@ public class DozeSettingsFragment extends PreferenceFragment implements OnPrefer
mPickUpPreference = (SwitchPreference) findPreference(Utils.GESTURE_PICK_UP_KEY); mPickUpPreference = (SwitchPreference) findPreference(Utils.GESTURE_PICK_UP_KEY);
mPickUpPreference.setEnabled(dozeEnabled); mPickUpPreference.setEnabled(dozeEnabled);
mPickUpPreference.setOnPreferenceChangeListener(this); mPickUpPreference.setOnPreferenceChangeListener(this);
mPocketPreference = (SwitchPreference) findPreference(Utils.GESTURE_POCKET_KEY);
mPocketPreference.setEnabled(dozeEnabled);
mPocketPreference.setOnPreferenceChangeListener(this);
} }
@Override @Override
@ -96,7 +101,7 @@ public class DozeSettingsFragment extends PreferenceFragment implements OnPrefer
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
Utils.enablePickUp(getActivity(), (Boolean) newValue); Utils.enableGesture(getActivity(), preference.getKey(), (Boolean) newValue);
Utils.checkDozeService(getActivity()); Utils.checkDozeService(getActivity());
return true; return true;
} }
@ -110,6 +115,7 @@ public class DozeSettingsFragment extends PreferenceFragment implements OnPrefer
mSwitchBar.setActivated(isChecked); mSwitchBar.setActivated(isChecked);
mPickUpPreference.setEnabled(isChecked); mPickUpPreference.setEnabled(isChecked);
mPocketPreference.setEnabled(isChecked);
} }
@Override @Override

27
doze/src/org/lineageos/settings/doze/Utils.java
View file

@ -51,8 +51,7 @@ public final class Utils {
} }
protected static void checkDozeService(Context context) { protected static void checkDozeService(Context context) {
if (isDozeEnabled(context) && if (isDozeEnabled(context) && areGesturesEnabled(context)) {
(isPickUpEnabled(context) || isPocketEnabled(context))) {
startService(context); startService(context);
} else { } else {
stopService(context); stopService(context);
@ -75,24 +74,26 @@ public final class Utils {
new UserHandle(UserHandle.USER_CURRENT)); new UserHandle(UserHandle.USER_CURRENT));
} }
protected static void enablePickUp(Context context, boolean enable) { protected static void enableGesture(Context context, String gesture, boolean enable) {
PreferenceManager.getDefaultSharedPreferences(context).edit() PreferenceManager.getDefaultSharedPreferences(context).edit()
.putBoolean(GESTURE_PICK_UP_KEY, enable).apply(); .putBoolean(gesture, enable).apply();
}
protected static boolean isGestureEnabled(Context context, String gesture) {
return PreferenceManager.getDefaultSharedPreferences(context)
.getBoolean(gesture, false);
} }
protected static boolean isPickUpEnabled(Context context) { protected static boolean isPickUpEnabled(Context context) {
return PreferenceManager.getDefaultSharedPreferences(context) return isGestureEnabled(context, GESTURE_PICK_UP_KEY);
.getBoolean(GESTURE_PICK_UP_KEY, false);
}
protected static void enablePocket(Context context, boolean enable) {
PreferenceManager.getDefaultSharedPreferences(context).edit()
.putBoolean(GESTURE_POCKET_KEY, enable).apply();
} }
protected static boolean isPocketEnabled(Context context) { protected static boolean isPocketEnabled(Context context) {
return PreferenceManager.getDefaultSharedPreferences(context) return isGestureEnabled(context, GESTURE_POCKET_KEY);
.getBoolean(GESTURE_POCKET_KEY, false); }
public static boolean areGesturesEnabled(Context context) {
return isPickUpEnabled(context) || isPocketEnabled(context);
} }
protected static Sensor getSensor(SensorManager sm, String type) { protected static Sensor getSensor(SensorManager sm, String type) {