Merge branch 'master' of https://gitee.com/jyyforjava/hive-app into master

queenwuli

2021-01-06 5579e668ef0d3d923fb76d07b4c93d9c01f29d4a

1
2
3
4
5
<?xml version="1.0" encoding="utf-8"?>
<merge
  xmlns:android="http://schemas.android.com/apk/res/android">
    <android.support.v7.widget.ContentFrameLayout android:id="@id/action_bar_activity_content" android:layout_width="fill_parent" android:layout_height="fill_parent" android:foreground="?android:windowContentOverlay" android:foregroundGravity="fill_horizontal|center|top" />
</merge>