Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 685b6b4d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "UX Fixes for Settings Panels"

parents 3975aace cafeaada

res/layout-land/panel_layout.xml→res/layout-land/panel_slice_list.xml

+24 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Copyright (C) 2018 The Android Open Source Project

    Copyright (C) 2019 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.
@@ -14,29 +14,11 @@ 
    See the License for the specific language governing permissions and

    limitations under the License

  -->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

              android:layout_width="match_parent"

              android:layout_height="match_parent"

              android:orientation="vertical">



    <TextView

        android:id="@+id/panel_title"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="center"

        android:paddingBottom="24dp"

        android:paddingTop="18dp"

        android:textColor="?android:attr/colorPrimary"

        android:textSize="20sp"/>



    <include layout="@layout/horizontal_divider"/>



<androidx.recyclerview.widget.RecyclerView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/panel_parent_layout"

    android:scrollbars="vertical"

    android:layout_width="match_parent"

    android:layout_height="0dp"

    android:layout_weight="1"/>
 
 No newline at end of file
 


    <include layout="@layout/panel_buttons"/>

</LinearLayout>
 
 No newline at end of file

res/layout/panel_layout.xml

+28 −5
Original line number Diff line number Diff line
@@ -33,11 +33,34 @@ 


    <include layout="@layout/horizontal_divider"/>



    <androidx.recyclerview.widget.RecyclerView

        android:id="@+id/panel_parent_layout"

        android:scrollbars="vertical"

    <include layout="@layout/panel_slice_list"/>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"/>

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:paddingTop="8dp"

        android:paddingBottom="8dp">



        <Button

            android:id="@+id/see_more"

            style="@android:style/Widget.DeviceDefault.Button.Borderless.Colored"

            android:layout_width="wrap_content"

            android:layout_height="48dp"

            android:layout_marginStart="12dp"

            android:text="@string/see_more"/>



    <include layout="@layout/panel_buttons"/>

        <Space

            android:layout_weight="1"

            android:layout_width="0dp"

            android:layout_height="match_parent" />



        <Button

            android:id="@+id/done"

            style="@android:style/Widget.DeviceDefault.Button.Borderless.Colored"

            android:layout_width="wrap_content"

            android:layout_height="48dp"

            android:layout_marginEnd="12dp"

            android:text="@string/done"/>

    </LinearLayout>

</LinearLayout>
 
 No newline at end of file

res/layout/panel_buttons.xml→res/layout/panel_slice_list.xml

+24 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Copyright (C) 2018 The Android Open Source Project

    Copyright (C) 2019 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.
@@ -15,31 +15,10 @@ 
    limitations under the License

  -->



<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

<androidx.recyclerview.widget.RecyclerView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/panel_parent_layout"

    android:scrollbars="vertical"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingTop="14dp"

    android:paddingBottom="14dp"

    android:orientation="horizontal">



    <Button

        android:id="@+id/see_more"

        style="@android:style/Widget.DeviceDefault.Button.Borderless.Colored"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="20dp"

        android:text="@string/see_more"/>



    <Space

        android:layout_weight="1"

        android:layout_width="0dp"

        android:layout_height="match_parent" />



    <Button

        android:id="@+id/done"

        style="@android:style/Widget.DeviceDefault.Button.Borderless.Colored"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginEnd="20dp"

        android:text="@string/done"/>

</LinearLayout>
 
 No newline at end of file
 
    android:overScrollMode="never"/>
 
 No newline at end of file

res/layout/panel_slice_row.xml

+1 −1

File changed.

Contains only whitespace changes.