Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f395df7 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Add dialog shadows"

parents 1c923a38 6ce97593

core/res/res/drawable/btn_borderless_quantum.xml

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android"

    android:tint="?attr/colorButtonPressed">

    <item android:drawable="@color/transparent" />

    <item android:id="@id/mask"

        android:drawable="@drawable/btn_qntm_alpha" />

</touch-feedback>

core/res/res/drawable/dialog_background_quantum.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2014 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="2dp" />

    <solid

        android:color="?attr/colorBackground" />



</shape>

core/res/res/layout/alert_dialog_quantum.xml

+4 −1
Original line number Diff line number Diff line
@@ -20,7 +20,10 @@ 
    android:id="@+id/parentPanel"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical">

    android:orientation="vertical"

    android:background="@drawable/dialog_background_quantum"

    android:translationZ="@dimen/floating_window_z"

    android:layout_margin="@dimen/floating_window_margin">



    <LinearLayout android:id="@+id/topPanel"

        android:layout_width="match_parent"

core/res/res/values/dimens_quantum.xml

+2 −0
Original line number Diff line number Diff line
@@ -47,4 +47,6 @@ 
    <dimen name="text_size_menu_quantum">14sp</dimen>

    <dimen name="text_size_button_quantum">14sp</dimen>



    <dimen name="floating_window_z">16dp</dimen>

    <dimen name="floating_window_margin">32dp</dimen>

</resources>

core/res/res/values/styles_quantum.xml

+10 −10
Original line number Diff line number Diff line
@@ -1019,16 +1019,16 @@ please see styles_device_defaults.xml. 
    <!-- Dialog styles -->



    <style name="AlertDialog.Quantum" parent="AlertDialog">

        <item name="fullDark">?attr/colorBackground</item>

        <item name="topDark">?attr/colorBackground</item>

        <item name="centerDark">?attr/colorBackground</item>

        <item name="bottomDark">?attr/colorBackground</item>

        <item name="fullBright">?attr/colorBackground</item>

        <item name="topBright">?attr/colorBackground</item>

        <item name="centerBright">?attr/colorBackground</item>

        <item name="bottomBright">?attr/colorBackground</item>

        <item name="bottomMedium">?attr/colorBackground</item>

        <item name="centerMedium">?attr/colorBackground</item>

        <item name="fullDark">@color/transparent</item>

        <item name="topDark">@color/transparent</item>

        <item name="centerDark">@color/transparent</item>

        <item name="bottomDark">@color/transparent</item>

        <item name="fullBright">@color/transparent</item>

        <item name="topBright">@color/transparent</item>

        <item name="centerBright">@color/transparent</item>

        <item name="bottomBright">@color/transparent</item>

        <item name="bottomMedium">@color/transparent</item>

        <item name="centerMedium">@color/transparent</item>

        <item name="layout">@layout/alert_dialog_quantum</item>

        <item name="listLayout">@layout/select_dialog_quantum</item>

        <item name="progressLayout">@layout/progress_dialog_quantum</item>