diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/clock_color_option.xml | 2 | ||||
| -rw-r--r-- | res/layout/color_option.xml (renamed from res/layout/color_option_2.xml) | 0 | ||||
| -rw-r--r-- | res/layout/color_section_view.xml (renamed from res/layout/color_section_view2.xml) | 4 | ||||
| -rw-r--r-- | res/layout/fragment_color_picker.xml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/res/layout/clock_color_option.xml b/res/layout/clock_color_option.xml index e5aa3d60..6d820629 100644 --- a/res/layout/clock_color_option.xml +++ b/res/layout/clock_color_option.xml @@ -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" diff --git a/res/layout/color_option_2.xml b/res/layout/color_option.xml index dff03d03..dff03d03 100644 --- a/res/layout/color_option_2.xml +++ b/res/layout/color_option.xml diff --git a/res/layout/color_section_view2.xml b/res/layout/color_section_view.xml index 9dbdf151..cfa9be3a 100644 --- a/res/layout/color_section_view2.xml +++ b/res/layout/color_section_view.xml @@ -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> diff --git a/res/layout/fragment_color_picker.xml b/res/layout/fragment_color_picker.xml index ebff6a4c..d33fb1fb 100644 --- a/res/layout/fragment_color_picker.xml +++ b/res/layout/fragment_color_picker.xml @@ -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" /> |