Merge "NIU Actions: Add privacy confirmation dialog" into sc-dev (4e0bc773) · Commits · e / os / android_packages_apps_Trebuchet

go/quickstep/res/drawable/round_rect_dialog.xml

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2021 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.
		-->
		<shape xmlns:android="http://schemas.android.com/apk/res/android"
		android:shape="rectangle">
		<corners android:radius="@dimen/modal_dialog_corner_radius" />
		</shape>

go/quickstep/res/layout/niu_actions_confirmation_dialog.xml

0 → 100644

+94 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2021 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:id="@+id/niu_actions_confirmation_dialog_layout"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="horizontal"
		android:layout_gravity="center">

		<Space
		android:layout_width="0dp"
		android:layout_height="1dp"
		android:layout_weight="1"/>

		<LinearLayout
		android:layout_width="@dimen/modal_dialog_width"
		android:layout_height="wrap_content"
		android:background="@drawable/round_rect_dialog"
		android:backgroundTint="?attr/modalDialogBackground"
		android:orientation="vertical"
		android:layout_gravity="center"
		android:paddingTop="@dimen/modal_dialog_padding"
		android:paddingLeft="@dimen/modal_dialog_padding"
		android:paddingRight="@dimen/modal_dialog_padding"
		android:paddingBottom="@dimen/modal_dialog_padding_bottom">

		<TextView
		style="@style/ModalDialogTitle"
		android:id="@+id/niu_actions_confirmation_header"
		android:text="@string/niu_actions_confirmation_title"/>

		<Space
		android:layout_width="0dp"
		android:layout_height="@dimen/modal_dialog_vertical_spacer"/>

		<ScrollView
		android:layout_width="match_parent"
		android:layout_height="@dimen/confirmation_dialog_text_height">

		<TextView
		style="@style/ModalDialogText"
		android:id="@+id/niu_actions_confirmation_description"
		android:text="@string/niu_actions_confirmation_text"/>
		</ScrollView>

		<Space
		android:layout_width="0dp"
		android:layout_height="@dimen/modal_dialog_vertical_spacer"/>

		<LinearLayout
		android:id="@+id/niu_actions_confirmation_buttons"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="horizontal">

		<Space
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:layout_weight="1"/>

		<Button
		style="@style/ModalDialogButton"
		android:id="@+id/niu_actions_confirmation_reject"
		android:text="@string/niu_actions_confirmation_no"/>

		<Button
		style="@style/ModalDialogButton"
		android:id="@+id/niu_actions_confirmation_accept"
		android:text="@string/niu_actions_confirmation_yes"/>
		</LinearLayout>

		</LinearLayout>

		<Space
		android:layout_width="0dp"
		android:layout_height="1dp"
		android:layout_weight="1" />

		</LinearLayout>
		No newline at end of file

go/quickstep/res/values-land/dimens.xml

0 → 100644

+22 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2021 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.
		-->

		<resources>
		<!-- Modal Dialogs -->
		<dimen name="modal_dialog_width">360dp</dimen>
		<dimen name="confirmation_dialog_text_height">168dp</dimen>
		</resources>

go/quickstep/res/values/attrs.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -19,4 +19,6 @@
		<attr name="overviewButtonTextColor" format="color" />
		<attr name="overviewButtonIconColor" format="color" />
		<attr name="overviewButtonBackgroundColor" format="color" />
		<!-- Modal dialog theming -->
		<attr name="modalDialogBackground" format="color" />
		</resources>
		No newline at end of file

go/quickstep/res/values/colors.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -20,4 +20,7 @@
		<color name="go_overview_text_color_dark">#F8F9FA</color>
		<color name="go_overview_button_color">#70FFFFFF</color>
		<color name="go_overview_button_color_dark">#474747</color>
		<!-- Modal Dialogs -->
		<color name="go_modal_dialog_background">#FFFFFF</color>
		<color name="go_modal_dialog_background_dark">#424242</color>
		</resources>