From 98dce4d4d50edd090869e5f9bd4e29e409f9a525 Mon Sep 17 00:00:00 2001 From: GiaSen Date: Fri, 1 Jan 2021 17:53:10 +0100 Subject: [PATCH] kunlun2: Nuke LenovoParts --- device.mk | 4 - parts/Android.mk | 34 --- parts/AndroidManifest.xml | 61 ------ parts/proguard.flags | 3 - parts/res/color/switch_bar_bg.xml | 20 -- parts/res/drawable/switchbar_background.xml | 20 -- parts/res/layout/doze.xml | 28 --- parts/res/layout/switch_bar.xml | 49 ----- parts/res/values-night/colors.xml | 21 -- parts/res/values/colors.xml | 22 -- parts/res/values/styles.xml | 73 ------- parts/res/xml/doze_settings.xml | 57 ----- .../settings/BootCompletedReceiver.java | 37 ---- .../lineageos/settings/doze/DozeService.java | 99 --------- .../settings/doze/DozeSettingsActivity.java | 34 --- .../settings/doze/DozeSettingsFragment.java | 201 ------------------ .../lineageos/settings/doze/DozeUtils.java | 134 ------------ .../settings/doze/ProximitySensor.java | 107 ---------- .../lineageos/settings/doze/TiltSensor.java | 94 -------- 19 files changed, 1098 deletions(-) delete mode 100644 parts/Android.mk delete mode 100644 parts/AndroidManifest.xml delete mode 100644 parts/proguard.flags delete mode 100644 parts/res/color/switch_bar_bg.xml delete mode 100644 parts/res/drawable/switchbar_background.xml delete mode 100644 parts/res/layout/doze.xml delete mode 100644 parts/res/layout/switch_bar.xml delete mode 100644 parts/res/values-night/colors.xml delete mode 100644 parts/res/values/colors.xml delete mode 100644 parts/res/values/styles.xml delete mode 100644 parts/res/xml/doze_settings.xml delete mode 100644 parts/src/org/lineageos/settings/BootCompletedReceiver.java delete mode 100644 parts/src/org/lineageos/settings/doze/DozeService.java delete mode 100644 parts/src/org/lineageos/settings/doze/DozeSettingsActivity.java delete mode 100644 parts/src/org/lineageos/settings/doze/DozeSettingsFragment.java delete mode 100644 parts/src/org/lineageos/settings/doze/DozeUtils.java delete mode 100644 parts/src/org/lineageos/settings/doze/ProximitySensor.java delete mode 100644 parts/src/org/lineageos/settings/doze/TiltSensor.java diff --git a/device.mk b/device.mk index de42a88..98b34e7 100644 --- a/device.mk +++ b/device.mk @@ -52,10 +52,6 @@ PRODUCT_PACKAGES += \ init.qcom.rc \ init.power.rc -# Device-specific settings -PRODUCT_PACKAGES += \ - LenovoParts - # Display PRODUCT_PACKAGES += \ libdisplayconfig \ diff --git a/parts/Android.mk b/parts/Android.mk deleted file mode 100644 index 0cae3d7..0000000 --- a/parts/Android.mk +++ /dev/null @@ -1,34 +0,0 @@ -# -# Copyright (C) 2017-2020 The LineageOS Project -# -# SPDX-License-Identifier: Apache-2.0 -# - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_PACKAGE_NAME := LenovoParts -LOCAL_CERTIFICATE := platform -LOCAL_PRIVATE_PLATFORM_APIS := true -LOCAL_PRIVILEGED_MODULE := true - -LOCAL_USE_AAPT2 := true - -LOCAL_STATIC_ANDROID_LIBRARIES := \ - androidx.core_core \ - androidx.preference_preference - -LOCAL_RESOURCE_DIR := \ - $(LOCAL_PATH)/res \ - $(TOP)/packages/resources/devicesettings/res - -LOCAL_PROGUARD_FLAG_FILES := proguard.flags - -include frameworks/base/packages/SettingsLib/common.mk - -include $(BUILD_PACKAGE) diff --git a/parts/AndroidManifest.xml b/parts/AndroidManifest.xml deleted file mode 100644 index c3f00c7..0000000 --- a/parts/AndroidManifest.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/parts/proguard.flags b/parts/proguard.flags deleted file mode 100644 index f6d7a5b..0000000 --- a/parts/proguard.flags +++ /dev/null @@ -1,3 +0,0 @@ --keep class org.lineageos.settings.doze.* { - *; -} diff --git a/parts/res/color/switch_bar_bg.xml b/parts/res/color/switch_bar_bg.xml deleted file mode 100644 index ca13e3c..0000000 --- a/parts/res/color/switch_bar_bg.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - diff --git a/parts/res/drawable/switchbar_background.xml b/parts/res/drawable/switchbar_background.xml deleted file mode 100644 index f210707..0000000 --- a/parts/res/drawable/switchbar_background.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/parts/res/layout/doze.xml b/parts/res/layout/doze.xml deleted file mode 100644 index 941cdf6..0000000 --- a/parts/res/layout/doze.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/parts/res/layout/switch_bar.xml b/parts/res/layout/switch_bar.xml deleted file mode 100644 index 1bf6f6c..0000000 --- a/parts/res/layout/switch_bar.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - diff --git a/parts/res/values-night/colors.xml b/parts/res/values-night/colors.xml deleted file mode 100644 index 8a58df8..0000000 --- a/parts/res/values-night/colors.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - #82000000 - @android:color/black - - diff --git a/parts/res/values/colors.xml b/parts/res/values/colors.xml deleted file mode 100644 index 564b3ea..0000000 --- a/parts/res/values/colors.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - @*android:color/material_grey_600 - #BFFFFFFF - @android:color/white - - diff --git a/parts/res/values/styles.xml b/parts/res/values/styles.xml deleted file mode 100644 index e98b9f6..0000000 --- a/parts/res/values/styles.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/parts/res/xml/doze_settings.xml b/parts/res/xml/doze_settings.xml deleted file mode 100644 index e00d61a..0000000 --- a/parts/res/xml/doze_settings.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/parts/src/org/lineageos/settings/BootCompletedReceiver.java b/parts/src/org/lineageos/settings/BootCompletedReceiver.java deleted file mode 100644 index d44d70b..0000000 --- a/parts/src/org/lineageos/settings/BootCompletedReceiver.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2015 The CyanogenMod Project - * 2017-2019 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.lineageos.settings; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.util.Log; - -import org.lineageos.settings.doze.DozeUtils; - -public class BootCompletedReceiver extends BroadcastReceiver { - - private static final boolean DEBUG = false; - private static final String TAG = "LenovoParts"; - - @Override - public void onReceive(final Context context, Intent intent) { - if (DEBUG) Log.d(TAG, "Received boot completed intent"); - DozeUtils.checkDozeService(context); - } -} diff --git a/parts/src/org/lineageos/settings/doze/DozeService.java b/parts/src/org/lineageos/settings/doze/DozeService.java deleted file mode 100644 index 0ca38a3..0000000 --- a/parts/src/org/lineageos/settings/doze/DozeService.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright (C) 2015 The CyanogenMod Project - * 2017-2018 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.lineageos.settings.doze; - -import android.app.Service; -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; -import android.os.IBinder; -import android.util.Log; - -public class DozeService extends Service { - private static final String TAG = "DozeService"; - private static final boolean DEBUG = false; - - private ProximitySensor mProximitySensor; - private TiltSensor mTiltSensor; - - @Override - public void onCreate() { - if (DEBUG) Log.d(TAG, "Creating service"); - mProximitySensor = new ProximitySensor(this); - mTiltSensor = new TiltSensor(this); - - IntentFilter screenStateFilter = new IntentFilter(); - screenStateFilter.addAction(Intent.ACTION_SCREEN_ON); - screenStateFilter.addAction(Intent.ACTION_SCREEN_OFF); - registerReceiver(mScreenStateReceiver, screenStateFilter); - } - - @Override - public int onStartCommand(Intent intent, int flags, int startId) { - if (DEBUG) Log.d(TAG, "Starting service"); - return START_STICKY; - } - - @Override - public void onDestroy() { - if (DEBUG) Log.d(TAG, "Destroying service"); - super.onDestroy(); - this.unregisterReceiver(mScreenStateReceiver); - mProximitySensor.disable(); - mTiltSensor.disable(); - } - - @Override - public IBinder onBind(Intent intent) { - return null; - } - - private void onDisplayOn() { - if (DEBUG) Log.d(TAG, "Display on"); - if (DozeUtils.isPickUpEnabled(this)) { - mTiltSensor.disable(); - } - if (DozeUtils.isHandwaveGestureEnabled(this) || - DozeUtils.isPocketGestureEnabled(this)) { - mProximitySensor.disable(); - } - } - - private void onDisplayOff() { - if (DEBUG) Log.d(TAG, "Display off"); - if (DozeUtils.isPickUpEnabled(this)) { - mTiltSensor.enable(); - } - if (DozeUtils.isHandwaveGestureEnabled(this) || - DozeUtils.isPocketGestureEnabled(this)) { - mProximitySensor.enable(); - } - } - - private BroadcastReceiver mScreenStateReceiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - if (intent.getAction().equals(Intent.ACTION_SCREEN_ON)) { - onDisplayOn(); - } else if (intent.getAction().equals(Intent.ACTION_SCREEN_OFF)) { - onDisplayOff(); - } - } - }; -} diff --git a/parts/src/org/lineageos/settings/doze/DozeSettingsActivity.java b/parts/src/org/lineageos/settings/doze/DozeSettingsActivity.java deleted file mode 100644 index 1591b2c..0000000 --- a/parts/src/org/lineageos/settings/doze/DozeSettingsActivity.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2015-2016 The CyanogenMod Project - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.lineageos.settings.doze; - -import android.os.Bundle; -import android.preference.PreferenceActivity; - -public class DozeSettingsActivity extends PreferenceActivity { - - private static final String TAG_DOZE = "doze"; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - getFragmentManager().beginTransaction().replace(android.R.id.content, - new DozeSettingsFragment(), TAG_DOZE).commit(); - } -} diff --git a/parts/src/org/lineageos/settings/doze/DozeSettingsFragment.java b/parts/src/org/lineageos/settings/doze/DozeSettingsFragment.java deleted file mode 100644 index c1c9ffb..0000000 --- a/parts/src/org/lineageos/settings/doze/DozeSettingsFragment.java +++ /dev/null @@ -1,201 +0,0 @@ -/* - * Copyright (C) 2015 The CyanogenMod Project - * 2017-2019 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.lineageos.settings.doze; - -import android.app.ActionBar; -import android.app.Activity; -import android.app.AlertDialog; -import android.app.Dialog; -import android.app.DialogFragment; -import android.content.Context; -import android.content.DialogInterface; -import android.content.SharedPreferences; -import android.os.Bundle; -import android.os.Handler; -import android.view.LayoutInflater; -import android.view.MenuItem; -import android.view.View; -import android.view.ViewGroup; -import android.widget.CompoundButton; -import android.widget.Switch; -import android.widget.TextView; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceFragment; -import androidx.preference.SwitchPreference; - -import org.lineageos.settings.R; - -public class DozeSettingsFragment extends PreferenceFragment implements OnPreferenceChangeListener, - CompoundButton.OnCheckedChangeListener { - - private TextView mTextView; - private View mSwitchBar; - - private SwitchPreference mAlwaysOnDisplayPreference; - - private SwitchPreference mPickUpPreference; - private SwitchPreference mHandwavePreference; - private SwitchPreference mPocketPreference; - - private Handler mHandler = new Handler(); - - @Override - public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { - addPreferencesFromResource(R.xml.doze_settings); - final ActionBar actionBar = getActivity().getActionBar(); - actionBar.setDisplayHomeAsUpEnabled(true); - - SharedPreferences prefs = getActivity().getSharedPreferences("doze_settings", - Activity.MODE_PRIVATE); - if (savedInstanceState == null && !prefs.getBoolean("first_help_shown", false)) { - showHelp(); - } - - boolean dozeEnabled = DozeUtils.isDozeEnabled(getActivity()); - - mAlwaysOnDisplayPreference = (SwitchPreference) findPreference(DozeUtils.ALWAYS_ON_DISPLAY); - mAlwaysOnDisplayPreference.setEnabled(dozeEnabled); - mAlwaysOnDisplayPreference.setChecked(DozeUtils.isAlwaysOnEnabled(getActivity())); - mAlwaysOnDisplayPreference.setOnPreferenceChangeListener(this); - - PreferenceCategory pickupSensorCategory = (PreferenceCategory) getPreferenceScreen(). - findPreference(DozeUtils.CATEG_PICKUP_SENSOR); - PreferenceCategory proximitySensorCategory = (PreferenceCategory) getPreferenceScreen(). - findPreference(DozeUtils.CATEG_PROX_SENSOR); - - mPickUpPreference = (SwitchPreference) findPreference(DozeUtils.GESTURE_PICK_UP_KEY); - mPickUpPreference.setEnabled(dozeEnabled); - mPickUpPreference.setOnPreferenceChangeListener(this); - - mHandwavePreference = (SwitchPreference) findPreference(DozeUtils.GESTURE_HAND_WAVE_KEY); - mHandwavePreference.setEnabled(dozeEnabled); - mHandwavePreference.setOnPreferenceChangeListener(this); - - mPocketPreference = (SwitchPreference) findPreference(DozeUtils.GESTURE_POCKET_KEY); - mPocketPreference.setEnabled(dozeEnabled); - mPocketPreference.setOnPreferenceChangeListener(this); - - // Hide proximity sensor related features if the device doesn't support them - if (!DozeUtils.getProxCheckBeforePulse(getActivity())) { - getPreferenceScreen().removePreference(proximitySensorCategory); - } - - // Hide AOD if not supported and set all its dependents otherwise - if (!DozeUtils.alwaysOnDisplayAvailable(getActivity())) { - getPreferenceScreen().removePreference(mAlwaysOnDisplayPreference); - } else { - pickupSensorCategory.setDependency(DozeUtils.ALWAYS_ON_DISPLAY); - proximitySensorCategory.setDependency(DozeUtils.ALWAYS_ON_DISPLAY); - } - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - final View view = LayoutInflater.from(getContext()).inflate(R.layout.doze, - container, false); - ((ViewGroup) view).addView(super.onCreateView(inflater, container, savedInstanceState)); - return view; - } - - @Override - public void onViewCreated(View view, Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - - boolean dozeEnabled = DozeUtils.isDozeEnabled(getActivity()); - - mTextView = view.findViewById(R.id.switch_text); - mTextView.setText(getString(dozeEnabled ? - R.string.switch_bar_on : R.string.switch_bar_off)); - - mSwitchBar = view.findViewById(R.id.switch_bar); - Switch switchWidget = mSwitchBar.findViewById(android.R.id.switch_widget); - switchWidget.setChecked(dozeEnabled); - switchWidget.setOnCheckedChangeListener(this); - mSwitchBar.setActivated(dozeEnabled); - mSwitchBar.setOnClickListener(v -> { - switchWidget.setChecked(!switchWidget.isChecked()); - mSwitchBar.setActivated(switchWidget.isChecked()); - }); - } - - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - if (DozeUtils.ALWAYS_ON_DISPLAY.equals(preference.getKey())) { - DozeUtils.enableAlwaysOn(getActivity(), (Boolean) newValue); - } - - mHandler.post(() -> DozeUtils.checkDozeService(getActivity())); - - return true; - } - - @Override - public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) { - DozeUtils.enableDoze(getActivity(), isChecked); - DozeUtils.checkDozeService(getActivity()); - - mTextView.setText(getString(isChecked ? R.string.switch_bar_on : R.string.switch_bar_off)); - mSwitchBar.setActivated(isChecked); - - if (!isChecked) { - DozeUtils.enableAlwaysOn(getActivity(), false); - mAlwaysOnDisplayPreference.setChecked(false); - } - mAlwaysOnDisplayPreference.setEnabled(isChecked); - - mPickUpPreference.setEnabled(isChecked); - mHandwavePreference.setEnabled(isChecked); - mPocketPreference.setEnabled(isChecked); - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - if (item.getItemId() == android.R.id.home) { - getActivity().onBackPressed(); - return true; - } - return false; - } - - private static class HelpDialogFragment extends DialogFragment { - @Override - public Dialog onCreateDialog(Bundle savedInstanceState) { - return new AlertDialog.Builder(getActivity()) - .setTitle(R.string.doze_settings_help_title) - .setMessage(R.string.doze_settings_help_text) - .setNegativeButton(R.string.dialog_ok, (dialog, which) -> dialog.cancel()) - .create(); - } - - @Override - public void onCancel(DialogInterface dialog) { - getActivity().getSharedPreferences("doze_settings", Activity.MODE_PRIVATE) - .edit() - .putBoolean("first_help_shown", true) - .commit(); - } - } - - private void showHelp() { - HelpDialogFragment fragment = new HelpDialogFragment(); - fragment.show(getFragmentManager(), "help_dialog"); - } -} diff --git a/parts/src/org/lineageos/settings/doze/DozeUtils.java b/parts/src/org/lineageos/settings/doze/DozeUtils.java deleted file mode 100644 index d0f22f3..0000000 --- a/parts/src/org/lineageos/settings/doze/DozeUtils.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright (C) 2015 The CyanogenMod Project - * 2017-2019 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.lineageos.settings.doze; - -import android.content.Context; -import android.content.Intent; -import android.content.pm.PackageManager; -import android.hardware.display.AmbientDisplayConfiguration; -import android.os.UserHandle; -import android.provider.Settings; -import android.util.Log; -import androidx.preference.PreferenceManager; - -import static android.provider.Settings.Secure.DOZE_ALWAYS_ON; -import static android.provider.Settings.Secure.DOZE_ENABLED; - -public final class DozeUtils { - - private static final String TAG = "DozeUtils"; - private static final boolean DEBUG = false; - - private static final String DOZE_INTENT = "com.android.systemui.doze.pulse"; - - protected static final String ALWAYS_ON_DISPLAY = "always_on_display"; - - protected static final String CATEG_PICKUP_SENSOR = "pickup_sensor"; - protected static final String CATEG_PROX_SENSOR = "proximity_sensor"; - - 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"; - - public static void startService(Context context) { - if (DEBUG) Log.d(TAG, "Starting service"); - context.startServiceAsUser(new Intent(context, DozeService.class), - UserHandle.CURRENT); - } - - protected static void stopService(Context context) { - if (DEBUG) Log.d(TAG, "Stopping service"); - context.stopServiceAsUser(new Intent(context, DozeService.class), - UserHandle.CURRENT); - } - - public static void checkDozeService(Context context) { - if (isDozeEnabled(context) && !isAlwaysOnEnabled(context) && sensorsEnabled(context)) { - startService(context); - } else { - stopService(context); - } - } - - protected static boolean getProxCheckBeforePulse(Context context) { - try { - Context con = context.createPackageContext("com.android.systemui", 0); - int id = con.getResources().getIdentifier("doze_proximity_check_before_pulse", - "bool", "com.android.systemui"); - return con.getResources().getBoolean(id); - } catch (PackageManager.NameNotFoundException e) { - return false; - } - } - - protected static boolean enableDoze(Context context, boolean enable) { - return Settings.Secure.putInt(context.getContentResolver(), - DOZE_ENABLED, enable ? 1 : 0); - } - - public static boolean isDozeEnabled(Context context) { - return Settings.Secure.getInt(context.getContentResolver(), - DOZE_ENABLED, 1) != 0; - } - - protected static void launchDozePulse(Context context) { - if (DEBUG) Log.d(TAG, "Launch doze pulse"); - context.sendBroadcastAsUser(new Intent(DOZE_INTENT), - new UserHandle(UserHandle.USER_CURRENT)); - } - - protected static boolean enableAlwaysOn(Context context, boolean enable) { - return Settings.Secure.putIntForUser(context.getContentResolver(), - DOZE_ALWAYS_ON, enable ? 1 : 0, UserHandle.USER_CURRENT); - } - - protected static boolean isAlwaysOnEnabled(Context context) { - final boolean enabledByDefault = context.getResources() - .getBoolean(com.android.internal.R.bool.config_dozeAlwaysOnEnabled); - - return Settings.Secure.getIntForUser(context.getContentResolver(), - DOZE_ALWAYS_ON, alwaysOnDisplayAvailable(context) && enabledByDefault ? 1 : 0, - UserHandle.USER_CURRENT) != 0; - } - - protected static boolean alwaysOnDisplayAvailable(Context context) { - return new AmbientDisplayConfiguration(context).alwaysOnAvailable(); - } - - protected static boolean isGestureEnabled(Context context, String gesture) { - return PreferenceManager.getDefaultSharedPreferences(context) - .getBoolean(gesture, false); - } - - protected static boolean isPickUpEnabled(Context context) { - return isGestureEnabled(context, GESTURE_PICK_UP_KEY); - } - - protected static boolean isHandwaveGestureEnabled(Context context) { - return isGestureEnabled(context, GESTURE_HAND_WAVE_KEY); - } - - protected static boolean isPocketGestureEnabled(Context context) { - return isGestureEnabled(context, GESTURE_POCKET_KEY); - } - - public static boolean sensorsEnabled(Context context) { - return isPickUpEnabled(context) || isHandwaveGestureEnabled(context) - || isPocketGestureEnabled(context); - } -} diff --git a/parts/src/org/lineageos/settings/doze/ProximitySensor.java b/parts/src/org/lineageos/settings/doze/ProximitySensor.java deleted file mode 100644 index 52bd0b5..0000000 --- a/parts/src/org/lineageos/settings/doze/ProximitySensor.java +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright (C) 2015 The CyanogenMod Project - * 2017-2018 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.lineageos.settings.doze; - -import android.content.Context; -import android.hardware.Sensor; -import android.hardware.SensorEvent; -import android.hardware.SensorEventListener; -import android.hardware.SensorManager; -import android.util.Log; - -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; - -public class ProximitySensor implements SensorEventListener { - - private static final boolean DEBUG = false; - private static final String TAG = "ProximitySensor"; - - // Maximum time for the hand to cover the sensor: 1s - private static final int HANDWAVE_MAX_DELTA_NS = 1000 * 1000 * 1000; - - // Minimum time until the device is considered to have been in the pocket: 2s - private static final int POCKET_MIN_DELTA_NS = 2000 * 1000 * 1000; - - private SensorManager mSensorManager; - private Sensor mSensor; - private Context mContext; - private ExecutorService mExecutorService; - - private boolean mSawNear = false; - private long mInPocketTime = 0; - - public ProximitySensor(Context context) { - mContext = context; - mSensorManager = mContext.getSystemService(SensorManager.class); - mSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY, false); - mExecutorService = Executors.newSingleThreadExecutor(); - } - - private Future submit(Runnable runnable) { - return mExecutorService.submit(runnable); - } - - @Override - public void onSensorChanged(SensorEvent event) { - boolean isNear = event.values[0] < mSensor.getMaximumRange(); - if (mSawNear && !isNear) { - if (shouldPulse(event.timestamp)) { - DozeUtils.launchDozePulse(mContext); - } - } else { - mInPocketTime = event.timestamp; - } - mSawNear = isNear; - } - - private boolean shouldPulse(long timestamp) { - long delta = timestamp - mInPocketTime; - - if (DozeUtils.isHandwaveGestureEnabled(mContext) && - DozeUtils.isPocketGestureEnabled(mContext)) { - return true; - } else if (DozeUtils.isHandwaveGestureEnabled(mContext)) { - return delta < HANDWAVE_MAX_DELTA_NS; - } else if (DozeUtils.isPocketGestureEnabled(mContext)) { - return delta >= POCKET_MIN_DELTA_NS; - } - return false; - } - - @Override - public void onAccuracyChanged(Sensor sensor, int accuracy) { - /* Empty */ - } - - protected void enable() { - if (DEBUG) Log.d(TAG, "Enabling"); - submit(() -> { - mSensorManager.registerListener(this, mSensor, - SensorManager.SENSOR_DELAY_NORMAL); - }); - } - - protected void disable() { - if (DEBUG) Log.d(TAG, "Disabling"); - submit(() -> { - mSensorManager.unregisterListener(this, mSensor); - }); - } -} diff --git a/parts/src/org/lineageos/settings/doze/TiltSensor.java b/parts/src/org/lineageos/settings/doze/TiltSensor.java deleted file mode 100644 index e86c0f8..0000000 --- a/parts/src/org/lineageos/settings/doze/TiltSensor.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (C) 2015 The CyanogenMod Project - * 2017-2018 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.lineageos.settings.doze; - -import android.content.Context; -import android.hardware.Sensor; -import android.hardware.SensorEvent; -import android.hardware.SensorEventListener; -import android.hardware.SensorManager; -import android.os.SystemClock; -import android.util.Log; - -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; - -public class TiltSensor implements SensorEventListener { - - private static final boolean DEBUG = false; - private static final String TAG = "TiltSensor"; - - private static final int BATCH_LATENCY_IN_MS = 100; - private static final int MIN_PULSE_INTERVAL_MS = 2500; - - private SensorManager mSensorManager; - private Sensor mSensor; - private Context mContext; - private ExecutorService mExecutorService; - - private long mEntryTimestamp; - - public TiltSensor(Context context) { - mContext = context; - mSensorManager = mContext.getSystemService(SensorManager.class); - mSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_TILT_DETECTOR); - mExecutorService = Executors.newSingleThreadExecutor(); - } - - private Future submit(Runnable runnable) { - return mExecutorService.submit(runnable); - } - - @Override - public void onSensorChanged(SensorEvent event) { - if (DEBUG) Log.d(TAG, "Got sensor event: " + event.values[0]); - - long delta = SystemClock.elapsedRealtime() - mEntryTimestamp; - if (delta < MIN_PULSE_INTERVAL_MS) { - return; - } else { - mEntryTimestamp = SystemClock.elapsedRealtime(); - } - - if (event.values[0] == 1) { - DozeUtils.launchDozePulse(mContext); - } - } - - @Override - public void onAccuracyChanged(Sensor sensor, int accuracy) { - /* Empty */ - } - - protected void enable() { - if (DEBUG) Log.d(TAG, "Enabling"); - submit(() -> { - mSensorManager.registerListener(this, mSensor, - SensorManager.SENSOR_DELAY_NORMAL, BATCH_LATENCY_IN_MS * 1000); - mEntryTimestamp = SystemClock.elapsedRealtime(); - }); - } - - protected void disable() { - if (DEBUG) Log.d(TAG, "Disabling"); - submit(() -> { - mSensorManager.unregisterListener(this, mSensor); - }); - } -}