Merge "Add the Manage menu!" into rvc-dev am: c670ebf25e am: eb367da051 (996cf46d) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable/bubble_manage_menu_row.xml

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2020 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
		-->
		<selector xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:state_pressed="true">
		<ripple android:color="#99999999" />
		</item>
		</selector>
		No newline at end of file

packages/SystemUI/res/layout/bubble_manage_menu.xml

0 → 100644

+99 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2020 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
		-->
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:background="@drawable/rounded_bg_full"
		android:elevation="@dimen/bubble_manage_menu_elevation"
		android:orientation="vertical">

		<LinearLayout
		android:id="@+id/bubble_manage_menu_dismiss_container"
		android:background="@drawable/bubble_manage_menu_row"
		android:layout_width="match_parent"
		android:layout_height="48dp"
		android:gravity="center_vertical"
		android:paddingStart="16dp"
		android:paddingEnd="16dp"
		android:orientation="horizontal">

		<ImageView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:src="@drawable/ic_remove_no_shadow"
		android:tint="@color/global_actions_text"/>

		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="16dp"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault"
		android:text="@string/bubble_dismiss_text" />

		</LinearLayout>

		<LinearLayout
		android:id="@+id/bubble_manage_menu_dont_bubble_container"
		android:background="@drawable/bubble_manage_menu_row"
		android:layout_width="match_parent"
		android:layout_height="48dp"
		android:gravity="center_vertical"
		android:paddingStart="16dp"
		android:paddingEnd="16dp"
		android:orientation="horizontal">

		<ImageView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:src="@drawable/ic_stop_bubble"
		android:tint="@color/global_actions_text"/>

		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="16dp"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault"
		android:text="@string/bubbles_dont_bubble_conversation" />

		</LinearLayout>

		<LinearLayout
		android:id="@+id/bubble_manage_menu_settings_container"
		android:background="@drawable/bubble_manage_menu_row"
		android:layout_width="match_parent"
		android:layout_height="48dp"
		android:gravity="center_vertical"
		android:paddingStart="16dp"
		android:paddingEnd="16dp"
		android:orientation="horizontal">

		<ImageView
		android:id="@+id/bubble_manage_menu_settings_icon"
		android:layout_width="24dp"
		android:layout_height="24dp"
		android:src="@drawable/ic_remove_no_shadow"/>

		<TextView
		android:id="@+id/bubble_manage_menu_settings_name"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="16dp"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault" />

		</LinearLayout>

		</LinearLayout>
		No newline at end of file

packages/SystemUI/res/values/dimens.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -1200,6 +1200,7 @@
		snap to the dismiss target. -->
		<dimen name="bubble_dismiss_target_padding_x">40dp</dimen>
		<dimen name="bubble_dismiss_target_padding_y">20dp</dimen>
		<dimen name="bubble_manage_menu_elevation">4dp</dimen>

		<dimen name="dismiss_circle_size">52dp</dimen>
		<dimen name="dismiss_target_x_size">24dp</dimen>

packages/SystemUI/res/values/strings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -2629,6 +2629,8 @@
		<string name="bubbles_user_education_manage">Tap Manage to turn off bubbles from this app</string>
		<!-- Button text for dismissing the bubble "manage" button tool tip [CHAR LIMIT=20]-->
		<string name="bubbles_user_education_got_it">Got it</string>
		<!-- Label for the button that takes the user to the notification settings for the given app. -->
		<string name="bubbles_app_settings"><xliff:g id="notification_title" example="Android Messages">%1$s</xliff:g> settings</string>

		<!-- Notification content text when the system navigation mode changes as a result of changing the default launcher [CHAR LIMIT=NONE] -->
		<string name="notification_content_system_nav_changed">System navigation updated. To make changes, go to Settings.</string>

packages/SystemUI/src/com/android/systemui/bubbles/Bubble.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -90,6 +90,7 @@ class Bubble implements BubbleViewProvider {
		}

		private FlyoutMessage mFlyoutMessage;
		private Drawable mBadgedAppIcon;
		private Bitmap mBadgedImage;
		private int mDotColor;
		private Path mDotPath;
		@@ -133,6 +134,10 @@ class Bubble implements BubbleViewProvider {
		return mBadgedImage;
		}

		public Drawable getBadgedAppIcon() {
		return mBadgedAppIcon;
		}

		@Override
		public int getDotColor() {
		return mDotColor;
		@@ -239,6 +244,7 @@ class Bubble implements BubbleViewProvider {
		mAppName = info.appName;
		mFlyoutMessage = info.flyoutMessage;

		mBadgedAppIcon = info.badgedAppIcon;
		mBadgedImage = info.badgedBubbleImage;
		mDotColor = info.dotColor;
		mDotPath = info.dotPath;