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 am: 375b981

Browse Source 
am: f7e45a7

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

8
res/layout/redaction_interstitial.xml
View File

@@ -46,21 +46,21 @@
android:id="@+id/show_all" android:id="@+id/show_all"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/redaction_vertical_margins" style="@style/RedactionItemAndLabel"
android:text="@string/lock_screen_notifications_summary_show" /> android:text="@string/lock_screen_notifications_summary_show" />
<com.android.settings.RestrictedRadioButton <com.android.settings.RestrictedRadioButton
android:id="@+id/redact_sensitive" android:id="@+id/redact_sensitive"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/redaction_vertical_margins" style="@style/RedactionItemAndLabel"
android:text="@string/lock_screen_notifications_summary_hide" /> android:text="@string/lock_screen_notifications_summary_hide" />
<RadioButton <RadioButton
android:id="@+id/hide_all" android:id="@+id/hide_all"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/redaction_vertical_margins" style="@style/RedactionItemAndLabel"
android:text="@string/lock_screen_notifications_summary_disable" /> android:text="@string/lock_screen_notifications_summary_disable" />
</RadioGroup> </RadioGroup>
@@ -69,7 +69,7 @@
android:id="@+id/lockscreen_remote_input" android:id="@+id/lockscreen_remote_input"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/redaction_vertical_margins" style="@style/RedactionItemAndLabel"
android:layout_marginStart="?android:attr/listPreferredItemPaddingStart" android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd" android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
android:text="@string/lockscreen_remote_input" /> android:text="@string/lockscreen_remote_input" />

3
res/values/dimens.xml
View File

@@ -295,4 +295,7 @@
<!-- Display Size and Font Size preview screen --> <!-- Display Size and Font Size preview screen -->
<dimen name="preview_pager_padding">8dp</dimen> <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> </resources>

6
res/values/styles.xml
View File

@@ -386,4 +386,10 @@
<item name="android:gravity">center_vertical</item> <item name="android:gravity">center_vertical</item>
</style> </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> </resources>