Commit faf33a48 authored by Ioana Pandele's avatar Ioana Pandele Committed by Commit Bot

[Android UI]Rename Divider to HorizontalDivider

This rename ensures a clear differentiation between VerticalDivider
and HorizontalDivider.

Skip the presubmit checks since the Text Appearance check fails, even
if this change doesn't touch the faulty lines.
NOPRESUBMIT=true

Change-Id: Ica0d148209966bdffd33b999b0aa300cd0673cf7
Reviewed-on: https://chromium-review.googlesource.com/1186621Reviewed-by: default avatarBernhard Bauer <bauerb@chromium.org>
Commit-Queue: Ioana Pandele <ioanap@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585808}
parent 8599dee3
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
android:textAppearance="@style/BlackHeadline1" android:textAppearance="@style/BlackHeadline1"
android:text="@string/sign_in_to_chrome"/> android:text="@string/sign_in_to_chrome"/>
<View style="@style/Divider"/> <View style="@style/HorizontalDivider"/>
<TextView <TextView
android:id="@+id/signin_choice_description" android:id="@+id/signin_choice_description"
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
android:maxLines="1"/> android:maxLines="1"/>
</LinearLayout> </LinearLayout>
<View style="@style/Divider"/> <View style="@style/HorizontalDivider"/>
<TextView <TextView
android:id="@+id/signin_sync_title" android:id="@+id/signin_sync_title"
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
android:textSize="@dimen/text_size_medium" /> android:textSize="@dimen/text_size_medium" />
<View <View
style="@style/Divider" style="@style/HorizontalDivider"
android:layout_marginStart="56dp" android:layout_marginStart="56dp"
android:layout_marginEnd="16dp"/> android:layout_marginEnd="16dp"/>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<View <View
android:id="@+id/data_reduction_menu_divider" android:id="@+id/data_reduction_menu_divider"
style="@style/Divider" /> style="@style/HorizontalDivider" />
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
android:textAppearance="@style/BlackHeadline1" android:textAppearance="@style/BlackHeadline1"
android:text="@string/search_engine_dialog_title" /> android:text="@string/search_engine_dialog_title" />
<View style="@style/Divider" /> <View style="@style/HorizontalDivider" />
<org.chromium.chrome.browser.widget.RadioButtonLayout <org.chromium.chrome.browser.widget.RadioButtonLayout
android:id="@+id/default_search_engine_dialog_options" android:id="@+id/default_search_engine_dialog_options"
......
...@@ -5,5 +5,5 @@ ...@@ -5,5 +5,5 @@
<View <View
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/Divider" style="@style/HorizontalDivider"
android:importantForAccessibility="no" /> android:importantForAccessibility="no" />
...@@ -6,5 +6,5 @@ ...@@ -6,5 +6,5 @@
<View <View
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/Divider" style="@style/HorizontalDivider"
android:minHeight="2dp" /> android:minHeight="2dp" />
\ No newline at end of file
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<View <View
style="@style/Divider" style="@style/HorizontalDivider"
android:layout_marginStart="16dp" /> android:layout_marginStart="16dp" />
</FrameLayout> </FrameLayout>
\ No newline at end of file
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</LinearLayout> </LinearLayout>
<View <View
style="@style/Divider" style="@style/HorizontalDivider"
android:layout_marginTop="@dimen/list_item_default_margin" /> android:layout_marginTop="@dimen/list_item_default_margin" />
</LinearLayout> </LinearLayout>
\ No newline at end of file
...@@ -25,6 +25,6 @@ ...@@ -25,6 +25,6 @@
android:textColor="@color/blue_when_enabled" android:textColor="@color/blue_when_enabled"
android:textSize="@dimen/text_size_medium" /> android:textSize="@dimen/text_size_medium" />
<View style="@style/Divider" /> <View style="@style/HorizontalDivider" />
</LinearLayout> </LinearLayout>
\ No newline at end of file
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="8dp" /> android:layout_height="8dp" />
<View style="@style/Divider" /> <View style="@style/HorizontalDivider" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
\ No newline at end of file
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" > android:orientation="vertical" >
<View style="@style/Divider" /> <View style="@style/HorizontalDivider" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
Use of this source code is governed by a BSD-style license that can be Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. --> found in the LICENSE file. -->
<View style="@style/Divider" <View style="@style/HorizontalDivider"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:paddingTop="8dp" android:paddingTop="8dp"
android:paddingBottom="8dp" /> android:paddingBottom="8dp" />
\ No newline at end of file
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<View <View
style="@style/Divider" style="@style/HorizontalDivider"
android:importantForAccessibility="no"/> android:importantForAccessibility="no"/>
</LinearLayout> </LinearLayout>
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
tools:text="@string/signin_google_services_description"/> tools:text="@string/signin_google_services_description"/>
<View <View
android:id="@+id/signin_divider" android:id="@+id/signin_divider"
style="@style/Divider" style="@style/HorizontalDivider"
android:layout_below="@id/signin_google_services_description" android:layout_below="@id/signin_google_services_description"
android:layout_marginStart="@dimen/signin_divider_margin_start" android:layout_marginStart="@dimen/signin_divider_margin_start"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
......
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
</style> </style>
<!-- Dividers --> <!-- Dividers -->
<style name="Divider"> <style name="HorizontalDivider">
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>
<item name="android:layout_height">@dimen/divider_height</item> <item name="android:layout_height">@dimen/divider_height</item>
<item name="android:background">@color/google_grey_300</item> <item name="android:background">@color/google_grey_300</item>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment