From 217b286ad5eb04084ab82e870d90a5d1809b3a28 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 02 八月 2017 11:17:46 +0800
Subject: [PATCH] split client server
---
VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/values-v11/values-v11.xml | 46 ++++++++--------------------------------------
1 files changed, 8 insertions(+), 38 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/values-v11/values-v11.xml b/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/values-v11/values-v11.xml
index 35a2c7a..d074ce9 100644
--- a/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/values-v11/values-v11.xml
+++ b/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/values-v11/values-v11.xml
@@ -37,39 +37,13 @@
<item name="android:textColorLink">?android:attr/textColorLinkInverse</item>
</style>
<style name="Base.Theme.AppCompat.Dialog" parent="Base.V11.Theme.AppCompat.Dialog"/>
- <style name="Base.Theme.AppCompat.Dialog.Alert">
- <item name="android:windowMinWidthMajor">@dimen/abc_dialog_min_width_major</item>
- <item name="android:windowMinWidthMinor">@dimen/abc_dialog_min_width_minor</item>
- </style>
- <style name="Base.Theme.AppCompat.Dialog.MinWidth">
- <item name="android:windowMinWidthMajor">@dimen/abc_dialog_min_width_major</item>
- <item name="android:windowMinWidthMinor">@dimen/abc_dialog_min_width_minor</item>
- </style>
<style name="Base.Theme.AppCompat.Light.Dialog" parent="Base.V11.Theme.AppCompat.Light.Dialog"/>
- <style name="Base.Theme.AppCompat.Light.Dialog.Alert">
- <item name="android:windowMinWidthMajor">@dimen/abc_dialog_min_width_major</item>
- <item name="android:windowMinWidthMinor">@dimen/abc_dialog_min_width_minor</item>
- </style>
- <style name="Base.Theme.AppCompat.Light.Dialog.MinWidth">
- <item name="android:windowMinWidthMajor">@dimen/abc_dialog_min_width_major</item>
- <item name="android:windowMinWidthMinor">@dimen/abc_dialog_min_width_minor</item>
- </style>
- <style name="Base.ThemeOverlay.AppCompat.Dialog" parent="Base.V11.ThemeOverlay.AppCompat.Dialog"/>
- <style name="Base.ThemeOverlay.AppCompat.Dialog.Alert">
- <item name="android:windowMinWidthMajor">@dimen/abc_dialog_min_width_major</item>
- <item name="android:windowMinWidthMinor">@dimen/abc_dialog_min_width_minor</item>
- </style>
<style name="Base.V11.Theme.AppCompat.Dialog" parent="Base.V7.Theme.AppCompat.Dialog">
<item name="android:buttonBarStyle">@style/Widget.AppCompat.ButtonBar.AlertDialog</item>
<item name="android:borderlessButtonStyle">@style/Widget.AppCompat.Button.Borderless</item>
<item name="android:windowCloseOnTouchOutside">@bool/abc_config_closeDialogWhenTouchOutside</item>
</style>
<style name="Base.V11.Theme.AppCompat.Light.Dialog" parent="Base.V7.Theme.AppCompat.Light.Dialog">
- <item name="android:buttonBarStyle">@style/Widget.AppCompat.ButtonBar.AlertDialog</item>
- <item name="android:borderlessButtonStyle">@style/Widget.AppCompat.Button.Borderless</item>
- <item name="android:windowCloseOnTouchOutside">@bool/abc_config_closeDialogWhenTouchOutside</item>
- </style>
- <style name="Base.V11.ThemeOverlay.AppCompat.Dialog" parent="Base.V7.ThemeOverlay.AppCompat.Dialog">
<item name="android:buttonBarStyle">@style/Widget.AppCompat.ButtonBar.AlertDialog</item>
<item name="android:borderlessButtonStyle">@style/Widget.AppCompat.Button.Borderless</item>
<item name="android:windowCloseOnTouchOutside">@bool/abc_config_closeDialogWhenTouchOutside</item>
@@ -86,6 +60,8 @@
<item name="android:buttonBarStyle">?attr/buttonBarStyle</item>
<item name="android:buttonBarButtonStyle">?attr/buttonBarButtonStyle</item>
+
+ <item name="selectableItemBackground">?android:attr/selectableItemBackground</item>
<!-- Window colors -->
<item name="android:colorForeground">@color/foreground_material_dark</item>
@@ -104,8 +80,8 @@
<item name="android:textColorSecondaryInverse">@color/abc_secondary_text_material_light</item>
<item name="android:textColorTertiary">@color/abc_secondary_text_material_dark</item>
<item name="android:textColorTertiaryInverse">@color/abc_secondary_text_material_light</item>
- <item name="android:textColorHint">@color/abc_hint_foreground_material_dark</item>
- <item name="android:textColorHintInverse">@color/abc_hint_foreground_material_light</item>
+ <item name="android:textColorHint">@color/hint_foreground_material_dark</item>
+ <item name="android:textColorHintInverse">@color/hint_foreground_material_light</item>
<item name="android:textColorHighlight">@color/highlighted_text_material_dark</item>
<item name="android:textColorHighlightInverse">@color/highlighted_text_material_light</item>
<item name="android:textColorLink">?attr/colorAccent</item>
@@ -128,10 +104,6 @@
<item name="android:actionModeCutDrawable">?actionModeCutDrawable</item>
<item name="android:actionModeCopyDrawable">?actionModeCopyDrawable</item>
<item name="android:actionModePasteDrawable">?actionModePasteDrawable</item>
-
- <item name="android:textSelectHandle">@drawable/abc_text_select_handle_middle_mtrl_dark</item>
- <item name="android:textSelectHandleLeft">@drawable/abc_text_select_handle_left_mtrl_dark</item>
- <item name="android:textSelectHandleRight">@drawable/abc_text_select_handle_right_mtrl_dark</item>
</style>
<style name="Platform.V11.AppCompat.Light" parent="android:Theme.Holo.Light">
<item name="android:windowNoTitle">true</item>
@@ -139,6 +111,8 @@
<item name="android:buttonBarStyle">?attr/buttonBarStyle</item>
<item name="android:buttonBarButtonStyle">?attr/buttonBarButtonStyle</item>
+
+ <item name="selectableItemBackground">?android:attr/selectableItemBackground</item>
<!-- Window colors -->
<item name="android:colorForeground">@color/foreground_material_light</item>
@@ -158,8 +132,8 @@
<item name="android:textColorTertiaryInverse">@color/abc_secondary_text_material_dark</item>
<item name="android:textColorPrimaryDisableOnly">@color/abc_primary_text_disable_only_material_light</item>
<item name="android:textColorPrimaryInverseDisableOnly">@color/abc_primary_text_disable_only_material_dark</item>
- <item name="android:textColorHint">@color/abc_hint_foreground_material_light</item>
- <item name="android:textColorHintInverse">@color/abc_hint_foreground_material_dark</item>
+ <item name="android:textColorHint">@color/hint_foreground_material_light</item>
+ <item name="android:textColorHintInverse">@color/hint_foreground_material_dark</item>
<item name="android:textColorHighlight">@color/highlighted_text_material_light</item>
<item name="android:textColorHighlightInverse">@color/highlighted_text_material_dark</item>
<item name="android:textColorLink">?attr/colorAccent</item>
@@ -182,10 +156,6 @@
<item name="android:actionModeCutDrawable">?actionModeCutDrawable</item>
<item name="android:actionModeCopyDrawable">?actionModeCopyDrawable</item>
<item name="android:actionModePasteDrawable">?actionModePasteDrawable</item>
-
- <item name="android:textSelectHandle">@drawable/abc_text_select_handle_middle_mtrl_light</item>
- <item name="android:textSelectHandleLeft">@drawable/abc_text_select_handle_left_mtrl_light</item>
- <item name="android:textSelectHandleRight">@drawable/abc_text_select_handle_right_mtrl_light</item>
</style>
<style name="Platform.Widget.AppCompat.Spinner" parent="android:Widget.Holo.Spinner"/>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0