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

Commit 2715b331 authored by Catherine Liang's avatar Catherine Liang
Browse files

Pre-revamped UI cleanup color file rename (1/2) 

As part of the revamped UI flag removal process, rename files to replace
original.

Bug: 262780002
Test: manually verified functionalities still work throughout the
wallpaper picker app

Change-Id: If3cb1f8be19a541e9726a38d20091c09f83365af
parent a9dc99bf

res/layout/clock_color_option.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    android:orientation="vertical"

    android:clipChildren="false">



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

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



    <TextView

        android:id="@+id/text"

res/layout/color_section_view2.xml→res/layout/color_section_view.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<com.android.customization.picker.color.ui.view.ColorSectionView2 xmlns:android="http://schemas.android.com/apk/res/android"

<com.android.customization.picker.color.ui.view.ColorSectionView xmlns:android="http://schemas.android.com/apk/res/android"

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"
@@ -64,4 +64,4 @@ 
        android:textColor="@color/system_primary"

        android:visibility="gone"

        tools:ignore="UseCompatTextViewDrawableXml" />

</com.android.customization.picker.color.ui.view.ColorSectionView2>
 
</com.android.customization.picker.color.ui.view.ColorSectionView>

res/layout/fragment_color_picker.xml

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ 
            It's critical for any TextViews inside the included layout to have text.

            -->

            <include

                layout="@layout/color_option_2"

                layout="@layout/color_option"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:visibility="invisible" />

src/com/android/customization/model/color/ColorOptionImpl.kt

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ class ColorOptionImpl( 
    }



    override fun getLayoutResId(): Int {

        return R.layout.color_option_2

        return R.layout.color_option

    }



    override fun getPreviewInfo(): PreviewInfo {