Merge "Removed unwanted shadow in restart and letterbox education dialogs" into tm-qpr-dev am: e20f816446
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21408602 Change-Id: Iab6edd42696efa917cea20c2e5dc94ad1c4d270a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Massimo Carli
@@ -1,21 +0,0 @@
|
||||
<?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.
|
||||
-->
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid android:color="@color/letterbox_education_accent_primary"/>
|
||||
<corners android:radius="12dp"/>
|
||||
</shape>
|
||||
@@ -14,7 +14,30 @@
|
||||
~ 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_education_dismiss_button_background_ripple">
|
||||
<item android:drawable="@drawable/letterbox_education_dismiss_button_background"/>
|
||||
</ripple>
|
||||
<inset xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:insetTop="@dimen/letterbox_education_dialog_vertical_inset"
|
||||
android:insetBottom="@dimen/letterbox_education_dialog_vertical_inset">
|
||||
<ripple android:color="@color/letterbox_education_dismiss_button_background_ripple">
|
||||
<item android:id="@android:id/mask">
|
||||
<shape android:shape="rectangle">
|
||||
<corners android:radius="@dimen/letterbox_education_dialog_button_radius"/>
|
||||
<solid android:color="@android:color/white"/>
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@android:color/transparent"/>
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/letterbox_education_accent_primary"/>
|
||||
<corners android:radius="@dimen/letterbox_education_dialog_button_radius"/>
|
||||
<padding android:left="@dimen/letterbox_education_dialog_horizontal_padding"
|
||||
android:top="@dimen/letterbox_education_dialog_vertical_padding"
|
||||
android:right="@dimen/letterbox_education_dialog_horizontal_padding"
|
||||
android:bottom="@dimen/letterbox_education_dialog_vertical_padding"/>
|
||||
</shape>
|
||||
</item>
|
||||
</ripple>
|
||||
</inset>
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
<?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>
|
||||
@@ -14,7 +14,31 @@
|
||||
~ 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>
|
||||
<inset xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
|
||||
android:insetTop="@dimen/letterbox_restart_dialog_vertical_inset"
|
||||
android:insetBottom="@dimen/letterbox_restart_dialog_vertical_inset">
|
||||
<ripple android:color="@color/letterbox_restart_dismiss_button_background_ripple">
|
||||
<item android:id="@android:id/mask">
|
||||
<shape android:shape="rectangle">
|
||||
<corners android:radius="@dimen/letterbox_restart_dialog_button_radius"/>
|
||||
<solid android:color="@android:color/white"/>
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@android:color/transparent"/>
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="?androidprv:attr/colorAccentPrimaryVariant"/>
|
||||
<corners android:radius="@dimen/letterbox_restart_dialog_button_radius"/>
|
||||
<padding android:left="@dimen/letterbox_restart_dialog_horizontal_padding"
|
||||
android:top="@dimen/letterbox_restart_dialog_vertical_padding"
|
||||
android:right="@dimen/letterbox_restart_dialog_horizontal_padding"
|
||||
android:bottom="@dimen/letterbox_restart_dialog_vertical_padding"/>
|
||||
</shape>
|
||||
</item>
|
||||
</ripple>
|
||||
</inset>
|
||||
@@ -1,23 +0,0 @@
|
||||
<?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>
|
||||
@@ -14,7 +14,33 @@
|
||||
~ 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>
|
||||
<inset xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
|
||||
android:insetTop="@dimen/letterbox_restart_dialog_vertical_inset"
|
||||
android:insetBottom="@dimen/letterbox_restart_dialog_vertical_inset">
|
||||
<ripple android:color="@color/letterbox_restart_dismiss_button_background_ripple">
|
||||
<item android:id="@android:id/mask">
|
||||
<shape android:shape="rectangle">
|
||||
<corners android:radius="@dimen/letterbox_restart_dialog_button_radius"/>
|
||||
<solid android:color="@android:color/white"/>
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@android:color/transparent"/>
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape 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"/>
|
||||
<padding android:left="@dimen/letterbox_restart_dialog_horizontal_padding"
|
||||
android:top="@dimen/letterbox_restart_dialog_vertical_padding"
|
||||
android:right="@dimen/letterbox_restart_dialog_horizontal_padding"
|
||||
android:bottom="@dimen/letterbox_restart_dialog_vertical_padding"/>
|
||||
</shape>
|
||||
</item>
|
||||
</ripple>
|
||||
</inset>
|
||||
@@ -273,6 +273,18 @@
|
||||
<!-- The space between two actions in the letterbox education dialog -->
|
||||
<dimen name="letterbox_education_dialog_space_between_actions">24dp</dimen>
|
||||
|
||||
<!-- The corner radius of the buttons in the letterbox education dialog -->
|
||||
<dimen name="letterbox_education_dialog_button_radius">12dp</dimen>
|
||||
|
||||
<!-- The horizontal padding for the buttons in the letterbox education dialog -->
|
||||
<dimen name="letterbox_education_dialog_horizontal_padding">16dp</dimen>
|
||||
|
||||
<!-- The vertical padding for the buttons in the letterbox education dialog -->
|
||||
<dimen name="letterbox_education_dialog_vertical_padding">8dp</dimen>
|
||||
|
||||
<!-- The insets for the buttons in the letterbox education dialog -->
|
||||
<dimen name="letterbox_education_dialog_vertical_inset">6dp</dimen>
|
||||
|
||||
<!-- The margin between the dialog container and its parent. -->
|
||||
<dimen name="letterbox_restart_dialog_margin">24dp</dimen>
|
||||
|
||||
@@ -306,6 +318,15 @@
|
||||
<!-- The corner radius of the buttons in the restart dialog -->
|
||||
<dimen name="letterbox_restart_dialog_button_radius">18dp</dimen>
|
||||
|
||||
<!-- The insets for the buttons in the letterbox restart dialog -->
|
||||
<dimen name="letterbox_restart_dialog_vertical_inset">6dp</dimen>
|
||||
|
||||
<!-- The horizontal padding for the buttons in the letterbox restart dialog -->
|
||||
<dimen name="letterbox_restart_dialog_horizontal_padding">16dp</dimen>
|
||||
|
||||
<!-- The vertical padding for the buttons in the letterbox restart dialog -->
|
||||
<dimen name="letterbox_restart_dialog_vertical_padding">8dp</dimen>
|
||||
|
||||
<!-- The width of the brand image on staring surface. -->
|
||||
<dimen name="starting_surface_brand_image_width">200dp</dimen>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user