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

Commit 8bfcd3a5 authored by Catherine Liang's avatar Catherine Liang Committed by Android (Google) Code Review
Browse files

Merge "Clean up unused theme res files" into main

parents 72662bce 8c4b2e31

res/layout-land/activity_custom_theme.xml

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

<!--

     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.

     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"

    xmlns:tools="http://schemas.android.com/tools"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    tools:context="com.android.customization.picker.theme.CustomThemeActivity">



    <FrameLayout

        android:id="@+id/fragment_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"/>

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="bottom"

        android:orientation="horizontal">

        <Space

            android:layout_width="0dp"

            android:layout_height="0dp"

            android:layout_weight="1"

            android:layout_gravity="bottom"/>



        <FrameLayout

            android:id="@+id/custom_theme_nav"

            android:layout_width="0dp"

            android:layout_height="@dimen/custom_theme_nav_height"

            android:layout_weight="1"

            android:paddingHorizontal="12dp">

            <Button

                android:id="@+id/previous_button"

                style="@style/ActionSecondaryButton"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="start|center_vertical"

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

            <Button

                android:id="@+id/next_button"

                style="@style/ActionPrimaryButton"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="end|center_vertical"

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

        </FrameLayout>

    </LinearLayout>



</FrameLayout>

res/layout-land/fragment_custom_theme_component.xml

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

<!--

     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.

     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"

    android:background="?android:colorPrimary">

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



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="horizontal">



        <FrameLayout

            android:id="@+id/component_preview_container"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:background="?android:colorPrimary">

            <include

                android:id="@+id/component_preview_content"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_marginHorizontal="@dimen/preview_page_horizontal_margin"

                android:layout_marginTop="@dimen/preview_page_top_margin"

                android:layout_marginBottom="@dimen/component_preview_page_bottom_margin"

                layout="@layout/theme_component_preview"/>

        </FrameLayout>

        <View

            android:layout_width="1dp"

            android:layout_height="match_parent"

            android:background="?android:colorForeground"/>

        <LinearLayout

            android:id="@+id/options_section"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:paddingTop="10dp"

            android:paddingBottom="@dimen/custom_theme_nav_height"

            android:orientation="vertical">



            <TextView

                android:id="@+id/component_options_title"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_gravity="center"

                android:layout_margin="10dp"

                android:textAlignment="center"

                android:textAppearance="@style/TitleTextAppearance"/>



            <androidx.recyclerview.widget.RecyclerView

                android:id="@+id/options_container"

                android:layout_width="match_parent"

                android:layout_height="0dp"

                android:layout_weight="1"/>



        </LinearLayout>

    </LinearLayout>

</LinearLayout>

res/layout-land/fragment_custom_theme_name.xml

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

<!--

     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.

     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"

    android:background="?android:colorPrimary">

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



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="horizontal">

        <FrameLayout

            android:id="@+id/component_preview_container"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:paddingTop="@dimen/preview_content_padding_top"

            android:paddingBottom="@dimen/preview_content_padding_bottom"

            android:clipToPadding="false"

            android:background="?android:colorSecondary">

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

        </FrameLayout>

        <LinearLayout

            android:id="@+id/options_section"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:paddingTop="10dp"

            android:paddingBottom="@dimen/custom_theme_nav_height"

            android:paddingVertical="10dp"

            android:clipToPadding="false"

            android:orientation="vertical">



            <TextView

                android:id="@+id/component_options_title"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_gravity="center"

                android:layout_margin="10dp"

                android:textAlignment="center"

                android:textAppearance="@style/TitleTextAppearance"/>



            <FrameLayout

                android:layout_width="match_parent"

                android:layout_height="@dimen/options_container_height"

                android:layout_gravity="center">



                <EditText

                    style="@style/CustomThemeNameEditText"

                    android:id="@+id/custom_theme_name"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_gravity="center"

                    android:minWidth="300dp"/>

            </FrameLayout>



        </LinearLayout>

    </LinearLayout>

</LinearLayout>

res/layout-land/fragment_theme_picker.xml

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

<!--

     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.

     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"

    android:background="?android:colorPrimary">

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



    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent">

        <LinearLayout

            android:id="@+id/content_section"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:orientation="horizontal">



            <FrameLayout

                android:layout_width="0dp"

                android:layout_height="match_parent"

                android:layout_weight="1">

                <FrameLayout

                    android:id="@+id/preview_card_container"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:paddingTop="@dimen/preview_content_padding_top"

                    android:paddingBottom="@dimen/preview_content_padding_bottom"

                    android:clipToPadding="false"

                    android:background="?android:colorSecondary">

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

                </FrameLayout>

            </FrameLayout>



            <androidx.recyclerview.widget.RecyclerView

                android:id="@+id/options_container"

                android:layout_width="0dp"

                android:layout_height="match_parent"

                android:layout_weight="1"

                android:paddingVertical="10dp" />

        </LinearLayout>



        <androidx.core.widget.ContentLoadingProgressBar

            android:id="@+id/loading_indicator"

            style="@android:style/Widget.DeviceDefault.ProgressBar"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="200dp"

            android:layout_gravity="center_horizontal|top"

            android:indeterminate="true"/>



        <FrameLayout

            android:id="@+id/error_section"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:visibility="gone">

            <TextView

                android:id="@+id/error_message"

                style="@style/TitleTextAppearance"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_gravity="center"

                android:gravity="center"

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

        </FrameLayout>

    </FrameLayout>

</LinearLayout>

res/layout/activity_custom_theme.xml

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

<!--

     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.

     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"

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

    xmlns:tools="http://schemas.android.com/tools"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    tools:context="com.android.customization.picker.theme.CustomThemeActivity">



    <FrameLayout

        android:id="@+id/fragment_container"

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1"/>



    <FrameLayout

        android:id="@+id/custom_theme_nav"

        android:layout_width="match_parent"

        android:layout_height="@dimen/custom_theme_nav_height"

        android:paddingHorizontal="12dp"

        android:background="?android:colorPrimary">

        <Button

            android:id="@+id/previous_button"

            style="@style/ActionSecondaryButton"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="start|center_vertical"

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

        <Button

            android:id="@+id/next_button"

            style="@style/ActionPrimaryButton"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="end|center_vertical"

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

    </FrameLayout>

</LinearLayout>