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

Commit 9a83aba2 authored by Edgar Wang's avatar Edgar Wang Committed by Automerger Merge Worker
Browse files

Merge "Remove restricted_icon from MainSwitchPreference" into udc-dev am: 55c562fa am: 51780b46 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22569977



Change-Id: I4af0da9d470237dabc94478f1b29dd4127e5eff4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1e3bedf0 51780b46

packages/SettingsLib/MainSwitchPreference/res/drawable/settingslib_ic_info.xml

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
<!--

    Copyright (C) 2021 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.

-->

<!-- copy from frameworks/base/core/res/res/drawable/ic_info.xml-->

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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24"

        android:tint="?attr/colorControlNormal">

    <path

        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>
 
 No newline at end of file

packages/SettingsLib/MainSwitchPreference/res/layout-v31/settingslib_main_switch_bar.xml

+0 −10
Original line number Diff line number Diff line
@@ -46,16 +46,6 @@ 
            android:textAppearance="?android:attr/textAppearanceListItem"

            style="@style/MainSwitchText.Settingslib" />



        <ImageView

            android:id="@+id/restricted_icon"

            android:layout_width="@dimen/settingslib_restricted_icon_size"

            android:layout_height="@dimen/settingslib_restricted_icon_size"

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

            android:layout_gravity="center_vertical"

            android:layout_marginEnd="@dimen/settingslib_restricted_icon_margin_end"

            android:src="@drawable/settingslib_ic_info"

            android:visibility="gone" />



        <Switch

            android:id="@android:id/switch_widget"

            android:layout_width="wrap_content"

packages/SettingsLib/MainSwitchPreference/res/layout-v33/settingslib_main_switch_bar.xml

+0 −10
Original line number Diff line number Diff line
@@ -49,16 +49,6 @@ 
            android:lineBreakWordStyle="phrase"

            style="@style/MainSwitchText.Settingslib" />



        <ImageView

            android:id="@+id/restricted_icon"

            android:layout_width="@dimen/settingslib_restricted_icon_size"

            android:layout_height="@dimen/settingslib_restricted_icon_size"

            android:tint="@color/settingslib_accent_primary_variant"

            android:layout_gravity="center_vertical"

            android:layout_marginEnd="@dimen/settingslib_restricted_icon_margin_end"

            android:src="@drawable/settingslib_ic_info"

            android:visibility="gone" />



        <Switch

            android:id="@android:id/switch_widget"

            android:layout_width="wrap_content"

packages/SettingsLib/MainSwitchPreference/res/layout/settingslib_main_switch_bar.xml

+0 −11
Original line number Diff line number Diff line
@@ -38,17 +38,6 @@ 
        android:layout_marginStart="@dimen/settingslib_switchbar_subsettings_margin_start"

        android:textAlignment="viewStart"/>



    <ImageView

        android:id="@+id/restricted_icon"

        android:layout_width="@dimen/settingslib_restricted_icon_size"

        android:layout_height="@dimen/settingslib_restricted_icon_size"

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

        android:theme="@android:style/Theme.Material"

        android:layout_gravity="center_vertical"

        android:layout_marginEnd="@dimen/settingslib_restricted_icon_margin_end"

        android:src="@drawable/settingslib_ic_info"

        android:visibility="gone"/>



    <Switch

        android:id="@android:id/switch_widget"

        android:layout_width="wrap_content"

packages/SettingsLib/MainSwitchPreference/res/values-v31/styles.xml

+1 −2
Original line number Diff line number Diff line
@@ -17,9 +17,8 @@ 


<resources>



    <style name="MainSwitchText.Settingslib" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">

    <style name="MainSwitchText.Settingslib" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title.Inverse">

        <item name="android:textSize">20sp</item>

        <item name="android:fontFamily">@string/settingslib_config_headlineFontFamily</item>

        <item name="android:textColor">@android:color/black</item>

    </style>

</resources>