diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-04-11 21:43:38 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-04-11 21:43:38 +0200 |
commit | 1046acb3e192c940dc99ebb564ec2756493ec987 (patch) | |
tree | 5448f272fd7a0ca261785686ac66dfaf39f1c518 /src/main/res/values | |
parent | 551f63b73c170a309108c7d3dc8839e6ada86596 (diff) |
replace deprecated action bar with toolbar
* replace deprecated action bar with toolbar
* add toolbar support in each activity
* remove redundant themes made earlier
* add configure action bar method in xmpp activity
* remove android namespace from actionmodeoverlay
* solve bug of scrolling toolbar
Diffstat (limited to 'src/main/res/values')
-rw-r--r-- | src/main/res/values/themes.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index f2e3460bd..180ba0eeb 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <style name="ConversationsTheme" parent="Theme.AppCompat.Light.DarkActionBar"> + <style name="ConversationsTheme" parent="Theme.AppCompat.Light.NoActionBar"> <item name="colorPrimary">@color/primary</item> <item name="colorPrimaryDark">@color/primary_dark</item> <item name="colorAccent">@color/accent</item> @@ -10,7 +10,7 @@ <item name="color_background_secondary">@color/grey200</item> <item name="color_warning">@color/red_a700</item> - <item name="android:windowActionModeOverlay">true</item> + <item name="windowActionModeOverlay">true</item> <item name="android:actionModeBackground">@color/accent</item> <item type="reference" name="android:homeAsUpIndicator">@drawable/ic_arrow_back_white_24dp</item> @@ -72,7 +72,7 @@ <item type="reference" name="icon_enable_undecided_device">@drawable/ic_new_releases_black_24dp</item> </style> - <style name="ConversationsTheme.Dark" parent="Theme.AppCompat"> + <style name="ConversationsTheme.Dark" parent="Theme.AppCompat.NoActionBar"> <item name="colorPrimary">@color/primary</item> <item name="colorPrimaryDark">@color/primary_dark</item> <item name="colorAccent">@color/accent</item> @@ -82,7 +82,7 @@ <item name="color_background_secondary">@color/grey900</item> <item name="color_warning">@color/red_a100</item> - <item name="android:windowActionModeOverlay">true</item> + <item name="windowActionModeOverlay">true</item> <item name="android:actionModeBackground">@color/accent</item> <item name="TextSizeInfo">12sp</item> |