Merge "Update notification redaction interstitial according to spec" into oc-dr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
73ae54a63a
@@ -21,7 +21,7 @@
|
|||||||
android:id="@+id/setup_wizard_layout"
|
android:id="@+id/setup_wizard_layout"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:icon="@drawable/ic_lock"
|
android:icon="@drawable/ic_suggested_notifications"
|
||||||
settings:suwFooter="@layout/redaction_interstitial_footer"
|
settings:suwFooter="@layout/redaction_interstitial_footer"
|
||||||
settings:suwHeaderText="@string/lock_screen_notifications_interstitial_title">
|
settings:suwHeaderText="@string/lock_screen_notifications_interstitial_title">
|
||||||
|
|
||||||
@@ -52,6 +52,8 @@
|
|||||||
style="@style/SuwRadioButton"
|
style="@style/SuwRadioButton"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginBottom="0dp"
|
||||||
|
android:minHeight="?android:attr/listPreferredItemHeight"
|
||||||
android:text="@string/lock_screen_notifications_summary_show" />
|
android:text="@string/lock_screen_notifications_summary_show" />
|
||||||
|
|
||||||
<com.android.settings.RestrictedRadioButton
|
<com.android.settings.RestrictedRadioButton
|
||||||
@@ -59,6 +61,8 @@
|
|||||||
style="@style/SuwRadioButton"
|
style="@style/SuwRadioButton"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginBottom="0dp"
|
||||||
|
android:minHeight="?android:attr/listPreferredItemHeight"
|
||||||
android:text="@string/lock_screen_notifications_summary_hide" />
|
android:text="@string/lock_screen_notifications_summary_hide" />
|
||||||
|
|
||||||
<RadioButton
|
<RadioButton
|
||||||
@@ -66,6 +70,8 @@
|
|||||||
style="@style/SuwRadioButton"
|
style="@style/SuwRadioButton"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginBottom="0dp"
|
||||||
|
android:minHeight="?android:attr/listPreferredItemHeight"
|
||||||
android:text="@string/lock_screen_notifications_summary_disable" />
|
android:text="@string/lock_screen_notifications_summary_disable" />
|
||||||
|
|
||||||
</RadioGroup>
|
</RadioGroup>
|
||||||
|
Reference in New Issue
Block a user