Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5d15b99d: Merge "Add dialog shadows"

Browse Source 
* commit '5d15b99d7a2b553a10009d3bb333a0d3421340b6':
  Add dialog shadows
This commit is contained in:
Alan Viverette
2014-04-28 01:17:28 +00:00
committed by Android Git Automerger
parent 98e6d27586 6f395df730
commit e81af10df2
6 changed files with 42 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/res/res/drawable/btn_borderless_quantum.xml
View File

@@ -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>

25
core/res/res/drawable/dialog_background_quantum.xml Normal file
View File

@@ -0,0 +1,25 @@
<?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>

5
core/res/res/layout/alert_dialog_quantum.xml
View File

@@ -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"

2
core/res/res/values/dimens_quantum.xml
View File

@@ -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>

20
core/res/res/values/styles_quantum.xml
View File

@@ -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>

7
core/res/res/values/themes_quantum.xml
View File

@@ -898,7 +898,7 @@ please see themes_device_defaults.xml.
<style name="Theme.Quantum.Dialog">
<item name="windowFrame">@null</item>
<item name="windowTitleStyle">@style/DialogWindowTitle.Quantum</item>
<item name="windowBackground">?attr/colorBackground</item>
<item name="windowBackground">@drawable/dialog_background_quantum</item>
<item name="windowIsFloating">true</item>
<item name="windowContentOverlay">@null</item>
<item name="windowAnimationStyle">@style/Animation.Quantum.Dialog</item>
@@ -964,8 +964,6 @@ please see themes_device_defaults.xml.
its pixels. -->
<style name="Theme.Quantum.Dialog.NoFrame">
<item name="windowBackground">@color/transparent</item>
<item name="windowFrame">@null</item>
<item name="windowContentOverlay">@null</item>
<item name="windowAnimationStyle">@null</item>
<item name="backgroundDimEnabled">false</item>
<item name="windowIsTranslucent">true</item>
@@ -981,7 +979,6 @@ please see themes_device_defaults.xml.
<style name="Theme.Quantum.Dialog.Alert">
<item name="windowBackground">@color/transparent</item>
<item name="windowTitleStyle">@style/DialogWindowTitle.Quantum</item>
<item name="windowContentOverlay">@null</item>
<item name="windowMinWidthMajor">@dimen/dialog_min_width_major</item>
<item name="windowMinWidthMinor">@dimen/dialog_min_width_minor</item>
</style>
@@ -1102,7 +1099,6 @@ please see themes_device_defaults.xml.
<style name="Theme.Quantum.Light.Dialog.Alert">
<item name="windowBackground">@color/transparent</item>
<item name="windowTitleStyle">@style/DialogWindowTitle.Quantum.Light</item>
<item name="windowContentOverlay">@null</item>
<item name="windowMinWidthMajor">@dimen/dialog_min_width_major</item>
<item name="windowMinWidthMinor">@dimen/dialog_min_width_minor</item>
</style>
@@ -1112,7 +1108,6 @@ please see themes_device_defaults.xml.
<style name="Theme.Quantum.Light.Dialog.TimePicker">
<item name="windowBackground">@color/transparent</item>
<item name="windowTitleStyle">@style/DialogWindowTitle.Quantum.Light</item>
<item name="windowContentOverlay">@null</item>
</style>
<!-- Theme for a presentation window on a secondary display. -->