DEV/material-components_material-components-android
1
0
Fork 0
mirror of https://github.com/material-components/material-components-android.git synced 2026-02-20 08:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automated g4 rollback of changelist 169728741

Browse Source 
PiperOrigin-RevId: 169968826
This commit is contained in:
markwei 2017-09-25 18:15:18 -04:00 committed by Daniel Nizri
parent 201b67bb20
commit 25601df274
7 changed files with 30 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
lib/res/values-land/styles_design.xml → lib/res/values-land/styles.xml
View File

0
lib/res/values-sw600dp/styles_design.xml → lib/res/values-sw600dp/styles.xml
View File

0
lib/res/values-v21/styles_design.xml → lib/res/values-v21/styles.xml
View File

6
lib/res/values/styles_design.xml → lib/res/values/styles.xml
View File

@ -157,4 +157,10 @@
<item name="behavior_skipCollapsed">false</item>
</style>
<style name="Widget.MaterialComponents.FloatingActionButton" parent="Widget.Design.FloatingActionButton">
<item name="elevation">@dimen/mtrl_fab_elevation</item>
<item name="hoveredFocusedTranslationZ">@dimen/mtrl_fab_translation_z_hovered_focused</item>
<item name="pressedTranslationZ">@dimen/mtrl_fab_translation_z_pressed</item>
</style>
</resources>

26
lib/res/values/styles_mtrl.xml
View File

@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2017 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>
<style name="Widget.MaterialComponents.FloatingActionButton" parent="Widget.Design.FloatingActionButton">
<item name="elevation">@dimen/mtrl_fab_elevation</item>
<item name="hoveredFocusedTranslationZ">@dimen/mtrl_fab_translation_z_hovered_focused</item>
<item name="pressedTranslationZ">@dimen/mtrl_fab_translation_z_pressed</item>
</style>
</resources>

24
lib/res/values/themes_mtrl.xml → lib/res/values/themes.xml
View File

@ -120,4 +120,28 @@
<style name="ThemeOverlay.MaterialComponents.Dialog.Alert" parent="ThemeOverlay.AppCompat.Dialog.Alert"/>
<!-- Deprecated. Use Theme.MaterialComponents.BottomSheetDialog instead. -->
<style name="Theme.Design.BottomSheetDialog" parent="Theme.MaterialComponents.BottomSheetDialog">
</style>
<!-- Deprecated. Use Theme.MaterialComponents.BottomSheetDialog instead. -->
<style name="Theme.Design.Light.BottomSheetDialog" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
</style>
<!-- Deprecated. Use Theme.MaterialComponents instead. -->
<style name="Theme.Design" parent="Theme.MaterialComponents">
</style>
<!-- Deprecated. Use Theme.MaterialComponents.Light instead. -->
<style name="Theme.Design.Light" parent="Theme.MaterialComponents.Light">
</style>
<!-- Deprecated. Use Theme.MaterialComponents.NoActionBar instead. -->
<style name="Theme.Design.NoActionBar" parent="Theme.MaterialComponents.NoActionBar">
</style>
<!-- Deprecated. Use Theme.MaterialComponents.Light.NoActionBar instead. -->
<style name="Theme.Design.Light.NoActionBar" parent="Theme.MaterialComponents.Light.NoActionBar">
</style>
</resources>

52
lib/res/values/themes_design.xml
View File

@ -1,52 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2017 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>
<!-- Themes in the "Theme.Design" family are legacy M1 themes. -->
<style name="Theme.Design.BottomSheetDialog" parent="Theme.AppCompat.Dialog">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowAnimationStyle">@style/Animation.Design.BottomSheetDialog</item>
<item name="bottomSheetStyle">@style/Widget.Design.BottomSheet.Modal</item>
</style>
<style name="Theme.Design.Light.BottomSheetDialog" parent="Theme.AppCompat.Light.Dialog">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowAnimationStyle">@style/Animation.Design.BottomSheetDialog</item>
<item name="bottomSheetStyle">@style/Widget.Design.BottomSheet.Modal</item>
</style>
<style name="Theme.Design" parent="Theme.AppCompat">
<item name="colorError">@color/error_color_material</item>
</style>
<style name="Theme.Design.Light" parent="Theme.AppCompat.Light">
<item name="colorError">@color/error_color_material</item>
</style>
<style name="Theme.Design.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="Theme.Design.Light.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
</resources>