Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1fd6dc5 authored by Beverly's avatar Beverly
Browse files

Use inline radio buttons for Prevent Ringing 

Test: atest PreventRingingGesturePreferenceControllerTest
Fixes: 79867902

Change-Id: I3c9f949e038bba98e5be972adc01f35f5513432a
parent 201f1f61

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -10064,7 +10064,7 @@ 
    <!-- Title for prevent ringing gesture screen -->

    <string name="gesture_prevent_ringing_screen_title">Prevent ringing</string>

    <!-- Title for prevent ringing setting -->

    <string name="gesture_prevent_ringing_title">Press Power &amp; Volume Up together</string>

    <string name="gesture_prevent_ringing_title">Press Power &amp; Volume Up together to</string>

    <!-- Title for prevent ringing setting -->

    <string name="gesture_prevent_ringing_sound_title">Shortcut to prevent ringing</string>

    <!-- Option for prevent ringing setting -->

res/xml/prevent_ringing_gesture_settings.xml

+4 −9
Original line number Diff line number Diff line
@@ -26,13 +26,8 @@ 
        app:animation="@raw/gesture_prevent_ringing"

        app:preview="@drawable/gesture_prevent_ringing" />



    <ListPreference

        android:key="gesture_prevent_ringing"

        android:title="@string/gesture_prevent_ringing_title"

        android:entries="@array/gesture_prevent_ringing_entries"

        android:entryValues="@array/gesture_prevent_ringing_values"

        app:controller="com.android.settings.gestures.PreventRingingPreferenceController"

        app:keywords="@string/keywords_gesture"

        app:allowDividerAbove="true" />



    <PreferenceCategory

        android:key="gesture_prevent_ringing_category"

        android:title="@string/gesture_prevent_ringing_title">

    </PreferenceCategory>

</PreferenceScreen>
 
 No newline at end of file

src/com/android/settings/gestures/GesturesSettingPreferenceController.java

+3 −3
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ import android.content.ContentResolver; 
import android.content.Context;

import android.provider.Settings;



import androidx.annotation.NonNull;



import com.android.internal.hardware.AmbientDisplayConfiguration;

import com.android.settings.R;

import com.android.settings.core.BasePreferenceController;
@@ -31,6 +29,8 @@ import com.android.settingslib.core.AbstractPreferenceController; 
import java.util.ArrayList;

import java.util.List;



import androidx.annotation.NonNull;



public class GesturesSettingPreferenceController extends BasePreferenceController {

    private final AssistGestureFeatureProvider mFeatureProvider;

    private List<AbstractPreferenceController> mGestureControllers;
@@ -76,7 +76,7 @@ public class GesturesSettingPreferenceController extends BasePreferenceControlle 
                .setConfig(ambientDisplayConfiguration));

        controllers.add(new DoubleTapScreenPreferenceController(context, FAKE_PREF_KEY)

                .setConfig(ambientDisplayConfiguration));

        controllers.add(new PreventRingingPreferenceController(context, FAKE_PREF_KEY));

        controllers.add(new PreventRingingParentPreferenceController(context, FAKE_PREF_KEY));

        return controllers;

    }

src/com/android/settings/gestures/PreventRingingGesturePreferenceController.java

0 → 100644
+222 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 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.

 */



package com.android.settings.gestures;



import android.content.ContentResolver;

import android.content.Context;

import android.database.ContentObserver;

import android.net.Uri;

import android.os.Bundle;

import android.os.Handler;

import android.provider.Settings;



import com.android.internal.annotations.VisibleForTesting;

import com.android.settings.R;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.widget.RadioButtonPreference;

import com.android.settings.widget.VideoPreference;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.core.lifecycle.Lifecycle;

import com.android.settingslib.core.lifecycle.LifecycleObserver;

import com.android.settingslib.core.lifecycle.events.OnCreate;

import com.android.settingslib.core.lifecycle.events.OnPause;

import com.android.settingslib.core.lifecycle.events.OnResume;

import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;



import androidx.preference.Preference;

import androidx.preference.PreferenceCategory;

import androidx.preference.PreferenceScreen;



public class PreventRingingGesturePreferenceController extends AbstractPreferenceController

        implements RadioButtonPreference.OnClickListener, LifecycleObserver, OnSaveInstanceState,

        OnResume, OnPause, OnCreate, PreferenceControllerMixin {



    @VisibleForTesting static final String KEY_VIBRATE = "prevent_ringing_option_vibrate";

    @VisibleForTesting static final String KEY_NONE = "prevent_ringing_option_none";

    @VisibleForTesting static final String KEY_MUTE = "prevent_ringing_option_mute";



    private final String KEY_VIDEO_PAUSED = "key_video_paused";

    private final String PREF_KEY_VIDEO = "gesture_prevent_ringing_video";

    private final String KEY = "gesture_prevent_ringing_category";

    private final Context mContext;



    private VideoPreference mVideoPreference;

    private boolean mVideoPaused;



    private PreferenceCategory mPreferenceCategory;

    @VisibleForTesting RadioButtonPreference mVibratePref;

    @VisibleForTesting RadioButtonPreference mNonePref;

    @VisibleForTesting RadioButtonPreference mMutePref;



    private SettingObserver mSettingObserver;



    public PreventRingingGesturePreferenceController(Context context, Lifecycle lifecycle) {

        super(context);

        mContext = context;



        if (lifecycle != null) {

            lifecycle.addObserver(this);

        }

    }



    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        if (isAvailable()) {

            mPreferenceCategory = (PreferenceCategory) screen.findPreference(getPreferenceKey());

            mVibratePref = makeRadioPreference(KEY_VIBRATE, R.string.prevent_ringing_option_vibrate);

            mMutePref = makeRadioPreference(KEY_MUTE, R.string.prevent_ringing_option_mute);

            mNonePref = makeRadioPreference(KEY_NONE, R.string.prevent_ringing_option_none);



            if (mPreferenceCategory != null) {

                mSettingObserver = new SettingObserver(mPreferenceCategory);

            }



            mVideoPreference = (VideoPreference) screen.findPreference(getVideoPrefKey());

        }

    }



    @Override

    public boolean isAvailable() {

        return mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_volumeHushGestureEnabled);

    }



    @Override

    public String getPreferenceKey() {

        return KEY;

    }



    public String getVideoPrefKey() {

        return PREF_KEY_VIDEO;

    }



    @Override

    public void onSaveInstanceState(Bundle outState) {

        outState.putBoolean(KEY_VIDEO_PAUSED, mVideoPaused);

    }



    @Override

    public void onRadioButtonClicked(RadioButtonPreference preference) {

        int preventRingingSetting = keyToSetting(preference.getKey());

        if (preventRingingSetting != Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.VOLUME_HUSH_GESTURE, Settings.Secure.VOLUME_HUSH_VIBRATE)) {

            Settings.Secure.putInt(mContext.getContentResolver(),

                    Settings.Secure.VOLUME_HUSH_GESTURE, preventRingingSetting);

        }

    }



    @Override

    public void updateState(Preference preference) {

        int preventRingingSetting = Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.VOLUME_HUSH_GESTURE, Settings.Secure.VOLUME_HUSH_VIBRATE);



        final boolean isVibrate = preventRingingSetting == Settings.Secure.VOLUME_HUSH_VIBRATE;

        final boolean isMute = preventRingingSetting == Settings.Secure.VOLUME_HUSH_MUTE;

        final boolean isOff = preventRingingSetting == Settings.Secure.VOLUME_HUSH_OFF

                || (!isVibrate && !isMute);

        if (mVibratePref != null && mVibratePref.isChecked() != isVibrate) {

            mVibratePref.setChecked(isVibrate);

        }

        if (mMutePref != null && mMutePref.isChecked() != isMute) {

            mMutePref.setChecked(isMute);

        }

        if (mNonePref != null && mNonePref.isChecked() != isOff) {

            mNonePref.setChecked(isOff);

        }

    }



    @Override

    public void onCreate(Bundle savedInstanceState) {

        if (savedInstanceState != null) {

            mVideoPaused = savedInstanceState.getBoolean(KEY_VIDEO_PAUSED, false);

        }

    }



    @Override

    public void onResume() {

        if (mSettingObserver != null) {

            mSettingObserver.register(mContext.getContentResolver());

            mSettingObserver.onChange(false, null);

        }



        if (mVideoPreference != null) {

            mVideoPreference.onViewVisible(mVideoPaused);

        }

    }



    @Override

    public void onPause() {

        if (mSettingObserver != null) {

            mSettingObserver.unregister(mContext.getContentResolver());

        }



        if (mVideoPreference != null) {

            mVideoPaused = mVideoPreference.isVideoPaused();

            mVideoPreference.onViewInvisible();

        }

    }



    private int keyToSetting(String key) {

        switch (key) {

            case KEY_NONE:

                return Settings.Secure.VOLUME_HUSH_OFF;

            case KEY_MUTE:

                return Settings.Secure.VOLUME_HUSH_MUTE;

            case KEY_VIBRATE:

            default:

                return Settings.Secure.VOLUME_HUSH_VIBRATE;

        }

    }



    private RadioButtonPreference makeRadioPreference(String key, int titleId) {

        RadioButtonPreference pref = new RadioButtonPreference(mPreferenceCategory.getContext());

        pref.setKey(key);

        pref.setTitle(titleId);

        pref.setOnClickListener(this);

        mPreferenceCategory.addPreference(pref);

        return pref;

    }



    private class SettingObserver extends ContentObserver {

        private final Uri VOLUME_HUSH_GESTURE = Settings.Secure.getUriFor(

                Settings.Secure.VOLUME_HUSH_GESTURE);



        private final Preference mPreference;



        public SettingObserver(Preference preference) {

            super(new Handler());

            mPreference = preference;

        }



        public void register(ContentResolver cr) {

            cr.registerContentObserver(VOLUME_HUSH_GESTURE, false, this);

        }



        public void unregister(ContentResolver cr) {

            cr.unregisterContentObserver(this);

        }



        @Override

        public void onChange(boolean selfChange, Uri uri) {

            super.onChange(selfChange, uri);

            if (uri == null || VOLUME_HUSH_GESTURE.equals(uri)) {

                updateState(mPreference);

            }

        }

    }

}

src/com/android/settings/gestures/PreventRingingGestureSettings.java

+21 −0
Original line number Diff line number Diff line
@@ -23,8 +23,11 @@ import com.android.internal.logging.nano.MetricsProto; 
import com.android.settings.R;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.core.lifecycle.Lifecycle;

import com.android.settingslib.search.SearchIndexable;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;
@@ -39,6 +42,18 @@ public class PreventRingingGestureSettings extends DashboardFragment { 
        super.onAttach(context);

    }



    @Override

    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {

        return buildPreferenceControllers(context, getSettingsLifecycle());

    }



    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,

            Lifecycle lifecycle) {

        List<AbstractPreferenceController> controllers = new ArrayList<>();

        controllers.add(new PreventRingingGesturePreferenceController(context, lifecycle));

        return controllers;

    }



    @Override

    public int getMetricsCategory() {

        return MetricsProto.MetricsEvent.SETTINGS_PREVENT_RINGING;
@@ -68,6 +83,12 @@ public class PreventRingingGestureSettings extends DashboardFragment { 
                    sir.xmlResId = R.xml.prevent_ringing_gesture_settings;

                    return Arrays.asList(sir);

                }



                @Override

                public List<AbstractPreferenceController> createPreferenceControllers(

                        Context context) {

                    return buildPreferenceControllers(context, null);

                }

            };



}