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

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

Merge "Combine settings suggestion and condition."

parents cd0b3240 83a6621b

res/layout/condition_header_icon.xml

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

-->



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

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

    android:layout_width="@dimen/dashboard_tile_image_size"

    android:layout_height="@dimen/dashboard_tile_image_size"

    android:layout_marginStart="0dp"

    android:layout_marginEnd="24dp"

    android:tint="?android:attr/colorAccent"

    android:scaleType="centerInside"/>

res/layout/condition_tile_new_ui.xml

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

-->



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

    android:id="@+id/content"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:background="?android:attr/colorSecondary"

    android:orientation="vertical">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="48dp"

        android:background="?android:attr/selectableItemBackground"

        android:orientation="horizontal"

        android:gravity="center_vertical">



        <ImageView

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

            android:layout_width="@dimen/dashboard_tile_image_size"

            android:layout_height="@dimen/dashboard_tile_image_size"

            android:layout_marginStart="14dp"

            android:layout_marginEnd="24dp"

            android:tint="?android:attr/colorAccent" />



        <TextView

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textAppearance="?android:attr/textAppearanceSmall"

            android:textColor="?android:attr/colorAccent" />



    </LinearLayout>



    <TextView

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

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingStart="62dp"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

        android:paddingBottom="8dp"

        android:textAppearance="?android:attr/textAppearanceListItemSecondary"

        android:alpha=".7"

        android:textColor="?android:attr/textColorPrimary" />



    <android.support.v7.widget.ButtonBarLayout

        android:id="@+id/buttonBar"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingStart="62dp"

        android:paddingBottom="8dp"

        style="?android:attr/buttonBarStyle"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">



        <Button

            android:id="@+id/first_action"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:paddingStart="0dp"

            android:alpha=".8"

            android:textAlignment="viewStart"

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

            style="?android:attr/buttonBarButtonStyle" />



        <Button

            android:id="@+id/second_action"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:alpha=".8"

            android:textAlignment="viewStart"

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

            style="?android:attr/buttonBarButtonStyle" />



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



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



</LinearLayout>

res/layout/horizontal_divider.xml

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

-->



<View

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

    android:id="@+id/divider"

    android:layout_width="match_parent"

    android:layout_height=".75dp"

    android:background="?android:attr/dividerHorizontal" />
 
 No newline at end of file

res/layout/suggestion_condition_container.xml

0 → 100644
+42 −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:paddingStart="8dp"

    android:paddingEnd="8dp"

    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:scrollbars="none"/>



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



</FrameLayout>

res/layout/suggestion_condition_footer.xml

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

-->



<LinearLayout

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

    style="@style/SuggestionConditionStyle"

    android:layout_width="match_parent"

    android:layout_height="56dp"

    android:orientation="horizontal"

    android:gravity="center|end">



    <ImageView

        android:id="@+id/collapse_button"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:padding="16dp"

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



</LinearLayout>