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

Commit 5f4defc6 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Update restricted icon." into nyc-dev

parents 31edc5ab 40400a64

packages/SystemUI/res/drawable/ic_info.xml→packages/SettingsLib/res/drawable/ic_info.xml

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

Copyright (C) 2014 The Android Open Source Project

    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.
@@ -14,11 +14,12 @@ Copyright (C) 2014 The Android Open Source Project 
    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:width="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24"

        android:tint="?android:attr/colorAccent">

    <path

        android:pathData="M12.000000,2.000000C6.500000,2.000000 2.000000,6.500000 2.000000,12.000000s4.500000,10.000000 10.000000,10.000000c5.500000,0.000000 10.000000,-4.500000 10.000000,-10.000000S17.500000,2.000000 12.000000,2.000000zM13.000000,17.000000l-2.000000,0.000000l0.000000,-6.000000l2.000000,0.000000L13.000000,17.000000zM13.000000,9.000000l-2.000000,0.000000L11.000000,7.000000l2.000000,0.000000L13.000000,9.000000z"

        android:fillColor="#FFFFFF"/>

        android:fillColor="@android:color/white"

        android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-6h2v6zm0-8h-2V7h2v2z"/>

</vector>

packages/SettingsLib/res/drawable/ic_settings_lock_outline.xml

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
<?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.

-->



<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="21dp"

        android:height="21dp"

        android:viewportWidth="21.0"

        android:viewportHeight="21.0"

        android:tint="?android:attr/colorAccent">

    <path

            android:fillColor="@android:color/white"

            android:pathData="M8,16c1.1,0,2-0.9,2-2s-0.9-2-2-2s-2,0.9-2,2S6.9,16,8,16zM14,7h-1V5c0-2.8-2.2-5-5-5S3,2.2,3,5v2H2C0.9,7,0,7.9,0,9v10c0,1.1,0.9,2,2,2h12c1.1,0,2-0.9,2-2V9C16,7.9,15.1,7,14,7z M4.9,5c0-1.7,1.4-3.1,3.1-3.1s3.1,1.4,3.1,3.1v2H4.9V5z M14,19H2V9h12V19z" />

</vector>

packages/SettingsLib/res/layout/restricted_icon.xml

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
-->

<ImageView xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/restricted_icon"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:src="@drawable/ic_settings_lock_outline"

    android:layout_width="@dimen/restricted_icon_size"

    android:layout_height="@dimen/restricted_icon_size"

    android:src="@drawable/ic_info"

    android:gravity="end|center_vertical" />
 
 No newline at end of file

packages/SettingsLib/res/layout/restricted_switch_widget.xml

+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 
<merge xmlns:android="http://schemas.android.com/apk/res/android">

    <ImageView xmlns:android="http://schemas.android.com/apk/res/android"

        android:id="@+id/restricted_icon"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:src="@drawable/ic_settings_lock_outline"

        android:layout_width="@dimen/restricted_icon_size"

        android:layout_height="@dimen/restricted_icon_size"

        android:src="@drawable/ic_info"

        android:gravity="end|center_vertical" />

    <!-- Based off frameworks/base/core/res/res/layout/preference_widget_switch.xml -->

    <Switch xmlns:android="http://schemas.android.com/apk/res/android"

packages/SettingsLib/res/values/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ 
    <dimen name="user_spinner_item_height">56dp</dimen>



    <!-- Lock icon for preferences locked by admin -->

    <dimen name="restricted_lock_icon_size">16dp</dimen>

    <dimen name="restricted_lock_icon_padding">4dp</dimen>

    <dimen name="restricted_icon_size">16dp</dimen>

    <dimen name="restricted_icon_padding">4dp</dimen>



    <dimen name="wifi_preference_badge_padding">8dip</dimen>