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

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

Merge "Separate suggestions and conditions."

parents c1eeb4c9 a213bf08

res/drawable/ic_suggestion_close_button.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

     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.

-->



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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M18.3,5.71a0.996,0.996 0,0 0,-1.41 0L12,10.59 7.11,5.7A0.996,0.996 0,1 0,5.7 7.11L10.59,12 5.7,16.89a0.996,0.996 0,1 0,1.41 1.41L12,13.41l4.89,4.89a0.996,0.996 0,1 0,1.41 -1.41L13.41,12l4.89,-4.89c0.38,-0.38 0.38,-1.02 0,-1.4z"/>

</vector>

res/layout/condition_container.xml

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

<!--

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

-->



<FrameLayout

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

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

    style="@style/SuggestionConditionStyle"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingTop="16dp"

    android:paddingStart="16dp"

    android:paddingEnd="16dp"

    android:paddingBottom="@dimen/dashboard_padding_bottom">



    <android.support.v7.widget.CardView

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        app:cardUseCompatPadding="true"

        app:cardElevation="2dp">



        <android.support.v7.widget.RecyclerView

            android:id="@+id/data"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:background="@color/material_grey_300"

            android:scrollbars="none"/>



    </android.support.v7.widget.CardView>



</FrameLayout>

res/layout/suggestion_container.xml

0 → 100644
+64 −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"

    style="@style/SuggestionConditionStyle"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingTop="20dp"

    android:orientation="vertical">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="horizontal"

        android:gravity="center_vertical">



        <TextView

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="24dp"

            android:layout_centerVertical="true"

            android:gravity="start"

            android:text="@string/suggestions_title_v2"

            android:textAppearance="@style/TextAppearance.SuggestionHeader" />



        <TextView

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:layout_marginEnd="24dp"

            android:layout_centerVertical="true"

            android:gravity="end"

            android:textAppearance="@style/TextAppearance.SuggestionHeader" />



    </LinearLayout>



    <android.support.v7.widget.RecyclerView

        android:id="@+id/suggestion_list"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingTop="20dp"

        android:paddingBottom="16dp"

        android:paddingStart="16dp"

        android:paddingEnd="16dp"

        android:scrollbars="none"/>



</LinearLayout>

res/layout/suggestion_tile_v2.xml

0 → 100644
+77 −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.

-->



<android.support.v7.widget.CardView

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

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

    android:id="@+id/suggestion_card"

    android:layout_width="328dp"

    android:layout_height="wrap_content"

    app:cardUseCompatPadding="true"

    app:cardElevation="2dp">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:minHeight="112dp"

        android:orientation="vertical">



        <RelativeLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal">



            <ImageView

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

                android:layout_width="@dimen/dashboard_tile_image_size"

                android:layout_height="@dimen/dashboard_tile_image_size"

                android:layout_centerHorizontal = "true"

                android:layout_marginTop="16dp"

                android:layout_marginBottom="8dp" />



            <ImageView

                android:id="@+id/close_button"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_alignParentEnd="true"

                android:layout_marginTop="8dp"

                android:layout_marginEnd="8dp"

                android:src="@drawable/ic_suggestion_close_button"/>



        </RelativeLayout>



        <TextView

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:singleLine="true"

            android:layout_marginLeft="12dp"

            android:layout_marginRight="12dp"

            android:textAppearance="@style/TextAppearance.TileTitle"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal" />



        <TextView

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:textAppearance="@style/TextAppearance.SuggestionSummary" />



    </LinearLayout>



</android.support.v7.widget.CardView>

res/layout/suggestion_tile_with_button_v2.xml

0 → 100644
+84 −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.

-->



<android.support.v7.widget.CardView

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

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

    android:id="@+id/suggestion_card"

    android:layout_width="328dp"

    android:layout_height="wrap_content"

    app:cardUseCompatPadding="true"

    app:cardElevation="2dp">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:minHeight="112dp"

        android:orientation="vertical"

        android:background="@android:color/white">



        <RelativeLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal">



            <ImageView

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

                android:layout_width="@dimen/dashboard_tile_image_size"

                android:layout_height="@dimen/dashboard_tile_image_size"

                android:layout_centerHorizontal = "true"

                android:layout_marginTop="16dp"

                android:layout_marginBottom="8dp" />



            <ImageView

                android:id="@+id/close_button"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_alignParentEnd="true"

                android:layout_marginTop="8dp"

                android:layout_marginEnd="8dp"

                android:src="@drawable/ic_suggestion_close_button"/>



        </RelativeLayout>



        <TextView

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:singleLine="true"

            android:textAppearance="@style/TextAppearance.TileTitle"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal" />



        <TextView

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:textAppearance="@style/TextAppearance.SuggestionSummary" />



        <Button

            android:id="@android:id/primary"

            style="@style/ActionPrimaryButton"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="12dp"

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



    </LinearLayout>



</android.support.v7.widget.CardView>