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

Commit 4af9053e authored by Wesley.CW Wang's avatar Wesley.CW Wang
Browse files

Implement the custom style flow part 1 

 - Make the options horizontal scrolls, note that the picker side UI
 will be vertical scroll(like Style and Grid tab)
 - Adjust custom style flow pages layout, will have next cl to fine-tune
 the recyclerview and options
 Doc: https://docs.google.com/presentation/d/15JadcGi5k1_0znUN_XdFpU7UxeXwxjK3Y7LxvhW5ETM/edit#slide=id.g85fff7c452_6_15
 Video: https://drive.google.com/file/d/1x2oc6p2TOUpO3JUSr3tkrF3fZ61PBZ-v/view?usp=sharing

 Bug: 151285666
 Test: manually

Change-Id: If0cbb5afa1d5e005805a8459467cda89609fd97a
parent 6cbdde99

res/layout/fragment_custom_theme_component.xml

+9 −21
Original line number Diff line number Diff line
@@ -33,13 +33,13 @@ 
            android:layout_height="0dp"

            android:background="?android:colorPrimary"

            app:layout_constrainedHeight="true"

            app:layout_constraintBottom_toTopOf="@+id/guideline"

            app:layout_constraintBottom_toTopOf="@+id/divider"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintHeight_max="@dimen/preview_pager_max_height"

            app:layout_constraintHorizontal_bias="0.5"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintTop_toTopOf="parent"

            app:layout_constraintVertical_bias="0.0">

            app:layout_constraintVertical_bias="0.0"

            app:layout_constraintHeight_percent="@dimen/preview_pager_maximum_height_ratio">



            <include

                android:id="@+id/component_preview_content"
@@ -59,42 +59,30 @@ 
            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintTop_toBottomOf="@+id/component_preview_container"/>

        

        <androidx.constraintlayout.widget.Guideline

            android:id="@+id/guideline"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

            app:layout_constraintGuide_percent=".7"/>





        <TextView

            android:id="@+id/component_options_title"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="10dp"

            android:layout_marginStart="10dp"

            android:layout_marginEnd="10dp"

            android:layout_marginBottom="10dp"

            android:layout_marginVertical="18dp"

            android:layout_marginHorizontal="16dp"

            android:textAlignment="center"

            android:textAppearance="@style/TitleTextAppearance"

            android:textSize="@dimen/component_options_title_size"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintTop_toBottomOf="@+id/component_preview_container"

            app:layout_constraintBottom_toBottomOf="parent"

            app:layout_constraintVertical_bias=".15"/>

            app:layout_constraintBottom_toTopOf="@+id/options_container"/>



        <androidx.recyclerview.widget.RecyclerView

            android:id="@+id/options_container"

            android:layout_width="match_parent"

            android:layout_height="@dimen/options_container_height"

            android:layout_height="0dp"

            android:layout_gravity="center_horizontal"

            app:layout_constraintBottom_toBottomOf="parent"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintHorizontal_bias="0.5"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintTop_toBottomOf="@+id/component_options_title"

            app:layout_constraintVertical_bias=".25"/>

            app:layout_constraintVertical_bias="1"/>



    </androidx.constraintlayout.widget.ConstraintLayout>

</LinearLayout>

res/layout/theme_color_option.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
     limitations under the License.

-->

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

    android:layout_width="match_parent"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_gravity="center"

    android:padding="8dp">

res/values-land/bools.xml

deleted100644 → 0
+0 −20
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.

-->

<resources>

    <bool name="use_grid_for_options">true</bool>

</resources>
 
 No newline at end of file

res/values/bools.xml

deleted100644 → 0
+0 −20
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.

-->

<resources>

    <bool name="use_grid_for_options">true</bool>

</resources>
 
 No newline at end of file

src/com/android/customization/picker/theme/CustomThemeActivity.java

+1 −2
Original line number Diff line number Diff line
@@ -355,8 +355,7 @@ public class CustomThemeActivity extends FragmentActivity implements 
            return CustomThemeComponentFragment.newInstance(

                    title,

                    position,

                    titleResId,

                    true);

                    titleResId);

        }

    }