From 80faceb86399017851f9f72feaaef868a37ff23f Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期五, 26 三月 2021 10:50:35 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/lss' into temp-wxr --- HDL-ON_Android/Resources/values/styles.xml | 58 +++++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 37 insertions(+), 21 deletions(-) diff --git a/HDL-ON_Android/Resources/values/styles.xml b/HDL-ON_Android/Resources/values/styles.xml index 0c9d062..febc1ce 100644 --- a/HDL-ON_Android/Resources/values/styles.xml +++ b/HDL-ON_Android/Resources/values/styles.xml @@ -1,24 +1,40 @@ <?xml version="1.0" encoding="UTF-8"?> <resources> - <!-- 鍏朵腑parent鍙互涓� android:Theme 鎴� android:Theme.NoTitleBar; android:windowBackground鍙互涓鸿儗鏅浘 --> - <style name="MyTheme" parent="@android:style/Theme.NoTitleBar.Fullscreen"> - <item name="android:windowBackground">@drawable/Loading</item> - <!-- 闅愯棌鐘舵�佹爮 --> - <item name="android:windowFullscreen">false</item> - <!-- 闅愯棌鏍囬鏍� --> - <item name="android:windowNoTitle">true</item> - <item name="android:windowTranslucentStatus">true</item> - </style> - - <style name="MyDialogStyle"> - <item name="android:windowBackground">@android:color/transparent</item> - <item name="android:windowFrame">@null</item> - <item name="android:windowNoTitle">true</item> - <item name="android:windowIsFloating">true</item> - <item name="android:windowIsTranslucent">true</item> - <item name="android:windowContentOverlay">@null</item> - <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item> - <item name="android:backgroundDimEnabled">true</item> - </style> - + <!-- 鍏朵腑parent鍙互涓� android:Theme 鎴� android:Theme.NoTitleBar; android:windowBackground鍙互涓鸿儗鏅浘 --> + <style name="MyTheme" parent="@android:style/Theme.NoTitleBar.Fullscreen"> + <item name="android:windowBackground">@drawable/Loading</item> + <!-- 闅愯棌鐘舵�佹爮 --> + <item name="android:windowFullscreen">false</item> + <!-- 闅愯棌鏍囬鏍� --> + <item name="android:windowNoTitle">true</item> + <item name="android:windowTranslucentStatus">true</item> + </style> + <style name="MyDialogStyle"> + <item name="android:windowBackground">@android:color/transparent</item> + <item name="android:windowFrame">@null</item> + <item name="android:windowNoTitle">true</item> + <item name="android:windowIsFloating">true</item> + <item name="android:windowIsTranslucent">true</item> + <item name="android:windowContentOverlay">@null</item> + <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item> + <item name="android:backgroundDimEnabled">true</item> + </style> + <style name="DialogTheme" parent="@android:style/Theme.Dialog"> + <!-- 鑳屾櫙棰滆壊鍙婂拰閫忔槑绋嬪害 --> + <item name="android:windowBackground">@android:color/transparent</item> + <!-- 鏄惁鍘婚櫎鏍囬 --> + <item name="android:windowNoTitle">true</item> + <!-- 鏄惁鍘婚櫎杈规 --> + <item name="android:windowFrame">@null</item> + <!-- 鏄惁娴幇鍦╝ctivity涔嬩笂 --> + <item name="android:windowIsFloating">true</item> + </style> + <style name="MyTheme1" parent="Theme.AppCompat.Light.NoActionBar"> + <item name="android:windowBackground">@drawable/Loading</item> + <!-- 闅愯棌鐘舵�佹爮 --> + <item name="android:windowFullscreen">false</item> + <!-- 闅愯棌鏍囬鏍� --> + <item name="android:windowNoTitle">true</item> + <item name="android:windowTranslucentStatus">false</item> + </style> </resources> \ No newline at end of file -- Gitblit v1.8.0