Merge "Add 'more settings' and 'done' to guts." (bc89558f) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/notification_guts.xml

+45 −29

Original line number	Diff line number	Diff line
		@@ -29,18 +29,15 @@
		android:background="@color/notification_guts_text_color" >

		<!-- header -->
		<FrameLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingBottom="8dp" >

		<LinearLayout
		android:layout_width="wrap_content"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingBottom="8dp"
		android:paddingTop="8dp"
		android:id="@+id/notification_guts_header"
		android:orientation="horizontal"
		android:layout_gravity="center_vertical\|start"
		android:layout_marginEnd="52dp">
		android:layout_gravity="center_vertical\|start">

		<ImageView
		android:id="@android:id/icon"
		android:layout_width="18dp"
		@@ -65,17 +62,6 @@
		android:visibility="gone"
		android:textColor="#ffffff" />
		</LinearLayout>

		<ImageButton style="@android:style/Widget.Material.Light.Button.Borderless.Small"
		android:id="@+id/notification_inspect_item"
		android:layout_width="52dp"
		android:layout_height="wrap_content"
		android:layout_weight="0"
		android:gravity="center"
		android:layout_gravity="center_vertical\|end"
		android:contentDescription="@string/status_bar_notification_inspect_item_title"
		android:src="@drawable/ic_settings" />
		</FrameLayout>
		<!-- Importance slider -->
		<LinearLayout
		android:layout_width="match_parent"
		@@ -157,4 +143,34 @@
		android:visibility="gone"/>
		</RadioGroup>
		</LinearLayout>
		<!-- buttons -->
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:gravity="end"
		android:paddingTop="8dp"
		android:paddingBottom="16dp" >

		<TextView
		android:id="@+id/more_settings"
		android:text="@string/notification_more_settings"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textAppearance="@style/TextAppearance.NotificationGuts"
		android:background="@drawable/btn_borderless_rect"
		android:gravity="center"
		android:paddingEnd="24dp"
		android:paddingStart="12dp"
		android:focusable="true" />

		<TextView
		android:id="@+id/done"
		android:text="@string/notification_done"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textAppearance="@style/TextAppearance.NotificationGuts"
		android:background="@drawable/btn_borderless_rect"
		android:gravity="center"
		android:focusable="true"/>
		</LinearLayout>
		</com.android.systemui.statusbar.NotificationGuts>

packages/SystemUI/res/values/strings.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -1228,6 +1228,11 @@
		<!-- [CHAR LIMIT=100] Notification Importance slider: max importance level description -->
		<string name="notification_importance_max">Peek onto the screen and make sound</string>

		<!-- Notification: Control panel: Label for button that launches notification settings. [CHAR LIMIT=NONE] -->
		<string name="notification_more_settings">More settings</string>
		<!-- Notification: Control panel: Label for button that dismisses control panel. [CHAR LIMIT=NONE] -->
		<string name="notification_done">Done</string>

		<!-- Label for no color transform [CHAR LIMIT=30] -->
		<string name="color_matrix_none">Normal colors</string>

packages/SystemUI/res/values/styles.xml

+8 −0

Original line number	Diff line number	Diff line
		@@ -317,4 +317,12 @@
		<item name="@dropdownPreferenceStyle">@style/Preference.DropDown.Material</item>
		</style>

		<style name="TextAppearance.NotificationGuts">
		<item name="android:textSize">14sp</item>
		<item name="android:textColor">@color/notification_guts_btn_color</item>
		<item name="android:textAllCaps">true</item>
		<item name="android:fontFamily">sans-serif-medium</item>
		<item name="android:gravity">center</item>
		</style>

		</resources>

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -970,7 +970,7 @@ public abstract class BaseStatusBar extends SystemUI implements
		((ImageView) row.findViewById(android.R.id.icon)).setImageDrawable(pkgicon);
		((TextView) row.findViewById(R.id.pkgname)).setText(appname);

		final View settingsButton = guts.findViewById(R.id.notification_inspect_item);
		final View settingsButton = guts.findViewById(R.id.more_settings);
		if (appUid >= 0) {
		final int appUidF = appUid;
		settingsButton.setOnClickListener(new View.OnClickListener() {
		@@ -983,6 +983,13 @@ public abstract class BaseStatusBar extends SystemUI implements
		settingsButton.setVisibility(View.GONE);
		}

		row.findViewById(R.id.done).setOnClickListener(new View.OnClickListener() {
		@Override
		public void onClick(View v) {
		dismissPopups();
		}
		});

		guts.bindImportance(sbn, row, mNotificationData.getImportance(sbn.getKey()));
		}