Cherish: HeadsUp: add timeout option (2/2)

Forward ported to marshmallow/nougat By: @BeansTown106
removed the none option as we now have a headsup minimum time of 2seconds
added 5sec option as that is the new default in marshmallow

Change-Id: I6fe5aa72ce68f28ee9c57520e36d4800a9263546
This commit is contained in:
Lars Greiss
2020-05-23 14:02:11 +05:30
committed by Hung Phan
parent c1a78463ae
commit 9ec232bda4
5 changed files with 87 additions and 3 deletions

View File

@@ -123,8 +123,8 @@
<string name="status_bar_am_pm_normal">Bình thường</string>
<string name="status_bar_am_pm_small">Nhỏ</string>
<string name="status_bar_am_pm_hidden">Ẩn</string>
<string name="clock_seconds_display">Hiển thị giây</string>
<string name="clock_seconds_display_summary">Hiển thị giây trong đồng hồ trên thanh trạng thái</string>
<string name="clock_giây_display">Hiển thị giây</string>
<string name="clock_giây_display_summary">Hiển thị giây trong đồng hồ trên thanh trạng thái</string>
<string name="clock_date_display">Ngày</string>
<string name="clock_date_display_summary">Hiển thị ngày tùy chỉnh trước đồng hồ</string>
<string name="clock_date_display_none">Ẩn</string>
@@ -435,4 +435,13 @@
<string name="profile_choose_app">Chọn ứng dụng</string>
<string name="dialog_delete_title">Xóa</string>
<string name="dialog_delete_message">Xóa mục đã chọn?</string>
<!-- Heads up timeout -->
<string name="heads_up_time_out_title">Hết giờ</string>
<string name="heads_up_time_out_summary">Thông báo nhìn nhanh sẽ hiển thị cho <xliff:g id="number">%d</xliff:g> giây</string>
<string name="heads_up_time_out_2sec">2 giây</string>
<string name="heads_up_time_out_4sec">4 giây</string>
<string name="heads_up_time_out_5sec">5 giây</string>
<string name="heads_up_time_out_6sec">6 giây</string>
<string name="heads_up_time_out_8sec">8 giây</string>
<string name="heads_up_time_out_10sec">10 giây</string>
</resources>

View File

@@ -400,4 +400,23 @@
<item>2</item>
<item>3</item>
</string-array>
<!-- Heads up timeout -->
<string-array name="heads_up_time_out_entries" translatable="false">
<item>@string/heads_up_time_out_2sec</item>
<item>@string/heads_up_time_out_4sec</item>
<item>@string/heads_up_time_out_5sec</item>
<item>@string/heads_up_time_out_6sec</item>
<item>@string/heads_up_time_out_8sec</item>
<item>@string/heads_up_time_out_10sec</item>
</string-array>
<string-array name="heads_up_time_out_values" translatable="false">
<item>2000</item>
<item>4000</item>
<item>5000</item>
<item>6000</item>
<item>8000</item>
<item>10000</item>
</string-array>
</resources>

View File

@@ -476,6 +476,16 @@
<string name="gaming_mode_dynamic_title">Dynamic mode</string>
<string name="gaming_mode_dynamic_summary">Try detecting and adding gaming apps automatically</string>
<!-- Heads up timeout -->
<string name="heads_up_time_out_title">Time out</string>
<string name="heads_up_time_out_summary">Peeking notifications will show for <xliff:g id="number">%d</xliff:g> seconds</string>
<string name="heads_up_time_out_2sec">2 seconds</string>
<string name="heads_up_time_out_4sec">4 seconds</string>
<string name="heads_up_time_out_5sec">5 seconds</string>
<string name="heads_up_time_out_6sec">6 seconds</string>
<string name="heads_up_time_out_8sec">8 seconds</string>
<string name="heads_up_time_out_10sec">10 seconds</string>
<!-- Heads up -->
<string name="heads_up_notifications">Heads Up</string>
<string name="heads_up_notifications_summary">Pop up statusbar notifications</string>

View File

@@ -16,6 +16,13 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/heads_up_notifications">
<ListPreference
android:key="heads_up_time_out"
android:title="@string/heads_up_time_out_title"
android:entries="@array/heads_up_time_out_entries"
android:entryValues="@array/heads_up_time_out_values"
android:persistent="false" />
<PreferenceCategory
android:title="@string/heads_up_stoplist_title"
android:key="stoplist_applications" >