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

Merge "Adjust restricted lock positions as per new design." into nyc-dev am: 1749d518b7

Browse Source 
am: ace7191046

* commit 'ace7191046ccd4f51cdbdd72000898f67f50e3a4':
  Adjust restricted lock positions as per new design.
This commit is contained in:
Sudheer Shanka
2016-03-10 16:09:13 +00:00
committed by android-build-merger
parent 3c4e1d6943 ace7191046
commit 8d76aaf345
7 changed files with 91 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/layout/redaction_interstitial.xml
View File

@@ -44,21 +44,21 @@
<com.android.settings.RestrictedRadioButton
android:id="@+id/show_all"
android:layout_width="wrap_content"
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="wrap_content"
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" />
<RadioButton
android:id="@+id/hide_all"
android:layout_width="wrap_content"
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" />

4
res/layout/restricted_dialog_singlechoice.xml
View File

@@ -21,12 +21,14 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingStart="20dp"
android:gravity="center"
android:paddingEnd="?android:attr/dialogPreferredPadding"
android:minHeight="?android:attr/listPreferredItemHeightSmall">
<CheckedTextView
android:id="@+id/text1"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorAlertDialogListItem"
android:gravity="center_vertical"

62
res/layout/restricted_radio_with_summary.xml Normal file
View File

@@ -0,0 +1,62 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2016 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<com.android.settings.CheckableLinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="?android:attr/selectableItemBackground"
android:minHeight="?android:attr/listPreferredItemHeightSmall">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingStart="20dp"
android:paddingEnd="?android:attr/dialogPreferredPadding">
<CheckedTextView
android:id="@android:id/title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorAlertDialogListItem"
android:gravity="center_vertical"
android:drawableStart="?android:attr/listChoiceIndicatorSingle"
android:ellipsize="marquee" />
<ImageView
android:id="@+id/restricted_icon"
android:layout_width="@dimen/restricted_icon_size"
android:layout_height="match_parent"
android:scaleType="centerInside"
android:src="@drawable/ic_info"
android:layout_marginLeft="@dimen/restricted_icon_padding"
android:visibility="gone" />
</LinearLayout>
<TextView android:id="@android:id/summary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="8dp"
android:paddingStart="52dp"
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textColor="?android:attr/textColorSecondary"
android:maxLines="10" />
</com.android.settings.CheckableLinearLayout>

9
res/layout/switch_bar.xml
View File

@@ -30,6 +30,15 @@
android:textColor="?android:attr/textColorPrimary"
android:textAlignment="viewStart" />
<ImageView android:id="@+id/restricted_icon"
android:layout_width="@dimen/restricted_icon_size"
android:layout_height="@dimen/restricted_icon_size"
android:src="@drawable/ic_info"
android:theme="@android:style/Theme.Material"
android:layout_gravity="center_vertical"
android:layout_marginEnd="@dimen/restricted_icon_margin_end"
android:visibility="gone" />
<com.android.settings.widget.ToggleSwitch android:id="@+id/switch_widget"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

3
res/values/dimens.xml
View File

@@ -285,4 +285,7 @@
<dimen name="screen_magnification_video_height">311dp</dimen>
<dimen name="screen_magnification_video_margin_top">40dp</dimen>
<!-- Restricted icon in switch bar -->
<dimen name="restricted_icon_margin_end">16dp</dimen>
</resources>