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

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

Merge "Update SettingsPanel UI"

parents 758e3bf0 c14316c4

res/layout-land/panel_layout.xml

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

<!--

    Copyright (C) 2018 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.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    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/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

        android:id="@+id/panel_parent_layout"

        android:scrollbars="vertical"

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1"/>



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

</LinearLayout>
 
 No newline at end of file

res/layout/panel_buttons.xml

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

<!--

    Copyright (C) 2018 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.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    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="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

res/layout/panel_layout.xml

+23 −6
Original line number Diff line number Diff line
@@ -14,13 +14,30 @@ 
    See the License for the specific language governing permissions and

    limitations under the License

  -->



<!-- Note: There is a landscape version of this layout. -->

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

        android:id="@+id/panel_parent_layout"

              android:layout_width="match_parent"

              android:layout_height="wrap_content"

        android:paddingLeft="24dp"

        android:paddingRight="24dp"

        android:paddingBottom="8dp"

        android:layout_margin="4dp"

              android:orientation="vertical">



    <TextView

        android:id="@+id/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

        android:id="@+id/panel_parent_layout"

        android:scrollbars="vertical"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"/>



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

</LinearLayout>
 
 No newline at end of file

res/layout/panel_slice_row.xml

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

<!--

     Copyright (C) 2018 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.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     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="wrap_content"

    android:orientation="vertical">



    <androidx.slice.widget.SliceView

        android:id="@+id/slice_view"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingStart="20dp"

        android:paddingEnd="20dp" />



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

</LinearLayout>
 
 No newline at end of file

res/values/themes.xml

+3 −0
Original line number Diff line number Diff line
@@ -197,6 +197,9 @@ 


    <style name="Theme.BottomDialog" parent="@*android:style/Theme.DeviceDefault.Settings.Dialog">

        <item name="android:windowBackground">@drawable/settings_panel_background</item>

        <item name="android:dividerHorizontal">@*android:drawable/list_divider_material</item>

        <item name="android:windowNoTitle">true</item>

        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>

    </style>



</resources>