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

Commit e3ce6a70 authored by Edgar Wang's avatar Edgar Wang
Browse files

Remove restricted icon 

Bug: 195401182
Test: robotest
Change-Id: I721f0a69a9d98b6004daf4ac197fc0d01c64e5fe
parent ca8f4e72

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

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
            android:tint="?android:attr/colorAccent"

            android:layout_gravity="center_vertical"

            android:layout_marginEnd="@dimen/settingslib_restricted_icon_margin_end"

            android:src="@android:drawable/ic_info"

            android:src="@drawable/settingslib_ic_info"

            android:visibility="gone" />



        <Switch

packages/SettingsLib/res/layout/restricted_popup_menu_item.xml

+0 −10
Original line number Diff line number Diff line
@@ -34,14 +34,4 @@ 
        android:textAppearance="?android:attr/textAppearanceListItemSmall"

        android:textColor="?android:attr/textColorAlertDialogListItem" />



    <ImageView

        android:id="@+id/restricted_icon"

        android:layout_width="@*android:dimen/config_restrictedIconSize"

        android:layout_height="@*android:dimen/config_restrictedIconSize"

        android:layout_alignParentRight="true"

        android:scaleType="centerInside"

        android:src="@*android:drawable/ic_info"

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

        android:visibility="gone" />



</RelativeLayout>

packages/SettingsLib/res/layout/restricted_preference_widget_primary_switch.xml

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- 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.

-->



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

    <include layout="@layout/restricted_icon"/>



    <include layout="@layout/preference_widget_primary_switch"/>

</merge>
 
 No newline at end of file

packages/SettingsLib/res/layout/restricted_switch_widget.xml

deleted100644 → 0
+0 −32
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.

-->

<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="@dimen/two_target_min_width"

        android:layout_height="@*android:dimen/config_restrictedIconSize"

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

        android:src="@*android:drawable/ic_info"

        android:gravity="center" />

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

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

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

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:focusable="false"

        android:clickable="false"

        android:background="@null" />

</merge>

packages/SettingsLib/src/com/android/settingslib/PrimarySwitchPreference.java

+1 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public class PrimarySwitchPreference extends RestrictedPreference { 


    @Override

    protected int getSecondTargetResId() {

        return R.layout.restricted_preference_widget_primary_switch;

        return R.layout.preference_widget_primary_switch;

    }



    @Override
@@ -67,7 +67,6 @@ public class PrimarySwitchPreference extends RestrictedPreference { 
        super.onBindViewHolder(holder);

        final View switchWidget = holder.findViewById(R.id.switchWidget);

        if (switchWidget != null) {

            switchWidget.setVisibility(isDisabledByAdmin() ? View.GONE : View.VISIBLE);

            switchWidget.setOnClickListener(new OnClickListener() {

                @Override

                public void onClick(View v) {