Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ea990a7 authored by Udam Saini's avatar Udam Saini Committed by Android (Google) Code Review
Browse files

Merge "Adjusts layout on encryption interstitial." into nyc-dev

parents 0bd0bb04 01c581b9

res/drawable/ic_lock_list_icon.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

    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>

res/layout/setup_choose_lock_generic_fingerprint_header.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"

res/layout/setup_choose_lock_generic_header.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"

res/layout/setup_encryption_interstitial_header.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"

res/values/themes.xml

+1 −0
Original line number Diff line number Diff line
@@ -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>