Settings: New application-level notification settings.
- Convert the old application-level dialog to an activity. - Move the settings icon to the new activity (out of the list). - Add a custom application header, similar to the switch bar style. - Use the ubiquitous vector gear for the settings icon. - Migrate old checkboxes to switch prefs, add new summaries. - Remove obsolete artifacts. Bug:16396715 Change-Id: I857e3cf448b79f44fe1c242e6020f5214434c00c
This commit is contained in:
63
res/layout/app_notification_header.xml
Normal file
63
res/layout/app_notification_header.xml
Normal file
@@ -0,0 +1,63 @@
|
||||
<!--
|
||||
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.
|
||||
-->
|
||||
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="?android:attr/actionBarSize"
|
||||
android:background="@drawable/switchbar_background"
|
||||
android:gravity="center_vertical"
|
||||
android:theme="?attr/switchBarTheme" >
|
||||
|
||||
<ImageView android:id="@+id/app_icon"
|
||||
android:layout_width="@dimen/switchbar_subsettings_margin_start"
|
||||
android:layout_height="40dp"
|
||||
android:gravity="end"
|
||||
android:layout_centerVertical="true" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/app_name"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_toStartOf="@+id/app_settings"
|
||||
android:layout_marginStart="@dimen/switchbar_subsettings_margin_start"
|
||||
android:layout_alignWithParentIfMissing="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:textAppearance="@style/TextAppearance.Switch"
|
||||
android:textColor="?android:attr/textColorPrimary"
|
||||
android:textAlignment="viewStart" />
|
||||
|
||||
<ImageView
|
||||
android:id="@id/app_settings"
|
||||
android:layout_width="56dp"
|
||||
android:layout_height="56dp"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_marginEnd="@dimen/switchbar_subsettings_margin_end"
|
||||
android:layout_centerVertical="true"
|
||||
android:minHeight="0dp"
|
||||
android:minWidth="0dp"
|
||||
android:contentDescription="@string/notification_app_settings_button"
|
||||
android:scaleType="center"
|
||||
android:src="@drawable/ic_settings_32dp"
|
||||
style="?android:attr/borderlessButtonStyle" />
|
||||
|
||||
<View
|
||||
android:id="@+id/row_divider"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="?android:attr/listDivider" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
@@ -13,70 +13,44 @@
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="?android:attr/listChoiceBackgroundIndicator"
|
||||
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
|
||||
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@android:id/button1"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignWithParentIfMissing="true"
|
||||
android:layout_toStartOf="@+id/settings_divider"
|
||||
android:background="?android:attr/listChoiceBackgroundIndicator">
|
||||
|
||||
<ImageView
|
||||
android:id="@android:id/icon"
|
||||
android:layout_width="@dimen/notification_app_icon_size"
|
||||
android:layout_height="@dimen/notification_app_icon_size"
|
||||
android:layout_centerVertical="true"
|
||||
android:contentDescription="@null"
|
||||
android:padding="8dp" />
|
||||
|
||||
<TextView
|
||||
android:id="@android:id/title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_toEndOf="@android:id/icon"
|
||||
android:ellipsize="end"
|
||||
android:singleLine="true"
|
||||
android:textAlignment="viewStart"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
||||
|
||||
<TextView
|
||||
android:id="@android:id/text1"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/notification_app_icon_size"
|
||||
android:layout_toEndOf="@android:id/icon"
|
||||
android:gravity="bottom"
|
||||
android:ellipsize="end"
|
||||
android:singleLine="true"
|
||||
android:textAlignment="viewStart"
|
||||
android:textColor="?android:attr/textColorSecondary"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall" />
|
||||
</RelativeLayout>
|
||||
|
||||
<View
|
||||
android:id="@+id/settings_divider"
|
||||
android:layout_width="1dp"
|
||||
android:layout_height="@dimen/notification_app_settings_divider_height"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_toStartOf="@android:id/button2"
|
||||
android:background="?android:attr/listDivider" />
|
||||
|
||||
<ImageView
|
||||
android:id="@android:id/button2"
|
||||
android:id="@android:id/icon"
|
||||
android:layout_width="@dimen/notification_app_icon_size"
|
||||
android:layout_height="@dimen/notification_app_icon_size"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:background="?android:attr/listChoiceBackgroundIndicator"
|
||||
android:contentDescription="@string/notification_app_settings_button"
|
||||
android:scaleType="center"
|
||||
android:src="@drawable/ic_settings_generic" />
|
||||
android:contentDescription="@null"
|
||||
android:padding="8dp" />
|
||||
|
||||
<TextView
|
||||
android:id="@android:id/title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_toEndOf="@android:id/icon"
|
||||
android:ellipsize="end"
|
||||
android:singleLine="true"
|
||||
android:textAlignment="viewStart"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
||||
|
||||
<TextView
|
||||
android:id="@android:id/text1"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/notification_app_icon_size"
|
||||
android:layout_toEndOf="@android:id/icon"
|
||||
android:gravity="bottom"
|
||||
android:ellipsize="end"
|
||||
android:singleLine="true"
|
||||
android:textAlignment="viewStart"
|
||||
android:textColor="?android:attr/textColorSecondary"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall" />
|
||||
|
||||
<View
|
||||
android:id="@+id/row_divider"
|
||||
|
@@ -1,65 +0,0 @@
|
||||
<!--
|
||||
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.
|
||||
-->
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" >
|
||||
|
||||
<ImageView
|
||||
android:id="@android:id/icon"
|
||||
android:padding="8dp"
|
||||
android:layout_width="@dimen/notification_app_icon_size"
|
||||
android:layout_height="@dimen/notification_app_icon_size"
|
||||
android:contentDescription="@null" />
|
||||
|
||||
<TextView
|
||||
android:id="@android:id/title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/notification_app_icon_size"
|
||||
android:layout_toEndOf="@android:id/icon"
|
||||
android:ellipsize="end"
|
||||
android:gravity="center_vertical"
|
||||
android:singleLine="true"
|
||||
android:textAlignment="viewStart"
|
||||
android:textAppearance="?android:attr/textAppearanceLarge" />
|
||||
|
||||
<CheckBox
|
||||
android:id="@android:id/button1"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/notification_app_icon_size"
|
||||
android:layout_below="@android:id/icon"
|
||||
android:layout_marginStart="@dimen/content_margin_left"
|
||||
android:text="@string/app_notifications_dialog_show"
|
||||
android:textAppearance="?android:attr/textAppearanceListItem" />
|
||||
|
||||
<CheckBox
|
||||
android:id="@android:id/button2"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/notification_app_icon_size"
|
||||
android:layout_below="@android:id/button1"
|
||||
android:layout_marginStart="@dimen/content_margin_left"
|
||||
android:text="@string/app_notifications_dialog_priority"
|
||||
android:textAppearance="?android:attr/textAppearanceListItem" />
|
||||
|
||||
<CheckBox
|
||||
android:id="@android:id/button3"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/notification_app_icon_size"
|
||||
android:layout_below="@android:id/button2"
|
||||
android:layout_marginStart="@dimen/content_margin_left"
|
||||
android:text="@string/app_notifications_dialog_visibility"
|
||||
android:textAppearance="?android:attr/textAppearanceListItem" />
|
||||
|
||||
</RelativeLayout>
|
Reference in New Issue
Block a user