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

Commit 9b65f813 authored by Danny Baumann's avatar Danny Baumann Committed by Michael Bestas
Browse files

Settings: Add back increasing ring feature (2/3). 

This is a squash of the following commits:

Author: Danny Baumann <dannybaumann@web.de>
Date:   Tue Nov 11 13:14:07 2014 +0100

    Add back increasing ring feature (2/3).

    Change-Id: Iafc79a57651db327a100e0f1723b62f442b638be

Author: Danny Baumann <dannybaumann@web.de>
Date:   Mon Nov 24 13:05:39 2014 +0100

    Fix NPE.

    When entering the notification prefs sub activity without the increasing
    ring pref being visible and leaving it right away, onActivityStop()
    threw an NPE because the handler wasn't yet constructed.

    Change-Id: Ia4291d8ac3d1dbf76d432db7e0e973844163c4ae

Author: Danny Baumann <dannybaumann@web.de>
Date:   Fri May 29 08:48:46 2015 +0200

    Fix up increasing ring tone volume preview behaviour.

    Change-Id: Ibe7fdf1ee7f0aa1c7c76052df69fa92e8b6a2ffd

Author: Keith Mok <kmok@cyngn.com>
Date:   Tue Jul 12 09:45:45 2016 -0700

    Settings: Always set ramp-up time value during bindView

    onProgressChange is not always called if we set the
    ramp up time to 5 sec (0 in seekbar value, since it is
    the default value, no change).
    Causing the text showing the ramp up time text value not
    updated and display as empty when user enable/disable
    increasing ring volume with ramp up time set to 5 sec.

    FEIJ-1572

    Change-Id: Id32d6b51aab05e80be59bc1912c4ae7c5d114ac5

Author: Zhao Wei Liew <zhaoweiliew@gmail.com>
Date:   Wed, 18 Jan 2017 15:55:13 +0800

    Move notif volume pref on top of increasing ring pref

    Change Iafc79a57651db327a100e0f1723b62f442b638be added two
    increasing ringtone-related preferences between the notification
    volume preference and the ring volume preference.

    However, the notification volume preference should be grouped
    together with the media, alarm, and ring volume preferences.

    Hence, move the notification volume preference back to where
    it should be.

    Change-Id: I138e6f78b6c231643d86746858e0cbdfcb0942eb

Author: Bruno Martins <bgcngm@gmail.com>
Date:   Mon Dec 11 23:45:39 2017 +0000

    Adapt increasing ring feature to O-MR1 and new Settings UI

     * Make it depend on SettingsLib's version of Lifecycle and Mixin.

     * Create a custom style for the IncreasingRingtonePreference
       and match the new UI in Oreo Settings app.

    Change-Id: I25462159fa39f5cdaddb1898c71f536572e900a4

Change-Id: I3f22c77504a5014f9dbd40909d760149143570fe
parent 5c0944d7

res/color/audio_icon.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

-->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_enabled="false" android:color="#24000000" />

    <item android:color="#8a000000" />

</selector>

res/drawable/ring_notif_increasing.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2014 The CyanogenMod Project

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

     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.

-->



<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:tint="?android:attr/colorControlNormal"

    android:viewportWidth="24"

    android:viewportHeight="24">



    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M12,22c1.105,0,2-0.898,2-2h-4C10,21.102,10.896,22,12,22Z M18.5,16v-5.5c0-3.075-2.135-5.643-5-6.321V3.5 C13.5,2.67,12.828,2,12,2s-1.5,0.67-1.5,1.5v0.679c-2.865,0.678-5,3.246-5,6.321V16l-2,2v1h17v-1L18.5,16z M16.504,14.558H7.561  V13.25l8.943-3.808V14.558z" />

</vector>

res/layout/preference_increasing_ring.xml

0 → 100644
+120 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2014 The CyanogenMod 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:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeightSmall"

    android:gravity="center_vertical"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:background="?android:attr/selectableItemBackground"

    android:clipToPadding="false">



    <LinearLayout

        android:id="@+id/icon_container"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:minWidth="44dp"

        android:gravity="start|center_vertical"

        android:orientation="horizontal"

        android:paddingEnd="12dp"

        android:paddingTop="4dp"

        android:paddingBottom="4dp">

        <com.android.internal.widget.PreferenceImageView

            android:id="@android:id/icon"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:maxWidth="48dp"

            android:maxHeight="48dp"/>

    </LinearLayout>



    <RelativeLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:paddingTop="12dp"

        android:paddingBottom="12dp">



        <TextView android:id="@android:id/title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal" />



        <TextView android:id="@+id/start_volume_label"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_below="@android:id/title"

            android:layout_alignStart="@android:id/title"

            android:paddingStart="18dp"

            android:text="@string/increasing_ring_min_volume_title"

            android:textAppearance="?android:attr/textAppearanceSmall"

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

            android:singleLine="true" />



        <SeekBar android:id="@+id/start_volume"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_below="@id/start_volume_label"

            android:layout_alignParentEnd="true"

            android:max="1000" />



        <TextView android:id="@+id/ramp_up_time_label"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_below="@id/start_volume"

            android:layout_alignStart="@android:id/title"

            android:paddingStart="18dp"

            android:text="@string/increasing_ring_ramp_up_time_title"

            android:textAppearance="?android:attr/textAppearanceSmall"

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

            android:singleLine="true" />



        <TextView android:id="@+id/ramp_up_time_value"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_below="@id/start_volume"

            android:layout_toEndOf="@id/ramp_up_time_label"

            android:layout_alignBaseline="@id/ramp_up_time_label"

            android:layout_alignParentEnd="true"

            android:gravity="end"

            android:textAppearance="?android:attr/textAppearanceSmall"

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

            android:singleLine="true" />



        <SeekBar android:id="@+id/ramp_up_time"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_below="@id/ramp_up_time_label"

            android:layout_alignParentEnd="true"

            android:max="11" />



        <TextView android:id="@android:id/summary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_below="@id/ramp_up_time"

            android:layout_alignStart="@android:id/title"

            android:textAppearance="?android:attr/textAppearanceSmall"

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

            android:maxLines="4" />



    </RelativeLayout>



</LinearLayout>

res/values/cm_strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -73,4 +73,8 @@ 
    <string name="security_settings_fingerprint_sensor_location_left">left side</string>

    <string name="security_settings_fingerprint_sensor_location_right">right side</string>



    <!-- Increasing ring tone volume -->

    <string name="increasing_ring_volume_option_title">Increasing ring volume</string>

    <string name="increasing_ring_min_volume_title">Start volume</string>

    <string name="increasing_ring_ramp_up_time_title">Ramp-up time</string>

</resources>

res/values/lineage_attrs.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

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

     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.

-->



<resources>

    <attr name="customPreferenceStyle" format="reference" />

</resources>