aboutsummaryrefslogtreecommitdiff
path: root/doze
diff options
context:
space:
mode:
Diffstat (limited to 'doze')
-rw-r--r--doze/Android.bp1
-rw-r--r--doze/AndroidManifest.xml10
-rw-r--r--doze/res/xml/doze_settings.xml8
-rw-r--r--doze/src/org/lineageos/settings/doze/DozeSettingsActivity.java4
-rw-r--r--doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java59
5 files changed, 38 insertions, 44 deletions
diff --git a/doze/Android.bp b/doze/Android.bp
index 9a2d1e1..c819887 100644
--- a/doze/Android.bp
+++ b/doze/Android.bp
@@ -12,6 +12,7 @@ android_app {
certificate: "platform",
platform_apis: true,
privileged: true,
+ system_ext_specific: true,
static_libs: [
"org.lineageos.settings.resources",
diff --git a/doze/AndroidManifest.xml b/doze/AndroidManifest.xml
index 72581c2..abd1efa 100644
--- a/doze/AndroidManifest.xml
+++ b/doze/AndroidManifest.xml
@@ -26,15 +26,13 @@
<protected-broadcast android:name="com.android.systemui.doze.pulse" />
- <uses-sdk
- android:minSdkVersion="24"
- android:targetSdkVersion="24"/>
-
<application
android:label="@string/device_settings_app_name"
android:persistent="true">
- <receiver android:name=".BootCompletedReceiver">
+ <receiver
+ android:name=".BootCompletedReceiver"
+ android:exported="false">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
<category android:name="android.intent.category.DEFAULT" />
@@ -42,11 +40,13 @@
</receiver>
<service android:name=".DozeService"
+ android:exported="true"
android:permission="ZukDozeService">
</service>
<activity
android:name=".DozeSettingsActivity"
+ android:exported="false"
android:label="@string/ambient_display_title"
android:theme="@style/Theme.SubSettingsBase">
<intent-filter>
diff --git a/doze/res/xml/doze_settings.xml b/doze/res/xml/doze_settings.xml
index 72823dc..f955482 100644
--- a/doze/res/xml/doze_settings.xml
+++ b/doze/res/xml/doze_settings.xml
@@ -19,7 +19,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/ambient_display_title">
- <com.android.settingslib.widget.MainSwitchPreference
+ <com.android.settingslib.widget.MainSwitchPreferenceCompat
android:defaultValue="false"
android:key="doze_enable"
android:title="@string/ambient_display_enable_title" />
@@ -28,7 +28,7 @@
android:key="tilt_sensor"
android:title="@string/tilt_sensor_title">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="gesture_pick_up"
android:defaultValue="false"
android:title="@string/pick_up_gesture_title"
@@ -40,13 +40,13 @@
android:key="proximity_sensor"
android:title="@string/proximity_sensor_title">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="gesture_hand_wave"
android:defaultValue="false"
android:title="@string/hand_wave_gesture_title"
android:summary="@string/hand_wave_gesture_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="gesture_pocket"
android:defaultValue="false"
android:title="@string/pocket_gesture_title"
diff --git a/doze/src/org/lineageos/settings/doze/DozeSettingsActivity.java b/doze/src/org/lineageos/settings/doze/DozeSettingsActivity.java
index d684298..efc2376 100644
--- a/doze/src/org/lineageos/settings/doze/DozeSettingsActivity.java
+++ b/doze/src/org/lineageos/settings/doze/DozeSettingsActivity.java
@@ -20,7 +20,6 @@ package org.lineageos.settings.doze;
import android.os.Bundle;
import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
-import com.android.settingslib.widget.R;
public class DozeSettingsActivity extends CollapsingToolbarBaseActivity {
@@ -30,7 +29,8 @@ public class DozeSettingsActivity extends CollapsingToolbarBaseActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- getFragmentManager().beginTransaction().replace(R.id.content_frame,
+ getFragmentManager().beginTransaction().replace(
+ com.android.settingslib.collapsingtoolbar.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 c047eb1..ad3cb6f 100644
--- a/doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java
+++ b/doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java
@@ -26,23 +26,23 @@ import android.content.DialogInterface;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.os.Handler;
-import android.widget.Switch;
+import android.widget.CompoundButton;
+
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceFragment;
-import androidx.preference.SwitchPreference;
+import androidx.preference.SwitchPreferenceCompat;
import com.android.settingslib.widget.MainSwitchPreference;
-import com.android.settingslib.widget.OnMainSwitchChangeListener;
-public class DozeSettingsFragment extends PreferenceFragment implements
- Preference.OnPreferenceChangeListener, OnMainSwitchChangeListener {
+public class DozeSettingsFragment extends PreferenceFragment
+ implements CompoundButton.OnCheckedChangeListener, Preference.OnPreferenceChangeListener {
private MainSwitchPreference mSwitchBar;
- private SwitchPreference mPickUpPreference;
- private SwitchPreference mHandwavePreference;
- private SwitchPreference mPocketPreference;
+ private SwitchPreferenceCompat mPickUpPreference;
+ private SwitchPreferenceCompat mHandwavePreference;
+ private SwitchPreferenceCompat mPocketPreference;
private Handler mHandler = new Handler();
@@ -65,15 +65,15 @@ public class DozeSettingsFragment extends PreferenceFragment implements
PreferenceCategory proximitySensorCategory =
(PreferenceCategory) getPreferenceScreen().findPreference(DozeUtils.CATEG_PROX_SENSOR);
- mPickUpPreference = (SwitchPreference) findPreference(DozeUtils.GESTURE_PICK_UP_KEY);
+ mPickUpPreference = (SwitchPreferenceCompat) findPreference(DozeUtils.GESTURE_PICK_UP_KEY);
mPickUpPreference.setEnabled(dozeEnabled);
mPickUpPreference.setOnPreferenceChangeListener(this);
- mHandwavePreference = (SwitchPreference) findPreference(DozeUtils.GESTURE_HAND_WAVE_KEY);
+ mHandwavePreference = (SwitchPreferenceCompat) findPreference(DozeUtils.GESTURE_HAND_WAVE_KEY);
mHandwavePreference.setEnabled(dozeEnabled);
mHandwavePreference.setOnPreferenceChangeListener(this);
- mPocketPreference = (SwitchPreference) findPreference(DozeUtils.GESTURE_POCKET_KEY);
+ mPocketPreference = (SwitchPreferenceCompat) findPreference(DozeUtils.GESTURE_POCKET_KEY);
mPocketPreference.setEnabled(dozeEnabled);
mPocketPreference.setOnPreferenceChangeListener(this);
@@ -92,7 +92,7 @@ public class DozeSettingsFragment extends PreferenceFragment implements
}
@Override
- public void onSwitchChanged(Switch switchView, boolean isChecked) {
+ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
DozeUtils.enableDoze(getActivity(), isChecked);
DozeUtils.checkDozeService(getActivity());
@@ -103,27 +103,20 @@ public class DozeSettingsFragment extends PreferenceFragment implements
mPocketPreference.setEnabled(isChecked);
}
- 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");
+ AlertDialog helpDialog = new AlertDialog.Builder(getActivity())
+ .setTitle(R.string.doze_settings_help_title)
+ .setMessage(R.string.doze_settings_help_text)
+ .setPositiveButton(R.string.dialog_ok,
+ (dialog, which) -> {
+ getActivity()
+ .getSharedPreferences("doze_settings", Activity.MODE_PRIVATE)
+ .edit()
+ .putBoolean("first_help_shown", true)
+ .commit();
+ dialog.cancel();
+ })
+ .create();
+ helpDialog.show();
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-19 16:22:48 +0000