Merge "Update conversation priority onboarding" into rvc-dev am: ff182768f7 (a48633b9) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -1777,6 +1777,15 @@ public final class Settings {
		public static final String ACTION_NOTIFICATION_SETTINGS
		= "android.settings.NOTIFICATION_SETTINGS";

		/**
		* Activity Action: Show conversation settings.
		*
		* @hide
		*/
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_CONVERSATION_SETTINGS
		= "android.settings.CONVERSATION_SETTINGS";

		/**
		* Activity Action: Show notification history screen.
		*

packages/SystemUI/res/layout/priority_onboarding_half_shell.xml

+43 −133

Original line number	Diff line number	Diff line
		@@ -38,156 +38,66 @@
		android:background="@drawable/rounded_bg_full"
		>

		<!-- We have a known number of rows that can be shown; just design them all here -->
		<LinearLayout
		android:id="@+id/show_at_top_tip"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingTop="8dp"
		android:paddingBottom="8dp"
		android:paddingStart="4dp"
		android:paddingEnd="4dp"
		android:orientation="horizontal"
		>
		<ImageView
		android:id="@+id/bell_icon"
		android:layout_width="24dp"
		android:layout_height="24dp"
		android:layout_gravity="center_vertical"
		android:src="@drawable/ic_notifications_alert"
		android:tint="?android:attr/colorControlNormal" />
		android:id="@+id/conversation_icon"
		android:layout_width="@dimen/notification_guts_conversation_icon_size"
		android:layout_height="@dimen/notification_guts_conversation_icon_size"
		android:layout_gravity="center_horizontal" />

		<TextView
		android:id="@+id/show_at_top_text"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingStart="16dp"
		android:paddingEnd="16dp"
		android:gravity="center_vertical\|start"
		android:textSize="15sp"
		android:ellipsize="end"
		android:maxLines="2"
		android:text="@string/priority_onboarding_show_at_top_text"
		style="@style/TextAppearance.NotificationInfo"
		/>

		</LinearLayout>

		<LinearLayout
		android:id="@+id/show_avatar_tip"
		android:id="@+id/title"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingTop="8dp"
		android:paddingBottom="8dp"
		android:paddingStart="4dp"
		android:paddingEnd="4dp"
		android:orientation="horizontal"
		>
		<ImageView
		android:id="@+id/avatar_icon"
		android:layout_width="24dp"
		android:layout_height="24dp"
		android:layout_gravity="center_vertical"
		android:src="@drawable/ic_person"
		android:tint="?android:attr/colorControlNormal" />

		<TextView
		android:id="@+id/avatar_text"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingStart="16dp"
		android:paddingEnd="16dp"
		android:gravity="center_vertical\|start"
		android:textSize="15sp"
		android:ellipsize="end"
		android:maxLines="2"
		android:text="@string/priority_onboarding_show_avatar_text"
		style="@style/TextAppearance.NotificationInfo"
		android:gravity="center_horizontal"
		android:layout_marginTop="16dp"
		android:text="@string/priority_onboarding_title"
		style="@style/TextAppearance.NotificationImportanceChannel"
		/>

		</LinearLayout>

		<!-- These rows show optionally -->

		<LinearLayout
		android:id="@+id/floating_bubble_tip"
		<View
		android:id="@+id/divider"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingTop="8dp"
		android:paddingBottom="8dp"
		android:paddingStart="4dp"
		android:paddingEnd="4dp"
		android:orientation="horizontal"
		>

		<ImageView
		android:id="@+id/bubble_icon"
		android:layout_width="24dp"
		android:layout_height="24dp"
		android:layout_gravity="center_vertical"
		android:src="@drawable/ic_create_bubble"
		android:tint="?android:attr/colorControlNormal" />
		android:layout_height="0.5dp"
		android:layout_marginTop="20dp"
		android:layout_marginBottom="20dp"
		android:background="@color/material_grey_300" />

		<TextView
		android:id="@+id/bubble_text"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingStart="16dp"
		android:paddingEnd="16dp"
		android:gravity="center_vertical\|start"
		android:textSize="15sp"
		android:ellipsize="end"
		android:maxLines="2"
		android:text="@string/priority_onboarding_appear_as_bubble_text"
		style="@style/TextAppearance.NotificationInfo"
		/>

		</LinearLayout>

		<LinearLayout
		android:id="@+id/ignore_dnd_tip"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingTop="8dp"
		android:paddingBottom="8dp"
		android:paddingStart="4dp"
		android:paddingEnd="4dp"
		android:orientation="horizontal"
		>

		<ImageView
		android:id="@+id/dnd_icon"
		android:layout_width="24dp"
		android:layout_height="24dp"
		android:layout_gravity="center_vertical"
		android:src="@drawable/moon"
		android:tint="?android:attr/colorControlNormal" />
		android:gravity="start"
		android:text="@string/priority_onboarding_behavior"
		style="@style/TextAppearance.NotificationImportanceChannelGroup"
		/>

		<TextView
		android:id="@+id/dnd_text"
		android:layout_width="wrap_content"
		android:id="@+id/behaviors"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingStart="16dp"
		android:paddingEnd="16dp"
		android:gravity="center_vertical\|start"
		android:textSize="15sp"
		android:ellipsize="end"
		android:maxLines="2"
		android:text="@string/priority_onboarding_ignores_dnd_text"
		style="@style/TextAppearance.NotificationInfo"
		android:gravity="start"
		android:layout_marginTop="8dp"
		style="@style/TextAppearance.NotificationImportanceChannelGroup"
		/>

		</LinearLayout>

		<!-- Bottom button container -->
		<RelativeLayout
		android:id="@+id/button_container"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingStart="4dp"
		android:paddingEnd="4dp"
		android:layout_marginTop="32dp"
		android:orientation="horizontal"
		>
		<TextView
		android:id="@+id/settings_button"
		android:text="@string/priority_onboarding_settings_button_title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_alignParentStart="true"
		android:gravity="start\|center_vertical"
		android:minWidth="@dimen/notification_importance_toggle_size"
		android:minHeight="@dimen/notification_importance_toggle_size"
		android:maxWidth="125dp"
		style="@style/TextAppearance.NotificationInfo.Button"/>
		<TextView
		android:id="@+id/done_button"
		android:text="@string/priority_onboarding_done_button_title"

packages/SystemUI/res/values/dimens.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -224,6 +224,7 @@
		<dimen name="notification_guts_conversation_icon_size">56dp</dimen>
		<dimen name="notification_guts_conversation_action_height">56dp</dimen>
		<dimen name="notification_guts_conversation_action_text_padding_start">32dp</dimen>
		<dimen name="conversation_onboarding_bullet_gap_width">6dp</dimen>

		<!-- The height of the header in inline settings -->
		<dimen name="notification_guts_header_height">24dp</dimen>

packages/SystemUI/res/values/strings.xml

+7 −0

Original line number	Diff line number	Diff line
		@@ -2667,6 +2667,11 @@
		<string name="inattentive_sleep_warning_title">Standby</string>

		<!-- Priority conversation onboarding screen -->
		<!-- title of priority onboarding [CHAR LIMIT=75] -->
		<string name="priority_onboarding_title">Conversation set to priority</string>
		<!-- Text explaining that the following actions are the behaviors of priority conversations.
		E.g. priority conversations will show at the top of the conversation section [CHAR LIMIT=75] -->
		<string name="priority_onboarding_behavior">Priority conversations will:</string>
		<!-- Text explaining that priority conversations show at the top of the conversation section [CHAR LIMIT=75] -->
		<string name="priority_onboarding_show_at_top_text">Show at top of conversation section</string>
		<!-- Text explaining that priority conversations show an avatar on the lock screen [CHAR LIMIT=75] -->
		@@ -2677,6 +2682,8 @@
		<string name="priority_onboarding_ignores_dnd_text">Interrupt Do Not Disturb</string>
		<!-- Title for the affirmative button [CHAR LIMIT=50] -->
		<string name="priority_onboarding_done_button_title">Got it</string>
		<!-- Title for the settings button button [CHAR LIMIT=50] -->
		<string name="priority_onboarding_settings_button_title">Settings</string>

		<!-- Window Magnification strings -->
		<!-- Title for Magnification Overlay Window [CHAR LIMIT=NONE] -->

packages/SystemUI/src/com/android/systemui/Prefs.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -124,7 +124,7 @@ public final class Prefs {
		String HAS_SEEN_BUBBLES_MANAGE_EDUCATION = "HasSeenBubblesManageOnboarding";
		String CONTROLS_STRUCTURE_SWIPE_TOOLTIP_COUNT = "ControlsStructureSwipeTooltipCount";
		/** Tracks whether the user has seen the onboarding screen for priority conversations */
		String HAS_SEEN_PRIORITY_ONBOARDING = "HasSeenPriorityOnboarding";
		String HAS_SEEN_PRIORITY_ONBOARDING = "HaveShownPriorityOnboarding";
		}

		public static boolean getBoolean(Context context, @Key String key, boolean defaultValue) {