Merge "Add permission prompt to bubble expanded header view" (a7c7b75e) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable/bubble_expanded_header_bg.xml

+0 −6

Original line number	Diff line number	Diff line
		@@ -23,10 +23,4 @@
		android:topRightRadius="@dimen/corner_size"/>
		</shape>
		</item>
		<item android:gravity="bottom">
		<shape>
		<size android:height="1dp"/>
		<solid android:color="?android:attr/textColorSecondary" />
		</shape>
		</item>
		</layer-list>
		No newline at end of file

packages/SystemUI/res/layout/bubble_expanded_view.xml

+59 −37

Original line number	Diff line number	Diff line
		@@ -27,12 +27,19 @@
		android:layout_height="@dimen/bubble_pointer_height"
		/>

		<FrameLayout
		android:id="@+id/header_permission_wrapper"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:animateLayoutChanges="true"
		android:background="@drawable/bubble_expanded_header_bg">

		<LinearLayout
		android:id="@+id/header_layout"
		android:layout_height="@dimen/bubble_expanded_header_height"
		android:layout_width="match_parent"
		android:orientation="horizontal"
		android:background="@drawable/bubble_expanded_header_bg">
		android:animateLayoutChanges="true"
		android:orientation="horizontal">

		<TextView
		android:id="@+id/header_text"
		@@ -71,4 +78,19 @@

		</LinearLayout>

		<include layout="@layout/bubble_permission_view"
		android:id="@+id/permission_layout"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		/>

		<View
		android:id="@+id/divider"
		android:layout_width="match_parent"
		android:layout_height="1dp"
		android:layout_gravity="bottom"
		android:background="?android:attr/dividerHorizontal"/>

		</FrameLayout>

		</com.android.systemui.bubbles.BubbleExpandedViewContainer>

packages/SystemUI/res/layout/bubble_permission_view.xml

0 → 100644

+85 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright 2019, 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="match_parent"
		android:layout_height="wrap_content"
		android:animateLayoutChanges="true"
		android:orientation="vertical"
		android:paddingStart="@dimen/bubble_expanded_header_horizontal_padding"
		android:paddingEnd="@dimen/bubble_expanded_header_horizontal_padding">

		<!-- App info -->
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:layout_marginTop="@dimen/bubble_expanded_header_horizontal_padding" >

		<ImageView
		android:id="@+id/pkgicon"
		android:layout_width="@dimen/bubble_permission_icon_size"
		android:layout_height="@dimen/bubble_permission_icon_size"
		android:layout_centerVertical="true"
		android:layout_marginEnd="3dp"
		/>

		<TextView
		android:id="@+id/pkgname"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:textAppearance="@*android:style/TextAppearance.Material.Body2"
		android:layout_marginStart="3dp"
		android:layout_marginEnd="2dp"
		android:singleLine="true"
		android:gravity="center_vertical"
		android:layout_centerVertical="true"
		/>
		</LinearLayout>

		<!-- Actual permission -->
		<TextView
		android:id="@+id/prompt"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="8dp"
		android:text="@string/bubbles_prompt"
		style="@*android:style/TextAppearance.Material.Body1" />

		<!-- Buttons -->
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:gravity="end"
		android:orientation="horizontal">

		<TextView
		android:id="@+id/no_bubbles_button"
		android:text="@string/no_bubbles"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:background="@drawable/ripple_drawable"
		style="@style/TextAppearance.NotificationInfo.Button"/>
		<TextView
		android:id="@+id/yes_bubbles_button"
		android:text="@string/yes_bubbles"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:background="@drawable/ripple_drawable"
		style="@style/TextAppearance.NotificationInfo.Button"/>
		</LinearLayout>
		</LinearLayout>
		No newline at end of file

packages/SystemUI/res/values/dimens.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -1041,4 +1041,6 @@
		<dimen name="bubble_stack_starting_offset_y">100dp</dimen>
		<!-- Size of image buttons in the bubble header -->
		<dimen name="bubble_header_icon_size">48dp</dimen>
		<!-- Size of the app icon shown in the bubble permission view -->
		<dimen name="bubble_permission_icon_size">24dp</dimen>
		</resources>

packages/SystemUI/res/values/strings.xml

+7 −0

Original line number	Diff line number	Diff line
		@@ -2356,5 +2356,12 @@
		<!-- Text used for content description of settings button in the header of expanded bubble
		view. [CHAR_LIMIT=NONE] -->
		<string name="bubbles_settings_button_description">Open notification settings for <xliff:g id="app_name" example="YouTube">%1$s</xliff:g></string>
		<!-- Text for asking the user whether bubbles (floating app content) should be enabled for an
		app. [CHAR LIMIT=NONE] -->
		<string name="bubbles_prompt">Allow bubbles from this app?</string>
		<!-- Text used for button allowing user to opt out of bubbles [CHAR LIMIT=20] -->
		<string name="no_bubbles">Block</string>
		<!-- Text used for button allowing user to approve / enable bubbles [CHAR LIMIT=20] -->
		<string name="yes_bubbles">Allow</string>

		</resources>