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

Commit 752350c8 authored by Fan Zhang's avatar Fan Zhang
Browse files

Suppress prevent ringer gesture parent page in search. 

The full page verion of prevent ringing is still searchable.

- Created a new controller for parent entry.
- On the child controller, inherit the same getAvailabilityStatus() but
  override AVILABLE_UNSEARCHABLE to AVAILABLE so it becomes searchable.

Fixes: 72748524
Test: existing robotests for PreventRingingPreferenceController

Change-Id: Id2454db110c81b59fa4a98338602b03de0812f8a
parent 60f2f068

res/xml/gestures.xml

+1 −1
Original line number Diff line number Diff line
@@ -67,6 +67,6 @@ 
        android:key="gesture_prevent_ringing_summary"

        android:title="@string/gesture_prevent_ringing_screen_title"

        android:fragment="com.android.settings.gestures.PreventRingingGestureSettings"

        settings:controller="com.android.settings.gestures.PreventRingingPreferenceController" />

        settings:controller="com.android.settings.gestures.PreventRingingParentPreferenceController" />



</PreferenceScreen>

res/xml/sound_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ 
        android:title="@string/gesture_prevent_ringing_sound_title"

        android:order="-110"

        android:fragment="com.android.settings.gestures.PreventRingingGestureSettings"

        settings:controller="com.android.settings.gestures.PreventRingingPreferenceController" />

        settings:controller="com.android.settings.gestures.PreventRingingParentPreferenceController" />



    <!-- Phone ringtone -->

    <com.android.settings.DefaultRingtonePreference

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

0 → 100644
+36 −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.Context;



import com.android.settings.core.BasePreferenceController;



public class PreventRingingParentPreferenceController extends BasePreferenceController {



    public PreventRingingParentPreferenceController(Context context, String preferenceKey) {

        super(context, preferenceKey);

    }



    @Override

    public int getAvailabilityStatus() {

        return mContext.getResources().getBoolean(

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

                ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;

    }



}

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

+12 −11
Original line number Diff line number Diff line
@@ -24,14 +24,8 @@ import static android.provider.Settings.Secure.VOLUME_HUSH_VIBRATE; 
import android.content.Context;

import android.os.Bundle;

import android.provider.Settings;

import androidx.annotation.VisibleForTesting;

import androidx.preference.ListPreference;

import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.widget.VideoPreference;

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

import com.android.settingslib.core.lifecycle.events.OnCreate;
@@ -39,8 +33,13 @@ import com.android.settingslib.core.lifecycle.events.OnPause; 
import com.android.settingslib.core.lifecycle.events.OnResume;

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



public class PreventRingingPreferenceController extends BasePreferenceController

        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,

import androidx.annotation.VisibleForTesting;

import androidx.preference.ListPreference;

import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;



public class PreventRingingPreferenceController extends PreventRingingParentPreferenceController

        implements Preference.OnPreferenceChangeListener,

        LifecycleObserver, OnResume, OnPause, OnCreate, OnSaveInstanceState {



    private static final String PREF_KEY_VIDEO = "gesture_prevent_ringing_video";
@@ -59,9 +58,11 @@ public class PreventRingingPreferenceController extends BasePreferenceController 


    @Override

    public int getAvailabilityStatus() {

        return mContext.getResources().getBoolean(

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

                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;

        final int status = super.getAvailabilityStatus();

        if (status == AVAILABLE_UNSEARCHABLE) {

            return AVAILABLE;

        }

        return status;

    }



    @Override

tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java

0 → 100644
+69 −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 static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;

import static com.google.common.truth.Truth.assertThat;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.when;



import android.content.Context;

import android.content.res.Resources;



import com.android.settings.testutils.SettingsRobolectricTestRunner;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RuntimeEnvironment;



@RunWith(SettingsRobolectricTestRunner.class)

public class PreventRingingParentPreferenceControllerTest {



    @Mock

    private Resources mResources;



    private Context mContext;

    private PreventRingingParentPreferenceController mController;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mContext = spy(RuntimeEnvironment.application);

        when(mContext.getResources()).thenReturn(mResources);



        mController = new PreventRingingParentPreferenceController(mContext, "test_key");

    }



    @Test

    public void testIsAvailable_configIsTrue_shouldAvailableUnSearchable() {

        when(mResources.getBoolean(

                com.android.internal.R.bool.config_volumeHushGestureEnabled)).thenReturn(true);



        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);

    }



    @Test

    public void testIsAvailable_configIsFalse_shouldReturnFalse() {

        when(mResources.getBoolean(

                com.android.internal.R.bool.config_volumeHushGestureEnabled)).thenReturn(false);



        assertThat(mController.isAvailable()).isFalse();

    }

}