diff options
| author | Brandon Maxwell <maxwelb@google.com> | 2016-04-22 22:15:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-22 22:15:58 +0000 |
| commit | ea29b6647bbb8ab2067b21bbf0d103da24c4b884 (patch) | |
| tree | 1eb1394df94aee01f2ddcdc6532e4595cbb8f370 /res/layout | |
| parent | 4dfe1be35b1736aa7398c7774ad6c111e65a0b3a (diff) | |
| parent | e27b1da7a4c4b3bfc1a22d0aa1db4c32c24ea478 (diff) | |
Merge "Adding migrate promo to blocked numbers setting ui" into nyc-dev am: fd95466 am: 5fffba0
am: e27b1da
* commit 'e27b1da7a4c4b3bfc1a22d0aa1db4c32c24ea478':
Adding migrate promo to blocked numbers setting ui
Change-Id: I1871490040968ee816d30885db225cde78b05ade
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/blocked_number_header.xml | 47 |
1 files changed, 46 insertions, 1 deletions
diff --git a/res/layout/blocked_number_header.xml b/res/layout/blocked_number_header.xml index 0af942943..e4b795fd8 100644 --- a/res/layout/blocked_number_header.xml +++ b/res/layout/blocked_number_header.xml @@ -61,7 +61,7 @@ android:orientation="vertical"> <TextView - android:id="@+id/textView" + android:id="@+id/blocked_number_text_view" style="@android:style/TextAppearance.Material.Subhead" android:layout_width="wrap_content" android:layout_height="48dp" @@ -119,6 +119,51 @@ </RelativeLayout> <LinearLayout + android:id="@+id/migrate_promo" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:visibility="gone"> + + <TextView + android:id="@+id/migrate_promo_header" + style="@android:style/TextAppearance.Material.Subhead" + android:layout_width="match_parent" + android:layout_height="48dp" + android:paddingStart="@dimen/blocked_number_container_padding" + android:paddingEnd="@dimen/blocked_number_container_padding" + android:gravity="center_vertical" + android:textStyle="bold" + android:text="@string/migrate_blocked_numbers_dialog_title" + android:textColor="@color/blocked_number_header_color"/> + + <TextView + android:id="@+id/migrate_promo_description" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/blocked_number_container_padding" + android:layout_marginEnd="@dimen/blocked_number_container_padding" + android:layout_marginBottom="@dimen/blocked_number_container_padding" + android:text="@string/migrate_blocked_numbers_dialog_message" + android:textColor="@color/secondary_text_color"/> + + <Button + android:id="@+id/migrate_promo_allow_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/migrate_blocked_numbers_dialog_allow_button" + android:layout_marginStart="@dimen/blocked_number_container_padding" + android:layout_marginEnd="@dimen/blocked_number_container_padding" + android:layout_gravity="end" + style="@style/DialerPrimaryFlatButtonStyle" + android:layout_marginBottom="@dimen/blocked_number_container_padding"/> + + <View + style="@style/FullWidthDivider"/> + + </LinearLayout> + + <LinearLayout android:id="@+id/add_number_linear_layout" android:layout_width="match_parent" android:layout_height="wrap_content" |