PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make filter appear floating in ManagerApplication."

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-07 14:23:57 +00:00
committed by Android (Google) Code Review
parent 58ae38572a 5c1d3e96a1
commit a3d5cd403e
2 changed files with 52 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
res/layout/manage_applications_apps.xml
View File

@@ -14,17 +14,23 @@
limitations under the License.
-->
<LinearLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
settings:layout_behavior="com.android.settings.widget.FloatingAppBarScrollingViewBehavior">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
android:layout_height="match_parent"
android:paddingTop="@dimen/app_bar_height">
<LinearLayout
android:id="@+id/list_container"
@@ -34,14 +40,8 @@
android:visibility="gone">
<FrameLayout
android:id="@+id/pinned_header"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="1">
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/apps_list"
@@ -58,16 +58,29 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:layout_gravity="center"
android:text="@string/no_applications"
android:textAppearance="?android:attr/textAppearanceLarge"
android:visibility="invisible" />
android:visibility="invisible"/>
</FrameLayout>
</LinearLayout>
<include layout="@layout/loading_container" />
<include layout="@layout/loading_container"/>
</FrameLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<FrameLayout
android:id="@+id/pinned_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
settings:layout_scrollFlags="scroll|enterAlways"/>
</com.google.android.material.appbar.AppBarLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

2
res/values/dimens.xml
View File

@@ -114,6 +114,8 @@
<dimen name="wifi_assistant_height">182dp</dimen>
<dimen name="wifi_assistant_image_top">32dp</dimen>
<dimen name="wifi_assistant_image_start">24dp</dimen>
<!-- appbar height is equal search bar height (48dp) plus search bar top and bottom margin -->
<dimen name="app_bar_height">80dp</dimen>
<!-- CryptKeeper top margin for password/pin screen -->
<dimen name="crypt_keeper_password_top_margin">88dip</dimen>