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

Commit 8d249e83 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "First pass at restyling dashboard"

parents bc07b1ed 7c7eb70d

res/drawable/selectable_card.xml

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

<!--

  ~ Copyright (C) 2015 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

  -->



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

    android:color="?android:attr/colorControlHighlight" >

    <item android:drawable="@color/card_background"/>

</ripple>

res/layout/dashboard.xml

+8 −19
Original line number Diff line number Diff line
@@ -14,24 +14,13 @@ 
     limitations under the License.

-->



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

    android:id="@+id/dashboard"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:scrollbarStyle="outsideOverlay"

    android:clipToPadding="false">



        <LinearLayout

<android.support.v7.widget.RecyclerView

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

    android:id="@+id/dashboard_container"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

                android:layout_gravity="center_horizontal"

    android:paddingStart="@dimen/dashboard_padding_start"

    android:paddingEnd="@dimen/dashboard_padding_end"

    android:paddingTop="@dimen/dashboard_padding_top"

    android:paddingBottom="@dimen/dashboard_padding_bottom"

                android:clipToPadding="false"

                android:orientation="vertical"

                />



</ScrollView>
 
    android:clipToPadding="false" />

res/layout/dashboard_category.xml

+8 −9
Original line number Diff line number Diff line
@@ -21,11 +21,16 @@ 
        android:paddingStart="@dimen/dashboard_category_padding_start"

        android:paddingEnd="@dimen/dashboard_category_padding_end"

        android:orientation="vertical"

        android:paddingBottom="8dip"

        android:background="@color/card_background"

        android:layout_marginBottom="8dip"

        android:elevation="@dimen/dashboard_category_elevation" >



    <TextView android:id="@+id/category_title"

    <View

        android:layout_width="match_parent"

        android:layout_height="1dp"

        android:background="?android:attr/listDivider" />



    <TextView android:id="@android:id/title"

            android:layout_width="match_parent"

            android:layout_height="@dimen/dashboard_category_title_height"

            android:paddingStart="@dimen/dashboard_category_title_margin_start"
@@ -36,10 +41,4 @@ 
            android:textAlignment="viewStart"

            />



    <com.android.settings.dashboard.DashboardContainerView

            android:id="@+id/category_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            />



</LinearLayout>

res/layout/dashboard_spacer.xml

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

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

-->



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

        android:layout_width="match_parent"

        android:layout_height="10dp" />

res/layout/dashboard_tile.xml

+8 −10
Original line number Diff line number Diff line
@@ -19,10 +19,13 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="center_vertical"

        android:minHeight="@dimen/dashboard_tile_minimum_height">

        android:minHeight="@dimen/dashboard_tile_minimum_height"

        android:clickable="true"

        android:background="@drawable/selectable_card"

        android:elevation="@dimen/dashboard_category_elevation" >



    <ImageView

            android:id="@+id/icon"

            android:id="@android:id/icon"

            android:layout_width="@dimen/dashboard_tile_image_size"

            android:layout_height="@dimen/dashboard_tile_image_size"

            android:scaleType="centerInside"
@@ -45,7 +48,7 @@ 
                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content">



                <TextView android:id="@+id/title"

                <TextView android:id="@android:id/title"

                          android:layout_width="wrap_content"

                          android:layout_height="wrap_content"

                          android:singleLine="true"
@@ -53,7 +56,7 @@ 
                          android:ellipsize="marquee"

                          android:fadingEdge="horizontal" />



                <TextView android:id="@+id/status"

                <TextView android:id="@android:id/summary"

                          android:layout_width="wrap_content"

                          android:layout_height="wrap_content"

                          android:layout_below="@id/title"
@@ -65,11 +68,6 @@ 


        </LinearLayout>



        <View android:id="@+id/tile_divider"

              android:layout_width="match_parent"

              android:layout_height="1dp"

              android:background="?android:attr/dividerVertical" />



    </LinearLayout>



</LinearLayout>