[fenix] No issue: Just use TextView, not AppCompatTextView

pull/600/head
ekager 5 years ago committed by Emily Kager
parent ddd5dc79fb
commit 4a677fa719

@ -2,26 +2,25 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public <!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"
xmlns:tools="http://schemas.android.com/tools" android:id="@+id/onboarding_card"
style="@style/OnboardingCardDark" style="@style/OnboardingCardDark"
android:id="@+id/onboarding_card" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:orientation="vertical">
android:orientation="vertical">
<androidx.appcompat.widget.AppCompatTextView <TextView
android:id="@+id/header_text" android:id="@+id/header_text"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="14dp" android:layout_marginBottom="14dp"
tools:text="@string/onboarding_firefox_account_auto_signin_header_2"
android:drawableStart="@drawable/ic_onboarding_avatar_anonymous" android:drawableStart="@drawable/ic_onboarding_avatar_anonymous"
android:drawablePadding="12dp" android:drawablePadding="12dp"
android:textAppearance="@style/Header16TextStyle" android:textAppearance="@style/Header16TextStyle"
android:textColor="@color/onboarding_card_primary_text_dark" /> android:textColor="@color/onboarding_card_primary_text_dark"
tools:text="@string/onboarding_firefox_account_auto_signin_header_2" />
<Button <Button
android:id="@+id/turn_on_sync_button" android:id="@+id/turn_on_sync_button"

@ -2,26 +2,25 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public <!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"
xmlns:tools="http://schemas.android.com/tools" android:id="@+id/onboarding_card"
style="@style/OnboardingCardDark" style="@style/OnboardingCardDark"
android:id="@+id/onboarding_card" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:orientation="vertical">
android:orientation="vertical">
<androidx.appcompat.widget.AppCompatTextView <TextView
android:id="@+id/header_text" android:id="@+id/header_text"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="14dp" android:layout_marginBottom="14dp"
tools:text="@string/onboarding_firefox_account_header"
android:drawableStart="@drawable/ic_onboarding_firefox_accounts" android:drawableStart="@drawable/ic_onboarding_firefox_accounts"
android:drawablePadding="12dp" android:drawablePadding="12dp"
android:textAppearance="@style/Header16TextStyle" android:textAppearance="@style/Header16TextStyle"
android:textColor="@color/onboarding_card_primary_text_dark" /> android:textColor="@color/onboarding_card_primary_text_dark"
tools:text="@string/onboarding_firefox_account_header" />
<Button <Button
android:id="@+id/turn_on_sync_button" android:id="@+id/turn_on_sync_button"

Loading…
Cancel
Save