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

Adjusts layout on encryption interstitial.

Browse Source 
This adds extra spacing needed now that there is a divider between
the description and the first selected item. Also adds icons for
the encryption interstitial.

bug:27306696
Change-Id: I0952d543ad121b0dfee5c052a67ca042d381f930
This commit is contained in:
Udam Saini
2016-03-09 17:25:39 -08:00
parent dccc582d26
commit 01c581b9bd
7 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
res/drawable/ic_lock_list_icon.xml Normal file
View File

@@ -0,0 +1,25 @@
<!--
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.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24.0dp"
android:height="24.0dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0"
android:tint="?attr/suwListItemIconColor">
<path
android:fillColor="@android:color/white"
android:pathData="M18.0,8.0l-1.0,0.0L17.0,6.0c0.0,-2.76 -2.24,-5.0 -5.0,-5.0S7.0,3.24 7.0,6.0l0.0,2.0L6.0,8.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,10.0c0.0,1.0 0.9,2.0 2.0,2.0l12.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L20.0,10.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0zm-6.0,9.0c-1.1,0.0 -2.0,-0.9 -2.0,-2.0s0.9,-2.0 2.0,-2.0 2.0,0.9 2.0,2.0 -0.9,2.0 -2.0,2.0zm3.1,-9.0L8.9,8.0L8.9,6.0c0.0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0.0 3.1,1.39 3.1,3.1l0.0,2.0z"/>
</vector>

2
res/layout/setup_choose_lock_generic_fingerprint_header.xml
View File

@@ -20,7 +20,7 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="56dp"
android:paddingBottom="@dimen/suw_description_margin_bottom"
android:paddingBottom="@dimen/suw_description_margin_bottom_lists"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingTop="@dimen/suw_description_margin_top"

2
res/layout/setup_choose_lock_generic_header.xml
View File

@@ -20,7 +20,7 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="56dp"
android:paddingBottom="@dimen/suw_description_margin_bottom"
android:paddingBottom="@dimen/suw_description_margin_bottom_lists"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingTop="@dimen/suw_description_margin_top"

2
res/layout/setup_encryption_interstitial_header.xml
View File

@@ -20,7 +20,7 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="56dp"
android:paddingBottom="@dimen/suw_description_margin_bottom"
android:paddingBottom="@dimen/suw_description_margin_bottom_lists"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingTop="@dimen/suw_description_margin_top"

1
res/values/themes.xml
View File

@@ -153,6 +153,7 @@
<item name="wifi_signal">@drawable/wifi_signal</item>
<item name="wifi_signal_color">?android:attr/colorAccent</item>
<item name="side_margin">@dimen/settings_side_margin</item>
<item name="suwListItemIconColor">?android:attr/colorAccent</item>
<!-- Redefine the ActionBar style for contentInsetStart -->
<item name="android:actionBarStyle">@style/Theme.ActionBar</item>

2
res/xml/security_settings_encryption_interstitial.xml
View File

@@ -20,10 +20,12 @@
android:key="lock_settings_picker">
<Preference
android:icon="@drawable/ic_lock_list_icon"
android:key="encrypt_require_password"
android:persistent="false"/>
<Preference
android:icon="@drawable/ic_skip"
android:key="encrypt_dont_require_password"
android:persistent="false"/>

2
src/com/android/settings/SetupEncryptionInterstitial.java
View File

@@ -79,7 +79,7 @@ public class SetupEncryptionInterstitial extends EncryptionInterstitial {
final SetupWizardPreferenceLayout layout = (SetupWizardPreferenceLayout) view;
layout.setDividerInset(getContext().getResources().getDimensionPixelSize(
R.dimen.suw_items_text_divider_inset));
R.dimen.suw_items_icon_divider_inset));
layout.setIllustration(R.drawable.setup_illustration_lock_screen,
R.drawable.setup_illustration_horizontal_tile);