commit 802ddf99f57e316d0fd87c2cfeed5dc3a0cfa8fe
author John Spurlock <jspurlock@google.com> Fri Jul 18 11:51:13 2014 -0400
committer John Spurlock <jspurlock@google.com> Tue Aug 05 11:08:03 2014 -0400
tree c440e98d30d383e4cb7a98373af98edab46042a9
parent f3dfd182e17c91ae4cd9e40a96308b83fdaefb49

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

res/layout/notification_app.xml

diff --git a/res/layout/notification_app.xml b/res/layout/notification_app.xml
index 9442de6..54060c1 100644
--- a/res/layout/notification_app.xml
+++ b/res/layout/notification_app.xml
@@ -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"