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

Commit 63b23865 authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Increasing ringtone volume option (2/3) 

Patchset 6 : Rebase
Patchset 7 : Rebase
Patchset 8 : Fixed SeekBar padding

Change-Id: I66870ece23ed471c685afd79a3e5efbe19678588
parent ab71ea2e

res/layout/preference_dialog_increasing_ring.xml

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

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

-->



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

        android:layout_width="match_parent"

        android:layout_height="match_parent">



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

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:orientation="vertical"

            android:gravity="center_horizontal"

            android:padding="10dip">



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

                android:layout_width="wrap_content"

                android:layout_height="wrap_content" />



        <CheckBox android:id="@+id/increasing_ring"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:text="@string/checkbox_increasing_ring"

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



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

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:text="@string/increasing_ring_min_volume_title" />



        <SeekBar android:id="@*android:id/seekbar"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:paddingTop="2dip"

                android:paddingLeft="14dip"

                android:paddingRight="14dip" />



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

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:text="@string/increasing_ring_volume_notice"

                android:paddingTop="8dip" />



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

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:text="@string/increasing_ring_interval_title"

                android:paddingTop="8dip" />



        <Spinner android:id="@+id/increasing_ring_interval"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:prompt="@string/increasing_ring_interval_title"

                android:entries="@array/increasing_ring_interval_entries"

                android:paddingTop="6dip"

                android:paddingBottom="6dip" />

    </LinearLayout>



</ScrollView>

res/values-de/strings.xml

+14 −0
Original line number Diff line number Diff line
@@ -2251,4 +2251,18 @@ ice shows the slider widgets before the unlock option [CHAR LIMIT=28]--> 
    <string name="stylus_icon_enabled_title">Stift-Symbol</string>

    <string name="stylus_icon_enabled_summary">Zeiger einblenden, wenn ein Stift verwendet wird</string>



    <string name="increasing_ring_title">Ansteigender Klingelton</string>

    <!-- Sound settings screen, the caption of the checkbox for making incoming calls increas in volume -->

    <string name="checkbox_increasing_ring">Aktivieren</string>

    <!-- Sound settings screen, the title of the volume bar to adjust the minimum increasing ring volume -->

    <string name="increasing_ring_min_volume_title">Anfangslautstärke</string>

    <string name="increasing_ring_volume_notice">Hinweis:\nDa die Anfangslautstärke größer als die Klingeltonlautstärke ist, wird der Klingelton mit der Klingeltonlautstärke abgespielt.</string>

    <string name="increasing_ring_interval_title">Erhöhungs-Intervall</string>

    <string name="increasing_ring_interval_eachring">Bei jedem Klingelton</string>

    <string name="increasing_ring_interval_half_second">0,5 Sekunden</string>

    <string name="increasing_ring_interval_1second">1 Sekunde</string>

    <string name="increasing_ring_interval_2seconds">2 Sekunden</string>

    <string name="increasing_ring_interval_3seconds">3 Sekunden</string>

    <string name="increasing_ring_interval_5seconds">5 Sekunden</string>

    <string name="increasing_ring_interval_10seconds">10 Sekunden</string>

</resources>

res/values/arrays.xml

+20 −0
Original line number Diff line number Diff line
@@ -1266,5 +1266,25 @@ 
        <item>86400</item>

    </string-array>



    <!-- **** CYANOGENMOD EDITS END **** -->

    <string-array name="increasing_ring_interval_entries" translatable="false">

        <item>@string/increasing_ring_interval_eachring</item>

        <item>@string/increasing_ring_interval_half_second</item>

        <item>@string/increasing_ring_interval_1second</item>

        <item>@string/increasing_ring_interval_2seconds</item>

        <item>@string/increasing_ring_interval_3seconds</item>

        <item>@string/increasing_ring_interval_5seconds</item>

        <item>@string/increasing_ring_interval_10seconds</item>

    </string-array>



    <integer-array name="increasing_ring_interval_values">

        <item>0</item>

        <item>500</item>

        <item>1000</item>

        <item>2000</item>

        <item>3000</item>

        <item>5000</item>

        <item>10000</item>

    </integer-array>

<!-- **** CYANOGENMOD EDITS END **** -->

</resources>

res/values/strings.xml

+15 −0
Original line number Diff line number Diff line
@@ -4499,4 +4499,19 @@ found in the list of installed apps.</string> 
    <!-- Status bar notification count -->

    <string name="status_bar_notif_count_title">Show notification count</string>

    <string name="status_bar_notif_count_summary">Display number of pending notifications on the status bar</string>



    <string name="increasing_ring_title">Ascending ringtone</string>

    <!-- Sound settings screen, the caption of the checkbox for making incoming calls increase in volume -->

    <string name="checkbox_increasing_ring">Enable</string>

    <!-- Sound settings screen, the title of the volume bar to adjust the minimum increasing ring volume -->

    <string name="increasing_ring_min_volume_title">Ringing start volume</string>

    <string name="increasing_ring_volume_notice">Notice:\nAs the start volume is set higher than the ringer volume, the ring tone will be played using the ringer volume.</string>

    <string name="increasing_ring_interval_title">Increase interval</string>

    <string name="increasing_ring_interval_eachring">On each ring</string>

    <string name="increasing_ring_interval_half_second">0.5 seconds</string>

    <string name="increasing_ring_interval_1second">1 second</string>

    <string name="increasing_ring_interval_2seconds">2 seconds</string>

    <string name="increasing_ring_interval_3seconds">3 seconds</string>

    <string name="increasing_ring_interval_5seconds">5 seconds</string>

    <string name="increasing_ring_interval_10seconds">10 seconds</string>

</resources>

res/xml/sound_settings.xml

+7 −0
Original line number Diff line number Diff line
@@ -81,6 +81,13 @@ 
            android:title="@string/vibrate_on_ring_title"

            android:defaultValue="false" />



    <com.android.settings.IncreasingRingPreference

            android:key="increasing_ring"

            android:title="@string/increasing_ring_title"

            android:dialogTitle="@string/increasing_ring_title"

            android:persistent="false"

            android:streamType="ring" />



    <PreferenceCategory

            android:title="@string/sound_category_feedback_title"/>