diff options
| author | 2023-01-24 10:03:51 +0000 | |
|---|---|---|
| committer | 2023-01-24 10:03:51 +0000 | |
| commit | 0768fc5873101d8f7c5854e586e2a07f27455e5c (patch) | |
| tree | 500e06913ed1f6cff5bb4f6f9115f1170f856c8c | |
| parent | 862919f8ebc91ab10055ce44dc665656e32557ca (diff) | |
| parent | 6a1f582c6fc826fb030ee98c3a4d7dff0c947b21 (diff) | |
Merge "[3/n] Add resource files for size-compat restart dialog." into tm-qpr-dev am: 6a1f582c6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20736569
Change-Id: I2c6f0e4914332ed3e0528b1079fb423914d5f015
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
16 files changed, 527 insertions, 0 deletions
diff --git a/libs/WindowManager/Shell/res/color/letterbox_restart_button_background_ripple.xml b/libs/WindowManager/Shell/res/color/letterbox_restart_button_background_ripple.xml new file mode 100644 index 000000000000..a3ca74fac4e6 --- /dev/null +++ b/libs/WindowManager/Shell/res/color/letterbox_restart_button_background_ripple.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2023 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:color="@android:color/system_neutral1_900" android:alpha="0.6" /> +</selector>
\ No newline at end of file diff --git a/libs/WindowManager/Shell/res/color/letterbox_restart_dismiss_button_background_ripple.xml b/libs/WindowManager/Shell/res/color/letterbox_restart_dismiss_button_background_ripple.xml new file mode 100644 index 000000000000..a3ca74fac4e6 --- /dev/null +++ b/libs/WindowManager/Shell/res/color/letterbox_restart_dismiss_button_background_ripple.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2023 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:color="@android:color/system_neutral1_900" android:alpha="0.6" /> +</selector>
\ No newline at end of file diff --git a/libs/WindowManager/Shell/res/drawable/letterbox_restart_button_background.xml b/libs/WindowManager/Shell/res/drawable/letterbox_restart_button_background.xml new file mode 100644 index 000000000000..60f3cfe6dde6 --- /dev/null +++ b/libs/WindowManager/Shell/res/drawable/letterbox_restart_button_background.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2023 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" + xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" + android:shape="rectangle"> + <solid android:color="?androidprv:attr/colorAccentPrimaryVariant"/> + <corners android:radius="@dimen/letterbox_restart_dialog_button_radius"/> +</shape>
\ No newline at end of file diff --git a/libs/WindowManager/Shell/res/drawable/letterbox_restart_button_background_ripple.xml b/libs/WindowManager/Shell/res/drawable/letterbox_restart_button_background_ripple.xml new file mode 100644 index 000000000000..ef97ea19e993 --- /dev/null +++ b/libs/WindowManager/Shell/res/drawable/letterbox_restart_button_background_ripple.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2023 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. + --> +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="@color/letterbox_restart_button_background_ripple"> + <item android:drawable="@drawable/letterbox_restart_button_background"/> +</ripple>
\ No newline at end of file diff --git a/libs/WindowManager/Shell/res/drawable/letterbox_restart_checkbox_button.xml b/libs/WindowManager/Shell/res/drawable/letterbox_restart_checkbox_button.xml new file mode 100644 index 000000000000..c247c6e4c8cf --- /dev/null +++ b/libs/WindowManager/Shell/res/drawable/letterbox_restart_checkbox_button.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2023 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_checked="true" + android:drawable="@drawable/letterbox_restart_checkbox_checked" /> + <item android:state_pressed="true" + android:drawable="@drawable/letterbox_restart_checkbox_checked" /> + <item android:state_pressed="false" + android:drawable="@drawable/letterbox_restart_checkbox_unchecked" /> +</selector>
\ No newline at end of file diff --git a/libs/WindowManager/Shell/res/drawable/letterbox_restart_checkbox_checked.xml b/libs/WindowManager/Shell/res/drawable/letterbox_restart_checkbox_checked.xml new file mode 100644 index 000000000000..4f97e2c7ea0d --- /dev/null +++ b/libs/WindowManager/Shell/res/drawable/letterbox_restart_checkbox_checked.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2023 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. + --> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="20dp" + android:height="20dp" + android:viewportWidth="20" + android:viewportHeight="20" + android:tint="?android:attr/textColorSecondary"> + <group + android:scaleX="0.83333333333" + android:scaleY="0.83333333333" + android:translateX="0" + android:translateY="0"> + <path + android:fillColor="?android:attr/textColorSecondary" + android:pathData="M10.6,16.2 L17.65,9.15 16.25,7.75 10.6,13.4 7.75,10.55 6.35,11.95ZM5,21Q4.175,21 3.587,20.413Q3,19.825 3,19V5Q3,4.175 3.587,3.587Q4.175,3 5,3H19Q19.825,3 20.413,3.587Q21,4.175 21,5V19Q21,19.825 20.413,20.413Q19.825,21 19,21Z"/> + </group> +</vector>
\ No newline at end of file diff --git a/libs/WindowManager/Shell/res/drawable/letterbox_restart_checkbox_unchecked.xml b/libs/WindowManager/Shell/res/drawable/letterbox_restart_checkbox_unchecked.xml new file mode 100644 index 000000000000..bb14d1961e81 --- /dev/null +++ b/libs/WindowManager/Shell/res/drawable/letterbox_restart_checkbox_unchecked.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2023 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. + --> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="20dp" + android:height="20dp" + android:viewportWidth="20" + android:viewportHeight="20" + android:tint="?android:attr/textColorSecondary"> + <group + android:scaleX="0.83333333333" + android:scaleY="0.83333333333" + android:translateX="0" + android:translateY="0"> + <path + android:fillColor="?android:attr/textColorSecondary" + android:pathData="M5,21Q4.175,21 3.587,20.413Q3,19.825 3,19V5Q3,4.175 3.587,3.587Q4.175,3 5,3H19Q19.825,3 20.413,3.587Q21,4.175 21,5V19Q21,19.825 20.413,20.413Q19.825,21 19,21ZM5,19H19Q19,19 19,19Q19,19 19,19V5Q19,5 19,5Q19,5 19,5H5Q5,5 5,5Q5,5 5,5V19Q5,19 5,19Q5,19 5,19Z"/> + </group> +</vector>
\ No newline at end of file diff --git a/libs/WindowManager/Shell/res/drawable/letterbox_restart_dialog_background.xml b/libs/WindowManager/Shell/res/drawable/letterbox_restart_dialog_background.xml new file mode 100644 index 000000000000..e3c18a2db66f --- /dev/null +++ b/libs/WindowManager/Shell/res/drawable/letterbox_restart_dialog_background.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2023 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" + xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" + android:shape="rectangle"> + <solid android:color="?androidprv:attr/colorSurface"/> + <corners android:radius="@dimen/letterbox_restart_dialog_corner_radius"/> +</shape>
\ No newline at end of file diff --git a/libs/WindowManager/Shell/res/drawable/letterbox_restart_dismiss_button_background.xml b/libs/WindowManager/Shell/res/drawable/letterbox_restart_dismiss_button_background.xml new file mode 100644 index 000000000000..af89d41ee6b5 --- /dev/null +++ b/libs/WindowManager/Shell/res/drawable/letterbox_restart_dismiss_button_background.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2023 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" + xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" + android:shape="rectangle"> + <stroke android:color="?androidprv:attr/colorAccentPrimaryVariant" android:width="1dp"/> + <solid android:color="?androidprv:attr/colorSurface" /> + <corners android:radius="@dimen/letterbox_restart_dialog_button_radius"/> +</shape>
\ No newline at end of file diff --git a/libs/WindowManager/Shell/res/drawable/letterbox_restart_dismiss_button_background_ripple.xml b/libs/WindowManager/Shell/res/drawable/letterbox_restart_dismiss_button_background_ripple.xml new file mode 100644 index 000000000000..e32aefca78ac --- /dev/null +++ b/libs/WindowManager/Shell/res/drawable/letterbox_restart_dismiss_button_background_ripple.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2023 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. + --> +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="@color/letterbox_restart_dismiss_button_background_ripple"> + <item android:drawable="@drawable/letterbox_restart_dismiss_button_background"/> +</ripple>
\ No newline at end of file diff --git a/libs/WindowManager/Shell/res/drawable/letterbox_restart_header_ic_arrows.xml b/libs/WindowManager/Shell/res/drawable/letterbox_restart_header_ic_arrows.xml new file mode 100644 index 000000000000..5053971a17d3 --- /dev/null +++ b/libs/WindowManager/Shell/res/drawable/letterbox_restart_header_ic_arrows.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2023 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. + --> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" + android:width="@dimen/letterbox_restart_dialog_title_icon_width" + android:height="@dimen/letterbox_restart_dialog_title_icon_height" + android:viewportWidth="45" + android:viewportHeight="44"> + <group + android:scaleX="0.8" + android:scaleY="0.8" + android:translateX="8" + android:translateY="8"> + <path + android:pathData="M0,36V24.5H3V30.85L10.4,23.45L12.55,25.6L5.15,33H11.5V36H0ZM24.5,36V33H30.85L23.5,25.65L25.65,23.5L33,30.85V24.5H36V36H24.5ZM10.35,12.5L3,5.15V11.5H0V0H11.5V3H5.15L12.5,10.35L10.35,12.5ZM25.65,12.5L23.5,10.35L30.85,3H24.5V0H36V11.5H33V5.15L25.65,12.5Z" + android:fillColor="?androidprv:attr/colorAccentPrimaryVariant"/> + </group> +</vector>
\ No newline at end of file diff --git a/libs/WindowManager/Shell/res/drawable/letterbox_restart_ic_arrows.xml b/libs/WindowManager/Shell/res/drawable/letterbox_restart_ic_arrows.xml new file mode 100644 index 000000000000..b6e0172af1df --- /dev/null +++ b/libs/WindowManager/Shell/res/drawable/letterbox_restart_ic_arrows.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2022 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. + --> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="@dimen/letterbox_restart_dialog_title_icon_width" + android:height="@dimen/letterbox_restart_dialog_title_icon_height" + android:viewportWidth="45" + android:viewportHeight="44"> + <group + android:scaleX="0.8" + android:scaleY="0.8" + android:translateX="8" + android:translateY="8"> + <path + android:pathData="M0,36V24.5H3V30.85L10.4,23.45L12.55,25.6L5.15,33H11.5V36H0ZM24.5,36V33H30.85L23.5,25.65L25.65,23.5L33,30.85V24.5H36V36H24.5ZM10.35,12.5L3,5.15V11.5H0V0H11.5V3H5.15L12.5,10.35L10.35,12.5ZM25.65,12.5L23.5,10.35L30.85,3H24.5V0H36V11.5H33V5.15L25.65,12.5Z" + android:fillColor="@color/compat_controls_text"/> + </group> +</vector>
\ No newline at end of file diff --git a/libs/WindowManager/Shell/res/layout/letterbox_restart_dialog_layout.xml b/libs/WindowManager/Shell/res/layout/letterbox_restart_dialog_layout.xml new file mode 100644 index 000000000000..ba9852c4dd6b --- /dev/null +++ b/libs/WindowManager/Shell/res/layout/letterbox_restart_dialog_layout.xml @@ -0,0 +1,142 @@ +<!-- + ~ Copyright (C) 2023 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. + --> +<com.android.wm.shell.compatui.RestartDialogLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@android:color/system_neutral1_900"> + + <!-- The background of the top-level layout acts as the background dim. --> + + <!--TODO (b/266288912): Resolve overdraw warning --> + + <!-- Vertical margin will be set dynamically since it depends on task bounds. + Setting the alpha of the dialog container to 0, since it shouldn't be visible until the + enter animation starts. --> + <FrameLayout + android:id="@+id/letterbox_restart_dialog_container" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginHorizontal="@dimen/letterbox_restart_dialog_margin" + android:background="@drawable/letterbox_restart_dialog_background" + android:alpha="0" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintWidth_max="@dimen/letterbox_restart_dialog_width"> + + <!-- The ScrollView should only wrap the content of the dialog, otherwise the background + corner radius will be cut off when scrolling to the top/bottom. --> + + <ScrollView android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <LinearLayout + android:padding="24dp" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_horizontal" + android:orientation="vertical"> + + <ImageView + android:importantForAccessibility="no" + android:layout_width="@dimen/letterbox_restart_dialog_title_icon_width" + android:layout_height="@dimen/letterbox_restart_dialog_title_icon_height" + android:src="@drawable/letterbox_restart_header_ic_arrows"/> + + <TextView + android:layout_marginVertical="16dp" + android:id="@+id/letterbox_restart_dialog_title" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/letterbox_restart_dialog_title" + android:textAlignment="center" + android:textAppearance="@style/RestartDialogTitleText"/> + + <TextView + android:textAppearance="@style/RestartDialogBodyText" + android:id="@+id/letterbox_restart_dialog_description" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/letterbox_restart_dialog_description" + android:textAlignment="center"/> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:layout_gravity="center_vertical" + android:layout_marginVertical="32dp"> + + <CheckBox + android:id="@+id/letterbox_restart_dialog_checkbox" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:button="@drawable/letterbox_restart_checkbox_button"/> + + <TextView + android:textAppearance="@style/RestartDialogCheckboxText" + android:layout_marginStart="12dp" + android:id="@+id/letterbox_restart_dialog_checkbox_description" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/letterbox_restart_dialog_checkbox_title" + android:textAlignment="textStart"/> + + </LinearLayout> + + <FrameLayout + android:minHeight="@dimen/letterbox_restart_dialog_button_height" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <Button + android:textAppearance="@style/RestartDialogDismissButton" + android:id="@+id/letterbox_restart_dialog_dismiss_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:minWidth="@dimen/letterbox_restart_dialog_button_width" + android:minHeight="@dimen/letterbox_restart_dialog_button_height" + android:layout_gravity="start" + android:background= + "@drawable/letterbox_restart_dismiss_button_background_ripple" + android:text="@string/letterbox_restart_cancel" + android:contentDescription="@string/letterbox_restart_cancel"/> + + <Button + android:textAppearance="@style/RestartDialogConfirmButton" + android:id="@+id/letterbox_restart_dialog_restart_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:minWidth="@dimen/letterbox_restart_dialog_button_width" + android:minHeight="@dimen/letterbox_restart_dialog_button_height" + android:layout_gravity="end" + android:background= + "@drawable/letterbox_restart_button_background_ripple" + android:text="@string/letterbox_restart_restart" + android:contentDescription="@string/letterbox_restart_restart"/> + + </FrameLayout> + + </LinearLayout> + + </ScrollView> + + </FrameLayout> + +</com.android.wm.shell.compatui.RestartDialogLayout>
\ No newline at end of file diff --git a/libs/WindowManager/Shell/res/values/dimen.xml b/libs/WindowManager/Shell/res/values/dimen.xml index 3ee20ea95ee5..a1da64945845 100644 --- a/libs/WindowManager/Shell/res/values/dimen.xml +++ b/libs/WindowManager/Shell/res/values/dimen.xml @@ -273,6 +273,39 @@ <!-- The space between two actions in the letterbox education dialog --> <dimen name="letterbox_education_dialog_space_between_actions">24dp</dimen> + <!-- The margin between the dialog container and its parent. --> + <dimen name="letterbox_restart_dialog_margin">24dp</dimen> + + <!-- The corner radius of the restart confirmation dialog. --> + <dimen name="letterbox_restart_dialog_corner_radius">28dp</dimen> + + <!-- The fixed width of the dialog if there is enough space in the parent. --> + <dimen name="letterbox_restart_dialog_width">348dp</dimen> + + <!-- The width of the top icon in the restart confirmation dialog. --> + <dimen name="letterbox_restart_dialog_title_icon_width">32dp</dimen> + + <!-- The height of the top icon in the restart confirmation dialog. --> + <dimen name="letterbox_restart_dialog_title_icon_height">32dp</dimen> + + <!-- The width of an icon in the restart confirmation dialog. --> + <dimen name="letterbox_restart_dialog_icon_width">40dp</dimen> + + <!-- The height of an icon in the restart confirmation dialog. --> + <dimen name="letterbox_restart_dialog_icon_height">32dp</dimen> + + <!-- The space between two actions in the restart confirmation dialog --> + <dimen name="letterbox_restart_dialog_space_between_actions">24dp</dimen> + + <!-- The width of the buttons in the restart dialog --> + <dimen name="letterbox_restart_dialog_button_width">82dp</dimen> + + <!-- The width of the buttons in the restart dialog --> + <dimen name="letterbox_restart_dialog_button_height">36dp</dimen> + + <!-- The corner radius of the buttons in the restart dialog --> + <dimen name="letterbox_restart_dialog_button_radius">18dp</dimen> + <!-- The width of the brand image on staring surface. --> <dimen name="starting_surface_brand_image_width">200dp</dimen> diff --git a/libs/WindowManager/Shell/res/values/strings.xml b/libs/WindowManager/Shell/res/values/strings.xml index 25eddf834f3d..250dac6cbaee 100644 --- a/libs/WindowManager/Shell/res/values/strings.xml +++ b/libs/WindowManager/Shell/res/values/strings.xml @@ -188,6 +188,23 @@ <!-- Accessibility description of the letterbox education toast expand to dialog button. [CHAR LIMIT=NONE] --> <string name="letterbox_education_expand_button_description">Expand for more information.</string> + <!-- The title of the restart confirmation dialog. [CHAR LIMIT=NONE] --> + <string name="letterbox_restart_dialog_title">Restart for a better view?</string> + + <!-- The description of the restart confirmation dialog. [CHAR LIMIT=NONE] --> + <string name="letterbox_restart_dialog_description">You can restart the app so it looks better on + your screen, but you may lose your progress or any unsaved changes + </string> + + <!-- Button text for dismissing the restart confirmation dialog. [CHAR LIMIT=20] --> + <string name="letterbox_restart_cancel">Cancel</string> + + <!-- Button text for dismissing the restart confirmation dialog. [CHAR LIMIT=20] --> + <string name="letterbox_restart_restart">Restart</string> + + <!-- Checkbox text for asking to not show the restart confirmation dialog again. [CHAR LIMIT=NONE] --> + <string name="letterbox_restart_dialog_checkbox_title">Don\u2019t show again</string> + <!-- Freeform window caption strings --> <!-- Accessibility text for the maximize window button [CHAR LIMIT=NONE] --> <string name="maximize_button_text">Maximize</string> diff --git a/libs/WindowManager/Shell/res/values/styles.xml b/libs/WindowManager/Shell/res/values/styles.xml index a8597210d72e..e8f340cdd066 100644 --- a/libs/WindowManager/Shell/res/values/styles.xml +++ b/libs/WindowManager/Shell/res/values/styles.xml @@ -63,4 +63,42 @@ <item name="android:lineHeight">16sp</item> <item name="android:textColor">@color/tv_pip_edu_text</item> </style> + + <style name="RestartDialogTitleText"> + <item name="android:textSize">24sp</item> + <item name="android:textColor">?android:attr/textColorPrimary</item> + <item name="android:lineSpacingExtra">2sp</item> + <item name="android:textAppearance"> + @*android:style/TextAppearance.DeviceDefault.Headline + </item> + </style> + + <style name="RestartDialogBodyText"> + <item name="android:textSize">14sp</item> + <item name="android:letterSpacing">0.02</item> + <item name="android:textColor">?android:attr/textColorSecondary</item> + <item name="android:lineSpacingExtra">2sp</item> + <item name="android:textAppearance"> + @*android:style/TextAppearance.DeviceDefault.Body2 + </item> + </style> + + <style name="RestartDialogCheckboxText"> + <item name="android:textSize">16sp</item> + <item name="android:textColor">?android:attr/textColorPrimary</item> + <item name="android:lineSpacingExtra">4sp</item> + <item name="android:textAppearance">@*android:style/TextAppearance.DeviceDefault</item> + </style> + + <style name="RestartDialogDismissButton"> + <item name="android:lineSpacingExtra">2sp</item> + <item name="android:textSize">14sp</item> + <item name="android:textColor">?android:attr/textColorPrimary</item> + </style> + + <style name="RestartDialogConfirmButton"> + <item name="android:lineSpacingExtra">2sp</item> + <item name="android:textSize">14sp</item> + <item name="android:textColor">?android:attr/textColorPrimaryInverse</item> + </style> </resources> |