From 41fbcd89811df4ad6390facd7c8524755ff2c45c Mon Sep 17 00:00:00 2001 From: deadman96385 Date: Sat, 24 Feb 2018 20:44:03 +0100 Subject: [PATCH] universal7580: Import Samsung Doze from samsung_qcom-common Change-Id: Ibd29d5c49fcabcd30bf3572f3bcd08110900779e --- SamsungDoze/Android.mk | 38 ++++ SamsungDoze/AndroidManifest.xml | 45 ++++ SamsungDoze/proguard.flags | 9 + SamsungDoze/res/values/styles.xml | 56 +++++ SamsungDoze/res/xml/gesture_panel.xml | 55 +++++ .../settings/doze/BootCompletedReceiver.java | 35 +++ .../settings/doze/SamsungDozeActivity.java | 31 +++ .../settings/doze/SamsungDozeService.java | 201 ++++++++++++++++++ .../doze/TouchscreenGestureSettings.java | 84 ++++++++ device-common.mk | 4 + lineage.dependencies | 4 + 11 files changed, 562 insertions(+) create mode 100644 SamsungDoze/Android.mk create mode 100644 SamsungDoze/AndroidManifest.xml create mode 100644 SamsungDoze/proguard.flags create mode 100644 SamsungDoze/res/values/styles.xml create mode 100644 SamsungDoze/res/xml/gesture_panel.xml create mode 100644 SamsungDoze/src/org/lineageos/settings/doze/BootCompletedReceiver.java create mode 100644 SamsungDoze/src/org/lineageos/settings/doze/SamsungDozeActivity.java create mode 100644 SamsungDoze/src/org/lineageos/settings/doze/SamsungDozeService.java create mode 100644 SamsungDoze/src/org/lineageos/settings/doze/TouchscreenGestureSettings.java diff --git a/SamsungDoze/Android.mk b/SamsungDoze/Android.mk new file mode 100644 index 0000000..4f9f904 --- /dev/null +++ b/SamsungDoze/Android.mk @@ -0,0 +1,38 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := optional + +LOCAL_SRC_FILES := $(call all-java-files-under, src) + +LOCAL_PACKAGE_NAME := SamsungDoze +LOCAL_CERTIFICATE := platform +LOCAL_PRIVILEGED_MODULE := true + +LOCAL_USE_AAPT2 := true + +LOCAL_STATIC_ANDROID_LIBRARIES := \ + android-support-v4 \ + android-support-v13 \ + android-support-v7-appcompat \ + android-support-v7-preference \ + android-support-v7-recyclerview \ + android-support-v14-preference + +LOCAL_STATIC_JAVA_LIBRARIES := \ + org.lineageos.platform.internal + +LOCAL_PROGUARD_FLAG_FILES := proguard.flags + +LOCAL_RESOURCE_DIR := \ + $(LOCAL_PATH)/res \ + $(TOP)/packages/resources/devicesettings/res + +ifneq ($(INCREMENTAL_BUILDS),) + LOCAL_PROGUARD_ENABLED := disabled + LOCAL_JACK_ENABLED := incremental +endif + +include $(BUILD_PACKAGE) + +include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/SamsungDoze/AndroidManifest.xml b/SamsungDoze/AndroidManifest.xml new file mode 100644 index 0000000..f493b33 --- /dev/null +++ b/SamsungDoze/AndroidManifest.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SamsungDoze/proguard.flags b/SamsungDoze/proguard.flags new file mode 100644 index 0000000..37c5c91 --- /dev/null +++ b/SamsungDoze/proguard.flags @@ -0,0 +1,9 @@ +-keep class org.lineageos.settings.doze.* { + *; +} + +-keepclasseswithmembers class * { + public (android.content.Context, android.util.AttributeSet); +} + +-keep class ** extends android.support.v14.preference.PreferenceFragment diff --git a/SamsungDoze/res/values/styles.xml b/SamsungDoze/res/values/styles.xml new file mode 100644 index 0000000..1ecca6c --- /dev/null +++ b/SamsungDoze/res/values/styles.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + diff --git a/SamsungDoze/res/xml/gesture_panel.xml b/SamsungDoze/res/xml/gesture_panel.xml new file mode 100644 index 0000000..1a063d1 --- /dev/null +++ b/SamsungDoze/res/xml/gesture_panel.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + diff --git a/SamsungDoze/src/org/lineageos/settings/doze/BootCompletedReceiver.java b/SamsungDoze/src/org/lineageos/settings/doze/BootCompletedReceiver.java new file mode 100644 index 0000000..8640134 --- /dev/null +++ b/SamsungDoze/src/org/lineageos/settings/doze/BootCompletedReceiver.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2015 The CyanogenMod 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.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.util.Log; + +public class BootCompletedReceiver extends BroadcastReceiver { + + private static final boolean DEBUG = false; + private static final String TAG = "SamsungDoze"; + + @Override + public void onReceive(final Context context, Intent intent) { + if (DEBUG) Log.d(TAG, "Starting service"); + context.startService(new Intent(context, SamsungDozeService.class)); + } + +} diff --git a/SamsungDoze/src/org/lineageos/settings/doze/SamsungDozeActivity.java b/SamsungDoze/src/org/lineageos/settings/doze/SamsungDozeActivity.java new file mode 100644 index 0000000..70856b6 --- /dev/null +++ b/SamsungDoze/src/org/lineageos/settings/doze/SamsungDozeActivity.java @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2016 The CyanogenMod 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 SamsungDozeActivity extends PreferenceActivity { + + private static final String TAG = "samsung_doze"; + + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + getFragmentManager().beginTransaction().replace(android.R.id.content, + new TouchscreenGestureSettings(), TAG).commit(); + } +} diff --git a/SamsungDoze/src/org/lineageos/settings/doze/SamsungDozeService.java b/SamsungDoze/src/org/lineageos/settings/doze/SamsungDozeService.java new file mode 100644 index 0000000..063b121 --- /dev/null +++ b/SamsungDoze/src/org/lineageos/settings/doze/SamsungDozeService.java @@ -0,0 +1,201 @@ +/* + * Copyright (c) 2015 The CyanogenMod 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.content.SharedPreferences; +import android.hardware.Sensor; +import android.hardware.SensorEvent; +import android.hardware.SensorEventListener; +import android.hardware.SensorManager; +import android.os.IBinder; +import android.os.PowerManager; +import android.os.UserHandle; +import android.preference.PreferenceManager; +import android.provider.Settings; +import android.util.Log; + +import java.lang.System; +import java.util.ArrayList; +import java.util.concurrent.TimeUnit; +import java.util.List; + +public class SamsungDozeService extends Service { + private static final String TAG = "SamsungDozeService"; + private static final boolean DEBUG = false; + + private static final String DOZE_INTENT = "com.android.systemui.doze.pulse"; + + private static final String GESTURE_HAND_WAVE_KEY = "gesture_hand_wave"; + private static final String GESTURE_POCKET_KEY = "gesture_pocket"; + private static final String PROXIMITY_WAKE_KEY = "proximity_wake_enable"; + + private static final int POCKET_DELTA_NS = 1000 * 1000 * 1000; + + private Context mContext; + private SamsungProximitySensor mSensor; + private PowerManager mPowerManager; + + private boolean mHandwaveGestureEnabled = false; + private boolean mPocketGestureEnabled = false; + private boolean mProximityWakeEnabled = false; + + class SamsungProximitySensor implements SensorEventListener { + private SensorManager mSensorManager; + private Sensor mSensor; + + private boolean mSawNear = false; + private long mInPocketTime = 0; + + public SamsungProximitySensor(Context context) { + mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE); + mSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY); + } + + @Override + public void onSensorChanged(SensorEvent event) { + boolean isNear = event.values[0] < mSensor.getMaximumRange(); + if (mSawNear && !isNear) { + if (shouldPulse(event.timestamp)) { + launchDozePulse(); + } + } else { + mInPocketTime = event.timestamp; + } + mSawNear = isNear; + } + + @Override + public void onAccuracyChanged(Sensor sensor, int accuracy) { + /* Empty */ + } + + private boolean shouldPulse(long timestamp) { + long delta = timestamp - mInPocketTime; + + if (mHandwaveGestureEnabled && mPocketGestureEnabled) { + return true; + } else if (mProximityWakeEnabled && (delta < POCKET_DELTA_NS)) { + mPowerManager.wakeUp(TimeUnit.NANOSECONDS.toMillis(System.nanoTime())); + return false; + } else if (mHandwaveGestureEnabled && !mPocketGestureEnabled) { + return delta < POCKET_DELTA_NS; + } else if (!mHandwaveGestureEnabled && mPocketGestureEnabled) { + return delta >= POCKET_DELTA_NS; + } + return false; + } + + public void testAndEnable() { + if ((isDozeEnabled() && (mHandwaveGestureEnabled || mPocketGestureEnabled)) || + mProximityWakeEnabled) { + mSensorManager.registerListener(this, mSensor, SensorManager.SENSOR_DELAY_NORMAL); + } + } + + public void disable() { + mSensorManager.unregisterListener(this, mSensor); + } + } + + @Override + public void onCreate() { + if (DEBUG) Log.d(TAG, "SamsungDozeService Started"); + mContext = this; + mPowerManager = (PowerManager)getSystemService(Context.POWER_SERVICE); + mSensor = new SamsungProximitySensor(mContext); + SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(mContext); + loadPreferences(sharedPrefs); + sharedPrefs.registerOnSharedPreferenceChangeListener(mPrefListener); + if (!isInteractive()) { + mSensor.testAndEnable(); + } + } + + @Override + public int onStartCommand(Intent intent, int flags, int startId) { + if (DEBUG) Log.d(TAG, "Starting service"); + IntentFilter screenStateFilter = new IntentFilter(Intent.ACTION_SCREEN_ON); + screenStateFilter.addAction(Intent.ACTION_SCREEN_OFF); + mContext.registerReceiver(mScreenStateReceiver, screenStateFilter); + return START_STICKY; + } + + @Override + public IBinder onBind(Intent intent) { + return null; + } + + private void launchDozePulse() { + mContext.sendBroadcastAsUser(new Intent(DOZE_INTENT), + new UserHandle(UserHandle.USER_CURRENT)); + } + + private boolean isInteractive() { + return mPowerManager.isInteractive(); + } + + private boolean isDozeEnabled() { + return Settings.Secure.getInt(mContext.getContentResolver(), + Settings.Secure.DOZE_ENABLED, 1) != 0; + } + + private void onDisplayOn() { + if (DEBUG) Log.d(TAG, "Display on"); + mSensor.disable(); + } + + private void onDisplayOff() { + if (DEBUG) Log.d(TAG, "Display off"); + mSensor.testAndEnable(); + } + + private void loadPreferences(SharedPreferences sharedPreferences) { + mHandwaveGestureEnabled = sharedPreferences.getBoolean(GESTURE_HAND_WAVE_KEY, false); + mPocketGestureEnabled = sharedPreferences.getBoolean(GESTURE_POCKET_KEY, false); + mProximityWakeEnabled = sharedPreferences.getBoolean(PROXIMITY_WAKE_KEY, false); + } + + private BroadcastReceiver mScreenStateReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + if (intent.getAction().equals(Intent.ACTION_SCREEN_OFF)) { + onDisplayOff(); + } else if (intent.getAction().equals(Intent.ACTION_SCREEN_ON)) { + onDisplayOn(); + } + } + }; + + private SharedPreferences.OnSharedPreferenceChangeListener mPrefListener = + new SharedPreferences.OnSharedPreferenceChangeListener() { + @Override + public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { + if (GESTURE_HAND_WAVE_KEY.equals(key)) { + mHandwaveGestureEnabled = sharedPreferences.getBoolean(GESTURE_HAND_WAVE_KEY, false); + } else if (GESTURE_POCKET_KEY.equals(key)) { + mPocketGestureEnabled = sharedPreferences.getBoolean(GESTURE_POCKET_KEY, false); + } else if (PROXIMITY_WAKE_KEY.equals(key)) { + mProximityWakeEnabled = sharedPreferences.getBoolean(PROXIMITY_WAKE_KEY, false); + } + } + }; +} diff --git a/SamsungDoze/src/org/lineageos/settings/doze/TouchscreenGestureSettings.java b/SamsungDoze/src/org/lineageos/settings/doze/TouchscreenGestureSettings.java new file mode 100644 index 0000000..142f845 --- /dev/null +++ b/SamsungDoze/src/org/lineageos/settings/doze/TouchscreenGestureSettings.java @@ -0,0 +1,84 @@ +/* + * Copyright (C) 2015 The CyanogenMod 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.os.Bundle; +import android.support.v14.preference.PreferenceFragment; +import android.support.v14.preference.SwitchPreference; +import android.support.v7.preference.Preference; +import android.provider.Settings; +import android.view.MenuItem; + +import org.lineageos.internal.util.ScreenType; + +public class TouchscreenGestureSettings extends PreferenceFragment { + + private static final String KEY_HAND_WAVE = "gesture_hand_wave"; + private static final String KEY_PROXIMITY_WAKE = "proximity_wake_enable"; + + private SwitchPreference mHandwavePreference; + private SwitchPreference mProximityWakePreference; + + @Override + public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { + addPreferencesFromResource(R.xml.gesture_panel); + final ActionBar actionBar = getActivity().getActionBar(); + actionBar.setDisplayHomeAsUpEnabled(true); + + mHandwavePreference = + (SwitchPreference) findPreference(KEY_HAND_WAVE); + mHandwavePreference.setOnPreferenceChangeListener(mProximityListener); + mProximityWakePreference = + (SwitchPreference) findPreference(KEY_PROXIMITY_WAKE); + mProximityWakePreference.setOnPreferenceChangeListener(mProximityListener); + } + + @Override + public void onResume() { + super.onResume(); + + // If running on a phone, remove padding around the listview + if (!ScreenType.isTablet(getContext())) { + getListView().setPadding(0, 0, 0, 0); + } + } + + private Preference.OnPreferenceChangeListener mProximityListener = + new Preference.OnPreferenceChangeListener() { + @Override + public boolean onPreferenceChange(Preference preference, Object newValue) { + if ((boolean) newValue) { + if (preference.getKey().equals(KEY_HAND_WAVE)) { + mProximityWakePreference.setChecked(false); + } else if (preference.getKey().equals(KEY_PROXIMITY_WAKE)) { + mHandwavePreference.setChecked(false); + } + } + return true; + } + }; + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId() == android.R.id.home) { + getActivity().onBackPressed(); + return true; + } + return false; + } +} diff --git a/device-common.mk b/device-common.mk index 3228253..74900d3 100644 --- a/device-common.mk +++ b/device-common.mk @@ -82,6 +82,10 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ android.hardware.renderscript@1.0-impl +# SamsungDoze +PRODUCT_PACKAGES += \ + SamsungDoze + # TextClassifier PRODUCT_PACKAGES += \ textclassifier.smartselection.bundle1 diff --git a/lineage.dependencies b/lineage.dependencies index 64025b5..7b80267 100644 --- a/lineage.dependencies +++ b/lineage.dependencies @@ -22,5 +22,9 @@ { "repository": "android_kernel_samsung_universal7580", "target_path": "kernel/samsung/universal7580" + }, + { + "repository": "android_packages_resources_devicesettings", + "target_path": "packages/resources/devicesettings" } ] -- 2.20.1