Merge "Enhanced notification details." into nyc-dev (712568cd) · Commits · e / os / android_packages_apps_Settings

res/layout/notification_log_row.xml

+21 −17

Original line number	Diff line number	Diff line
		@@ -27,11 +27,11 @@
		<RelativeLayout
		android:layout_width="match_parent"
		android:layout_height="@*android:dimen/status_bar_icon_size"
		android:layout_marginBottom="4dp"
		android:layout_marginBottom="6dp"
		>

		<ImageView
		android:id="@android:id/icon"
		android:id="@+id/icon"
		android:layout_width="@*android:dimen/status_bar_icon_size"
		android:layout_height="@*android:dimen/status_bar_icon_size"
		android:layout_centerVertical="true"
		@@ -40,17 +40,18 @@
		android:layout_marginEnd="8dp"
		android:contentDescription="@null"
		android:adjustViewBounds="true"
		android:tint="?android:attr/textColorPrimary"
		android:maxHeight="@*android:dimen/status_bar_icon_size"
		android:maxWidth="@*android:dimen/status_bar_icon_size"
		android:scaleType="fitCenter" />

		<TextView
		android:id="@android:id/title"
		android:id="@+id/title"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_centerVertical="true"
		android:layout_toStartOf="@+id/timestamp"
		android:layout_toEndOf="@android:id/icon"
		android:layout_toEndOf="@id/icon"
		android:ellipsize="end"
		android:singleLine="true"
		android:textColor="?android:attr/textColorPrimary"
		@@ -75,24 +76,12 @@
		/>
		</RelativeLayout>

		<TextView
		android:id="@+id/extra"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:layout_marginStart="30dp"
		android:ellipsize="end"
		android:singleLine="true"
		android:textColor="?android:attr/textColorPrimary"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textAlignment="viewStart"
		/>

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="@*android:dimen/status_bar_icon_size"
		android:orientation="horizontal"
		android:layout_marginStart="30dp"
		android:layout_marginBottom="6dp"
		>

		<ImageView
		@@ -120,4 +109,19 @@
		/>

		</LinearLayout>

		<TextView
		android:id="@+id/extra"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:layout_marginStart="30dp"
		android:layout_marginBottom="6dp"
		android:singleLine="false"
		android:textColor="?android:attr/textColorPrimary"
		android:textSize="10sp"
		android:fontFamily="monospace"
		android:textAlignment="viewStart"
		/>

		</LinearLayout>

res/values/strings.xml

+52 −0

Original line number	Diff line number	Diff line
		@@ -7180,4 +7180,56 @@
		<item>@*android:string/gigabyteShort</item>
		</string-array>

		<!-- Notification log debug tool: missing title -->
		<string name="notification_log_no_title">(none)</string>
		<!-- Notification log debug tool: delimiter between header and field data -->
		<string name="notification_log_details_delimiter">": "</string>
		<!-- Notification log debug tool: header: package name -->
		<string name="notification_log_details_package">pkg</string>
		<!-- Notification log debug tool: header: notification key -->
		<string name="notification_log_details_key">key</string>
		<!-- Notification log debug tool: header: notification group -->
		<string name="notification_log_details_group">group</string>
		<!-- Notification log debug tool: header: notification group summary suffix -->
		<string name="notification_log_details_group_summary"> (summary)</string>
		<!-- Notification log debug tool: header: notification visibility -->
		<string name="notification_log_details_visibility">visibility</string>
		<!-- Notification log debug tool: header: notification public version -->
		<string name="notification_log_details_public_version">publicVersion</string>
		<!-- Notification log debug tool: header: notification priority -->
		<string name="notification_log_details_priority">priority</string>
		<!-- Notification log debug tool: header: notification importance -->
		<string name="notification_log_details_importance">importance</string>
		<!-- Notification log debug tool: header: notification importance explanation -->
		<string name="notification_log_details_explanation">explanation</string>
		<!-- Notification log debug tool: header: notification contentIntent field -->
		<string name="notification_log_details_content_intent">intent</string>
		<!-- Notification log debug tool: header: notification deleteIntent field -->
		<string name="notification_log_details_delete_intent">delete intent</string>
		<!-- Notification log debug tool: header: notification fullScreenIntent field -->
		<string name="notification_log_details_full_screen_intent">full screen intent</string>
		<!-- Notification log debug tool: header: notification actions list -->
		<string name="notification_log_details_actions">actions</string>
		<!-- Notification log debug tool: header: title -->
		<string name="notification_log_details_title">title</string>
		<!-- Notification log debug tool: header: notification action remoteinput -->
		<string name="notification_log_details_remoteinput">remote inputs</string>
		<!-- Notification log debug tool: header: notification contentView -->
		<string name="notification_log_details_content_view">custom view</string>
		<!-- Notification log debug tool: header: notification extras -->
		<string name="notification_log_details_extras">extras</string>
		<!-- Notification log debug tool: header: notification icon -->
		<string name="notification_log_details_icon">icon</string>
		<!-- Notification log debug tool: header: notification size -->
		<string name="notification_log_details_parcel">parcel size</string>
		<!-- Notification log debug tool: notification ashmem size -->
		<string name="notification_log_details_ashmem">ashmem</string>
		<!-- Notification log debug tool: header: notification sound info -->
		<string name="notification_log_details_sound">sound</string>
		<!-- Notification log debug tool: header: notification vibration info -->
		<string name="notification_log_details_vibrate">vibrate</string>
		<!-- Notification log debug tool: the word 'default' -->
		<string name="notification_log_details_default">default</string>
		<!-- Notification log debug tool: the word 'none' -->
		<string name="notification_log_details_none">none</string>
		</resources>

src/com/android/settings/CopyablePreference.java

+10 −2

Original line number	Diff line number	Diff line
		@@ -30,6 +30,10 @@ public class CopyablePreference extends Preference {
		super(context, attrs);
		}

		public CopyablePreference(Context context) {
		this(context, null);
		}

		@Override
		public void onBindViewHolder(PreferenceViewHolder holder) {
		super.onBindViewHolder(holder);
		@@ -45,10 +49,14 @@ public class CopyablePreference extends Preference {
		});
		}

		public static void copyPreference(Context context, Preference pref) {
		public CharSequence getCopyableText() {
		return getSummary();
		}

		public static void copyPreference(Context context, CopyablePreference pref) {
		ClipboardManager cm =
		(ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
		cm.setText(pref.getSummary());
		cm.setText(pref.getCopyableText());
		Toast.makeText(context, com.android.internal.R.string.text_copied, Toast.LENGTH_SHORT)
		.show();
		}

src/com/android/settings/notification/NotificationStation.java

+261 −43

File changed.

Preview size limit exceeded, changes collapsed.