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

Make Settings use system-api restricted icon.

Browse Source 
Test: Browsed around settings
Bug: 110953302
Change-Id: I1b19be721719ed8946cb558b93119b1b0e173794
This commit is contained in:
Philip P. Moltmann
2018-08-30 11:07:33 -07:00
committed by Fan Zhang
parent 8dbbb01f19
commit a5918a6a68
15 changed files with 65 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/admin_support_details_dialog.xml
View File

@@ -27,7 +27,8 @@
<ImageView android:id="@+id/admin_support_icon"
android:layout_width="@dimen/admin_details_dialog_icon_size"
android:layout_height="@dimen/admin_details_dialog_icon_size"
android:src="@drawable/ic_info"
android:tint="?android:attr/colorAccent"
android:src="@*android:drawable/ic_info"
android:scaleType="fitCenter"
android:contentDescription="@null" />
<TextView android:id="@+id/admin_support_dialog_title"

9
res/layout/lockscreen_remote_input.xml
View File

@@ -36,10 +36,11 @@
<ImageView
android:id="@+id/restricted_lock_icon_remote_input"
android:layout_width="@dimen/restricted_icon_size"
android:layout_height="@dimen/restricted_icon_size"
android:src="@drawable/ic_info"
android:layout_width="@*android:dimen/config_restricted_icon_size"
android:layout_height="@*android:dimen/config_restricted_icon_size"
android:tint="?android:attr/colorAccent"
android:src="@*android:drawable/ic_info"
android:layout_marginEnd="?android:attr/dialogPreferredPadding"
android:layout_gravity="center_vertical"
android:scaleType="centerInside" />
</LinearLayout>
</LinearLayout>

2
res/layout/printer_dropdown_item.xml
View File

@@ -77,7 +77,7 @@
android:layout_gravity="center_vertical"
android:paddingLeft="16dip"
android:contentDescription="@string/printer_info_desc"
android:src="@drawable/ic_info"
android:src="@*android:drawable/ic_info"
android:tint="?android:attr/colorControlNormal"
android:tintMode="src_in" />

9
res/layout/restricted_dialog_singlechoice.xml
View File

@@ -37,11 +37,12 @@
android:ellipsize="marquee" />
<ImageView
android:id="@+id/restricted_lock_icon"
android:layout_width="@dimen/restricted_icon_size"
android:layout_height="@dimen/restricted_icon_size"
android:src="@drawable/ic_info"
android:layout_width="@*android:dimen/config_restricted_icon_size"
android:layout_height="@*android:dimen/config_restricted_icon_size"
android:tint="?android:attr/colorAccent"
android:src="@*android:drawable/ic_info"
android:layout_marginLeft="@dimen/restricted_icon_padding"
android:baselineAlignBottom="true"
android:scaleType="centerInside"
android:visibility="gone" />
</com.android.settings.CheckableLinearLayout>
</com.android.settings.CheckableLinearLayout>

9
res/layout/restricted_popup_menu_item.xml
View File

@@ -34,10 +34,11 @@
android:layout_alignParentLeft="true" />
<ImageView
android:id="@+id/restricted_icon"
android:layout_width="@dimen/restricted_icon_size"
android:layout_height="@dimen/restricted_icon_size"
android:layout_width="@*android:dimen/config_restricted_icon_size"
android:layout_height="@*android:dimen/config_restricted_icon_size"
android:scaleType="centerInside"
android:src="@drawable/ic_info"
android:tint="?android:attr/colorAccent"
android:src="@*android:drawable/ic_info"
android:layout_alignParentRight="true"
android:visibility="gone" />
</RelativeLayout>
</RelativeLayout>

7
res/layout/restricted_radio_with_summary.xml
View File

@@ -41,10 +41,11 @@
android:ellipsize="marquee" />
<ImageView
android:id="@+id/restricted_icon"
android:layout_width="@dimen/restricted_icon_size"
android:layout_width="@*android:dimen/config_restricted_icon_size"
android:layout_height="match_parent"
android:scaleType="centerInside"
android:src="@drawable/ic_info"
android:tint="?android:attr/colorAccent"
android:src="@*android:drawable/ic_info"
android:layout_marginLeft="@dimen/restricted_icon_padding"
android:visibility="gone" />
</com.android.settings.CheckableLinearLayout>
@@ -59,4 +60,4 @@
android:textColor="?android:attr/textColorSecondary"
android:maxLines="10" />
</com.android.settings.CheckableLinearLayout>
</com.android.settings.CheckableLinearLayout>

9
res/layout/spinner_dropdown_restricted_item.xml
View File

@@ -26,11 +26,12 @@
android:layout_height="?android:attr/listPreferredItemHeightSmall"
android:ellipsize="marquee" />
<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:layout_width="@*android:dimen/config_restricted_icon_size"
android:layout_height="@*android:dimen/config_restricted_icon_size"
android:tint="?android:attr/colorAccent"
android:src="@*android:drawable/ic_info"
android:baselineAlignBottom="true"
android:layout_marginEnd="@dimen/restricted_icon_padding"
android:gravity="end|center_vertical"
android:visibility="gone" />
</LinearLayout>
</LinearLayout>

9
res/layout/switch_bar.xml
View File

@@ -29,24 +29,23 @@
android:ellipsize="end"
android:textAppearance="@style/TextAppearance.Switch"
android:textColor="?android:attr/textColorPrimary"
android:textAlignment="viewStart" />
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:tint="?android:attr/colorAccent"
android:theme="@android:style/Theme.Material"
android:layout_gravity="center_vertical"
android:layout_marginEnd="@dimen/restricted_icon_margin_end"
android:visibility="gone" />
android:layout_marginEnd="@dimen/restricted_icon_margin_end"/>
<com.android.settings.widget.ToggleSwitch
android:id="@+id/switch_widget"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:theme="@style/Widget.SwitchBar.Switch" />
android:theme="@style/Widget.SwitchBar.Switch"/>
</merge>