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

Commit 1351e761 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Show suppression msg under ringer slider" into pi-dev 

am: 68f331d4

Change-Id: I0715773ec67f5f0cb18dd23a1cadf42ccc43a9d7
parents 6038bc72 68f331d4

res/layout/preference_volume_slider.xml

+4 −2
Original line number Diff line number Diff line
@@ -72,9 +72,10 @@ 
                android:orientation="vertical"/>

        </LinearLayout>



        <FrameLayout

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:layout_marginTop="6dp">



            <SeekBar
@@ -93,10 +94,11 @@ 
                android:textAlignment="viewStart"

                android:singleLine="true"

                android:ellipsize="end"

                android:visibility="gone"

                android:textAppearance="@android:style/TextAppearance.Material.Body1"

                android:textColor="?android:attr/textColorSecondary"/>



        </FrameLayout>

        </LinearLayout>

    </LinearLayout>



</LinearLayout>

src/com/android/settings/notification/RingVolumePreferenceController.java

+9 −5
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
package com.android.settings.notification;



import android.app.NotificationManager;

import android.arch.lifecycle.LifecycleObserver;

import android.arch.lifecycle.OnLifecycleEvent;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.Context;
@@ -31,6 +33,7 @@ import android.os.Vibrator; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.settings.R;

import com.android.settings.Utils;

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



import java.util.Objects;
@@ -58,6 +61,7 @@ public class RingVolumePreferenceController extends VolumeSeekBarPreferenceContr 
        updateRingerMode();

    }



    @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)

    @Override

    public void onResume() {

        super.onResume();
@@ -66,6 +70,7 @@ public class RingVolumePreferenceController extends VolumeSeekBarPreferenceContr 
        updatePreferenceIcon();

    }



    @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)

    @Override

    public void onPause() {

        super.onPause();
@@ -118,9 +123,8 @@ public class RingVolumePreferenceController extends VolumeSeekBarPreferenceContr 


    private void updatePreferenceIcon() {

        if (mPreference != null) {

            mPreference.showIcon(mSuppressor != null

                ? com.android.internal.R.drawable.ic_audio_ring_notif_mute

                : mRingerMode == AudioManager.RINGER_MODE_VIBRATE || wasRingerModeVibrate()

            mPreference.showIcon(

                    mRingerMode == AudioManager.RINGER_MODE_VIBRATE || wasRingerModeVibrate()

                            ? com.android.internal.R.drawable.ic_audio_ring_notif_vibrate

                            : com.android.internal.R.drawable.ic_audio_ring_notif);

        }

src/com/android/settings/notification/SoundSettings.java

+10 −4
Original line number Diff line number Diff line
@@ -146,10 +146,16 @@ public class SoundSettings extends DashboardFragment { 
    @Override

    public void onAttach(Context context) {

        super.onAttach(context);

        use(AlarmVolumePreferenceController.class).setCallback(mVolumeCallback);

        use(MediaVolumePreferenceController.class).setCallback(mVolumeCallback);

        use(RingVolumePreferenceController.class).setCallback(mVolumeCallback);

        use(NotificationVolumePreferenceController.class).setCallback(mVolumeCallback);

        ArrayList<VolumeSeekBarPreferenceController> volumeControllers = new ArrayList<>();

        volumeControllers.add(use(AlarmVolumePreferenceController.class));

        volumeControllers.add(use(MediaVolumePreferenceController.class));

        volumeControllers.add(use(RingVolumePreferenceController.class));

        volumeControllers.add(use(NotificationVolumePreferenceController.class));



        for (VolumeSeekBarPreferenceController controller : volumeControllers) {

            controller.setCallback(mVolumeCallback);

            getLifecycle().addObserver(controller);

        }

    }



    // === Volumes ===

src/com/android/settings/notification/VolumeSeekBarPreference.java

+1 −2
Original line number Diff line number Diff line
@@ -196,8 +196,7 @@ public class VolumeSeekBarPreference extends SeekBarPreference { 
        if (mSuppressionTextView != null && mSeekBar != null) {

            mSuppressionTextView.setText(mSuppressionText);

            final boolean showSuppression = !TextUtils.isEmpty(mSuppressionText);

            mSuppressionTextView.setVisibility(showSuppression ? View.VISIBLE : View.INVISIBLE);

            mSeekBar.setVisibility(showSuppression ? View.INVISIBLE : View.VISIBLE);

            mSuppressionTextView.setVisibility(showSuppression ? View.VISIBLE : View.GONE);

        }

    }