aboutsummaryrefslogtreecommitdiff
path: root/doze
diff options
context:
space:
mode:
Diffstat (limited to 'doze')
-rw-r--r--doze/AndroidManifest.xml2
-rw-r--r--doze/res/layout/doze.xml28
-rw-r--r--doze/res/xml/doze_settings.xml9
-rw-r--r--doze/src/org/lineageos/settings/doze/BootCompletedReceiver.java2
-rw-r--r--doze/src/org/lineageos/settings/doze/DozeService.java17
-rw-r--r--doze/src/org/lineageos/settings/doze/DozeSettingsActivity.java10
-rw-r--r--doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java83
-rw-r--r--doze/src/org/lineageos/settings/doze/DozeUtils.java (renamed from doze/src/org/lineageos/settings/doze/Utils.java)4
-rw-r--r--doze/src/org/lineageos/settings/doze/ProximitySensor.java10
-rw-r--r--doze/src/org/lineageos/settings/doze/TiltSensor.java6
10 files changed, 53 insertions, 118 deletions
diff --git a/doze/AndroidManifest.xml b/doze/AndroidManifest.xml
index 62d87f3..72581c2 100644
--- a/doze/AndroidManifest.xml
+++ b/doze/AndroidManifest.xml
@@ -48,7 +48,7 @@
<activity
android:name=".DozeSettingsActivity"
android:label="@string/ambient_display_title"
- android:theme="@style/Theme.Main">
+ android:theme="@style/Theme.SubSettingsBase">
<intent-filter>
<action android:name="org.lineageos.settings.device.DOZE_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
diff --git a/doze/res/layout/doze.xml b/doze/res/layout/doze.xml
deleted file mode 100644
index 941cdf6..0000000
--- a/doze/res/layout/doze.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2014, The Android Open Source 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.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_height="match_parent"
- android:layout_width="match_parent">
-
- <include layout="@layout/switch_bar" />
-
-</LinearLayout>
-
diff --git a/doze/res/xml/doze_settings.xml b/doze/res/xml/doze_settings.xml
index fe4fa0a..72823dc 100644
--- a/doze/res/xml/doze_settings.xml
+++ b/doze/res/xml/doze_settings.xml
@@ -15,7 +15,14 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/ambient_display_title">
+
+ <com.android.settingslib.widget.MainSwitchPreference
+ android:defaultValue="false"
+ android:key="doze_enable"
+ android:title="@string/ambient_display_enable_title" />
<PreferenceCategory
android:key="tilt_sensor"
diff --git a/doze/src/org/lineageos/settings/doze/BootCompletedReceiver.java b/doze/src/org/lineageos/settings/doze/BootCompletedReceiver.java
index 20a27c2..f894a9b 100644
--- a/doze/src/org/lineageos/settings/doze/BootCompletedReceiver.java
+++ b/doze/src/org/lineageos/settings/doze/BootCompletedReceiver.java
@@ -30,6 +30,6 @@ public class BootCompletedReceiver extends BroadcastReceiver {
@Override
public void onReceive(final Context context, Intent intent) {
if (DEBUG) Log.d(TAG, "Received boot completed intent");
- Utils.checkDozeService(context);
+ DozeUtils.checkDozeService(context);
}
}
diff --git a/doze/src/org/lineageos/settings/doze/DozeService.java b/doze/src/org/lineageos/settings/doze/DozeService.java
index 5b161e2..581397f 100644
--- a/doze/src/org/lineageos/settings/doze/DozeService.java
+++ b/doze/src/org/lineageos/settings/doze/DozeService.java
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2015 The CyanogenMod Project
- * 2017-2018 The LineageOS Project
+ * 2017-2018,2021 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.
@@ -38,7 +38,8 @@ public class DozeService extends Service {
mProximitySensor = new ProximitySensor(this);
mTiltSensor = new TiltSensor(this);
- IntentFilter screenStateFilter = new IntentFilter(Intent.ACTION_SCREEN_ON);
+ IntentFilter screenStateFilter = new IntentFilter();
+ screenStateFilter.addAction(Intent.ACTION_SCREEN_ON);
screenStateFilter.addAction(Intent.ACTION_SCREEN_OFF);
registerReceiver(mScreenStateReceiver, screenStateFilter);
}
@@ -65,22 +66,22 @@ public class DozeService extends Service {
private void onDisplayOn() {
if (DEBUG) Log.d(TAG, "Display on");
- if (Utils.isPickUpEnabled(this)) {
+ if (DozeUtils.isPickUpEnabled(this)) {
mTiltSensor.disable();
}
- if (Utils.isHandwaveGestureEnabled(this) ||
- Utils.isPocketGestureEnabled(this)) {
+ if (DozeUtils.isHandwaveGestureEnabled(this) ||
+ DozeUtils.isPocketGestureEnabled(this)) {
mProximitySensor.disable();
}
}
private void onDisplayOff() {
if (DEBUG) Log.d(TAG, "Display off");
- if (Utils.isPickUpEnabled(this)) {
+ if (DozeUtils.isPickUpEnabled(this)) {
mTiltSensor.enable();
}
- if (Utils.isHandwaveGestureEnabled(this) ||
- Utils.isPocketGestureEnabled(this)) {
+ if (DozeUtils.isHandwaveGestureEnabled(this) ||
+ DozeUtils.isPocketGestureEnabled(this)) {
mProximitySensor.enable();
}
}
diff --git a/doze/src/org/lineageos/settings/doze/DozeSettingsActivity.java b/doze/src/org/lineageos/settings/doze/DozeSettingsActivity.java
index 1591b2c..213f0b4 100644
--- a/doze/src/org/lineageos/settings/doze/DozeSettingsActivity.java
+++ b/doze/src/org/lineageos/settings/doze/DozeSettingsActivity.java
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2015-2016 The CyanogenMod Project
- * 2017 The LineageOS Project
+ * 2017,2021 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.
@@ -18,9 +18,11 @@
package org.lineageos.settings.doze;
import android.os.Bundle;
-import android.preference.PreferenceActivity;
-public class DozeSettingsActivity extends PreferenceActivity {
+import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
+import com.android.settingslib.collapsingtoolbar.R;
+
+public class DozeSettingsActivity extends CollapsingToolbarBaseActivity {
private static final String TAG_DOZE = "doze";
@@ -28,7 +30,7 @@ public class DozeSettingsActivity extends PreferenceActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- getFragmentManager().beginTransaction().replace(android.R.id.content,
+ getFragmentManager().beginTransaction().replace(R.id.content_frame,
new DozeSettingsFragment(), TAG_DOZE).commit();
}
}
diff --git a/doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java b/doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java
index 4701eff..c02aee8 100644
--- a/doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java
+++ b/doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2015 The CyanogenMod Project
- * 2017-2019 The LineageOS Project
+ * 2017-2022 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.
@@ -17,7 +17,6 @@
package org.lineageos.settings.doze;
-import android.app.ActionBar;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
@@ -27,24 +26,19 @@ 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;
-public class DozeSettingsFragment extends PreferenceFragment implements OnPreferenceChangeListener,
- CompoundButton.OnCheckedChangeListener {
+import com.android.settingslib.widget.MainSwitchPreference;
+import com.android.settingslib.widget.OnMainSwitchChangeListener;
- private TextView mTextView;
- private View mSwitchBar;
+public class DozeSettingsFragment extends PreferenceFragment implements
+ Preference.OnPreferenceChangeListener, OnMainSwitchChangeListener {
+
+ private MainSwitchPreference mSwitchBar;
private SwitchPreference mPickUpPreference;
private SwitchPreference mHandwavePreference;
@@ -55,8 +49,6 @@ public class DozeSettingsFragment extends PreferenceFragment implements OnPrefer
@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);
@@ -64,88 +56,49 @@ public class DozeSettingsFragment extends PreferenceFragment implements OnPrefer
showHelp();
}
- boolean dozeEnabled = Utils.isDozeEnabled(getActivity());
+ boolean dozeEnabled = DozeUtils.isDozeEnabled(getActivity());
PreferenceCategory proximitySensorCategory =
- (PreferenceCategory) getPreferenceScreen().findPreference(Utils.CATEG_PROX_SENSOR);
+ (PreferenceCategory) getPreferenceScreen().findPreference(DozeUtils.CATEG_PROX_SENSOR);
- mPickUpPreference = (SwitchPreference) findPreference(Utils.GESTURE_PICK_UP_KEY);
+ mPickUpPreference = (SwitchPreference) findPreference(DozeUtils.GESTURE_PICK_UP_KEY);
mPickUpPreference.setEnabled(dozeEnabled);
mPickUpPreference.setOnPreferenceChangeListener(this);
- mHandwavePreference = (SwitchPreference) findPreference(Utils.GESTURE_HAND_WAVE_KEY);
+ mHandwavePreference = (SwitchPreference) findPreference(DozeUtils.GESTURE_HAND_WAVE_KEY);
mHandwavePreference.setEnabled(dozeEnabled);
mHandwavePreference.setOnPreferenceChangeListener(this);
- mPocketPreference = (SwitchPreference) findPreference(Utils.GESTURE_POCKET_KEY);
+ 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 (!Utils.getProxCheckBeforePulse(getActivity())) {
+ if (!DozeUtils.getProxCheckBeforePulse(getActivity())) {
getPreferenceScreen().removePreference(proximitySensorCategory);
}
}
@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 = Utils.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) {
- mHandler.post(() -> Utils.checkDozeService(getActivity()));
+ mHandler.post(() -> DozeUtils.checkDozeService(getActivity()));
return true;
}
@Override
- public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {
- Utils.enableDoze(getActivity(), isChecked);
- Utils.checkDozeService(getActivity());
+ public void onSwitchChanged(Switch switchView, 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);
+ mSwitchBar.setChecked(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) {
diff --git a/doze/src/org/lineageos/settings/doze/Utils.java b/doze/src/org/lineageos/settings/doze/DozeUtils.java
index 987e06a..62dce44 100644
--- a/doze/src/org/lineageos/settings/doze/Utils.java
+++ b/doze/src/org/lineageos/settings/doze/DozeUtils.java
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2015 The CyanogenMod Project
- * 2017-2019 The LineageOS Project
+ * 2017-2022 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.
@@ -27,7 +27,7 @@ import androidx.preference.PreferenceManager;
import static android.provider.Settings.Secure.DOZE_ENABLED;
-public final class Utils {
+public final class DozeUtils {
private static final String TAG = "DozeUtils";
private static final boolean DEBUG = false;
diff --git a/doze/src/org/lineageos/settings/doze/ProximitySensor.java b/doze/src/org/lineageos/settings/doze/ProximitySensor.java
index 71594ff..b1de348 100644
--- a/doze/src/org/lineageos/settings/doze/ProximitySensor.java
+++ b/doze/src/org/lineageos/settings/doze/ProximitySensor.java
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2015 The CyanogenMod Project
- * 2017-2018 The LineageOS Project
+ * 2017-2018,2021 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.
@@ -63,7 +63,7 @@ public class ProximitySensor implements SensorEventListener {
boolean isNear = event.values[0] < mSensor.getMaximumRange();
if (mSawNear && !isNear) {
if (shouldPulse(event.timestamp)) {
- Utils.launchDozePulse(mContext);
+ DozeUtils.launchDozePulse(mContext);
}
} else {
mInPocketTime = event.timestamp;
@@ -74,11 +74,11 @@ public class ProximitySensor implements SensorEventListener {
private boolean shouldPulse(long timestamp) {
long delta = timestamp - mInPocketTime;
- if (Utils.isHandwaveGestureEnabled(mContext) && Utils.isPocketGestureEnabled(mContext)) {
+ if (DozeUtils.isHandwaveGestureEnabled(mContext) && DozeUtils.isPocketGestureEnabled(mContext)) {
return true;
- } else if (Utils.isHandwaveGestureEnabled(mContext)) {
+ } else if (DozeUtils.isHandwaveGestureEnabled(mContext)) {
return delta < HANDWAVE_MAX_DELTA_NS;
- } else if (Utils.isPocketGestureEnabled(mContext)) {
+ } else if (DozeUtils.isPocketGestureEnabled(mContext)) {
return delta >= POCKET_MIN_DELTA_NS;
}
return false;
diff --git a/doze/src/org/lineageos/settings/doze/TiltSensor.java b/doze/src/org/lineageos/settings/doze/TiltSensor.java
index 6598127..768eb92 100644
--- a/doze/src/org/lineageos/settings/doze/TiltSensor.java
+++ b/doze/src/org/lineageos/settings/doze/TiltSensor.java
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2015 The CyanogenMod Project
- * 2017-2018 The LineageOS Project
+ * Copyright (C) 2015 The CyanogenMod Project
+ * 2017-2018,2021 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.
@@ -67,7 +67,7 @@ public class TiltSensor implements SensorEventListener {
}
if (event.values[0] == 1) {
- Utils.launchDozePulse(mContext);
+ DozeUtils.launchDozePulse(mContext);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-19 19:02:05 +0000