PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow importance to be reset.

Browse Source 
Change-Id: Ib2c2289631dfe4eb2aa09baf84d401eb2000c0d9
This commit is contained in:
Julia Reynolds
2016-01-27 13:37:15 -05:00
parent 33e9656a53
commit a7accd2064
8 changed files with 205 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
res/layout/preference_importance_slider.xml
View File

@@ -23,35 +23,11 @@
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:orientation="vertical"
android:clickable="false"
android:focusable="false"
android:paddingTop="8dip"
android:paddingBottom="8dip">
<TextView
android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="@android:style/TextAppearance.Material.Subhead"
android:textColor="?android:attr/textColorPrimary"
android:ellipsize="marquee"
android:fadingEdge="horizontal" />
<TextView
android:id="@android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignStart="@android:id/title"
android:textAlignment="viewStart"
android:textAppearance="@android:style/TextAppearance.Material.Body1"
android:textColor="?android:attr/textColorSecondary"
android:maxLines="10"
android:minLines="2" />
android:focusable="false" >
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp">
android:layout_height="wrap_content" >
<ImageView
android:id="@+id/low_importance"
@@ -82,5 +58,4 @@
android:tint="@color/importance_icon_tint" />
</FrameLayout>
</LinearLayout>

6
res/values/strings.xml
View File

@@ -5839,6 +5839,9 @@
<!-- [CHAR LIMIT=100] Notification importance slider title -->
<string name="notification_importance_title">Importance</string>
<!-- [CHAR LIMIT=100] Notification Importance slider: unset importance level description -->
<string name="notification_importance_none">Not set</string>
<!-- [CHAR LIMIT=100] Notification Importance slider: blocked importance level description -->
<string name="notification_importance_blocked">Blocked: Never show these notifications</string>
@@ -5854,6 +5857,9 @@
<!-- [CHAR LIMIT=100] Notification Importance slider: max importance level description -->
<string name="notification_importance_max">Urgent: Peek onto the screen and make sound</string>
<!-- [CHAR LIMIT=60] Notification importance reset button -->
<string name="importance_reset">Reset</string>
<!-- Default Apps > Default notification assistant -->
<string name="default_notification_assistant">Notification assistant</string>

43
res/xml/app_notification_settings.xml
View File

@@ -22,6 +22,47 @@
<Preference
android:key="app_settings"
android:title="@string/app_notification_preferences"
android:persistent="false" />
android:order="1" />
<!-- Apps without topics -->
<!-- Importance -->
<Preference
android:key="importance_title"
android:title="@string/notification_importance_title"
android:order="2" />
<com.android.settings.notification.ImportanceSeekBarPreference
android:key="importance"
android:order="3"/>
<com.android.settings.applications.LayoutPreference
android:key="importance_reset_button"
android:layout="@layout/two_buttons_panel"
android:order="4" />
<!-- Sensitive -->
<com.android.settingslib.RestrictedSwitchPreference
android:key="sensitive"
android:title="@string/app_notification_sensitive_title"
android:summary="@string/app_notification_sensitive_summary"
android:order="5" />
<!-- Bypass DND -->
<com.android.settingslib.RestrictedSwitchPreference
android:key="bypass_dnd"
android:title="@string/app_notification_override_dnd_title"
android:summary="@string/app_notification_override_dnd_summary"
android:order="6" />
<!-- Apps with topics -->
<!-- Block -->
<com.android.settingslib.RestrictedSwitchPreference
android:key="block"
android:title="@string/app_notification_block_title"
android:summary="@string/app_notification_block_summary"
android:order="7" />
<PreferenceCategory
android:key="categories"
android:title="@string/notification_topic_categories"
android:order="8" />
</PreferenceScreen>

31
res/xml/topic_notification_settings.xml
View File

@@ -19,26 +19,31 @@
android:key="topic_notification_settings">
<!-- Importance -->
<Preference
android:key="importance_title"
android:title="@string/notification_importance_title"
android:order="1" />
<com.android.settings.notification.ImportanceSeekBarPreference
android:key="importance"
android:title="@string/notification_importance_title"
android:order="1"
android:persistent="false" />
android:order="2" />
<!-- Bypass DND -->
<SwitchPreference
android:key="bypass_dnd"
android:title="@string/app_notification_override_dnd_title"
android:summary="@string/app_notification_override_dnd_summary"
android:order="2"
android:persistent="false" />
<com.android.settings.applications.LayoutPreference
android:key="importance_reset_button"
android:order="3"
android:layout="@layout/two_buttons_panel" />
<!-- Sensitive -->
<SwitchPreference
<com.android.settingslib.RestrictedSwitchPreference
android:key="sensitive"
android:title="@string/app_notification_sensitive_title"
android:summary="@string/app_notification_sensitive_summary"
android:order="4"
android:persistent="false" />
android:order="4" />
<!-- Bypass DND -->
<com.android.settingslib.RestrictedSwitchPreference
android:key="bypass_dnd"
android:title="@string/app_notification_override_dnd_title"
android:summary="@string/app_notification_override_dnd_summary"
android:order="5" />
</PreferenceScreen>