PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Updates spacing on redaction interstitial" into nyc-dev

Browse Source 
am: 375b981

* commit '375b981267aea4f3fb3374d2a6e18339125dd455':
  Updates spacing on redaction interstitial
This commit is contained in:
Udam Saini
2016-03-24 22:40:16 +00:00
committed by android-build-merger
parent eb9dae04ab 375b981267
commit f7e45a7f28
3 changed files with 52 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
res/layout/redaction_interstitial.xml
View File

@@ -17,61 +17,61 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingStart="?attr/side_margin"
android:paddingEnd="?attr/side_margin">
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingStart="?attr/side_margin"
android:paddingEnd="?attr/side_margin">
<TextView
android:id="@+id/message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/redaction_vertical_margins"
android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
android:text="@string/lock_screen_notifications_interstitial_message"
android:textAppearance="?android:attr/textAppearanceMedium" />
android:id="@+id/message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/redaction_vertical_margins"
android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
android:text="@string/lock_screen_notifications_interstitial_message"
android:textAppearance="?android:attr/textAppearanceMedium" />
<RadioGroup
android:id="@+id/radio_group"
android:layout_width="wrap_content"
android:id="@+id/radio_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/redaction_vertical_margins"
android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
android:checkedButton="@+id/redact_sensitive">
<com.android.settings.RestrictedRadioButton
android:id="@+id/show_all"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/redaction_vertical_margins"
android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
android:checkedButton="@+id/redact_sensitive">
style="@style/RedactionItemAndLabel"
android:text="@string/lock_screen_notifications_summary_show" />
<com.android.settings.RestrictedRadioButton
android:id="@+id/show_all"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/redaction_vertical_margins"
android:text="@string/lock_screen_notifications_summary_show" />
<com.android.settings.RestrictedRadioButton
android:id="@+id/redact_sensitive"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/redaction_vertical_margins"
android:text="@string/lock_screen_notifications_summary_hide" />
android:id="@+id/redact_sensitive"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/RedactionItemAndLabel"
android:text="@string/lock_screen_notifications_summary_hide" />
<RadioButton
android:id="@+id/hide_all"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/redaction_vertical_margins"
android:text="@string/lock_screen_notifications_summary_disable" />
android:id="@+id/hide_all"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/RedactionItemAndLabel"
android:text="@string/lock_screen_notifications_summary_disable" />
</RadioGroup>
<CheckBox
android:id="@+id/lockscreen_remote_input"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/redaction_vertical_margins"
android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
android:text="@string/lockscreen_remote_input" />
android:id="@+id/lockscreen_remote_input"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/RedactionItemAndLabel"
android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
android:text="@string/lockscreen_remote_input" />
</LinearLayout>

3
res/values/dimens.xml
View File

@@ -295,4 +295,7 @@
<!-- Display Size and Font Size preview screen -->
<dimen name="preview_pager_padding">8dp</dimen>
<!-- Padding between the radio buttons/checkbox and text on the redaction interstitial -->
<dimen name="redaction_padding_start">16dp</dimen>
</resources>

6
res/values/styles.xml
View File

@@ -386,4 +386,10 @@
<item name="android:gravity">center_vertical</item>
</style>
<style name="RedactionItemAndLabel">
<item name="android:layout_marginTop">@dimen/redaction_vertical_margins</item>
<item name="android:paddingStart">@dimen/redaction_padding_start</item>
<item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
</style>
</resources>