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

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

Remove restricted icon 

Bug: 195401182
Test: robotest
Change-Id: I6b22b3b9b62812eb08f10492bd2d7908cce89d39
parent f962acdb

res/layout/lockscreen_remote_input.xml

deleted100644 → 0
+0 −46
Original line number Original line 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

  -->



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

        android:layout_width="match_parent"

        android:layout_height="wrap_content">



    <CheckBox

            android:id="@+id/lockscreen_remote_input"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:layout_marginStart="20dp"

            android:paddingStart="20dp"

            android:paddingEnd="?android:attr/dialogPreferredPadding"

            android:minHeight="?android:attr/listPreferredItemHeightSmall"

            android:textAppearance="?android:attr/textAppearanceMedium"

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

            android:gravity="center_vertical"

            android:text="@string/lockscreen_remote_input"

        />



    <ImageView

            android:id="@+id/restricted_lock_icon_remote_input"

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

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

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

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

            android:layout_marginEnd="?android:attr/dialogPreferredPadding"

            android:layout_gravity="center_vertical"

            android:scaleType="centerInside" />

</LinearLayout>

res/layout/restricted_dialog_singlechoice.xml

+0 −10
Original line number Original line Diff line number Diff line
@@ -35,14 +35,4 @@ 
            android:drawableStart="?android:attr/listChoiceIndicatorSingle"

            android:drawableStart="?android:attr/listChoiceIndicatorSingle"

            android:drawablePadding="20dp"

            android:drawablePadding="20dp"

            android:ellipsize="marquee" />

            android:ellipsize="marquee" />

    <ImageView

            android:id="@+id/restricted_lock_icon"

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

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

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

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

            android:layout_marginLeft="@dimen/restricted_icon_padding"

            android:baselineAlignBottom="true"

            android:scaleType="centerInside"

            android:visibility="gone" />

</com.android.settings.CheckableLinearLayout>
 
</com.android.settings.CheckableLinearLayout>

res/layout/restricted_preference_dropdown.xml

deleted100644 → 0
+0 −31
Original line number Original line 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

  -->

<FrameLayout

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

        android:layout_width="match_parent"

        android:layout_height="wrap_content">



    <view android:id="@+id/spinner"

            class="com.android.settings.notification.RestrictedDropDownPreference$ReselectionSpinner"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:visibility="invisible"

            android:layout_marginStart="@dimen/preference_no_icon_padding_start"/>



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



</FrameLayout>
 
 No newline at end of file

res/layout/restricted_radio_with_summary.xml

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

-->



<com.android.settings.CheckableLinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:background="?android:attr/selectableItemBackground"

    android:minHeight="?android:attr/listPreferredItemHeightSmall">



    <com.android.settings.CheckableLinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:paddingStart="20dp"

        android:paddingEnd="?android:attr/dialogPreferredPadding">

        <CheckedTextView

            android:id="@android:id/title"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:textAppearance="?android:attr/textAppearanceMedium"

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

            android:gravity="center_vertical"

            android:drawableStart="?android:attr/listChoiceIndicatorSingle"

            android:ellipsize="marquee" />

        <ImageView

            android:id="@+id/restricted_icon"

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

            android:layout_height="match_parent"

            android:scaleType="centerInside"

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

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

            android:layout_marginLeft="@dimen/restricted_icon_padding"

            android:visibility="gone" />

    </com.android.settings.CheckableLinearLayout>





    <TextView android:id="@android:id/summary"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingBottom="8dp"

        android:paddingStart="52dp"

        android:textAppearance="?android:attr/textAppearanceListItemSecondary"

        android:textColor="?android:attr/textColorSecondary"

        android:maxLines="10" />



</com.android.settings.CheckableLinearLayout>

res/layout/spinner_dropdown_restricted_item.xml

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

-->

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

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:gravity="center_vertical">

    <TextView android:id="@android:id/text1"

            style="?android:attr/spinnerDropDownItemStyle"

            android:singleLine="true"

            android:layout_width="0dp"

            android:layout_weight="1"

            android:layout_height="?android:attr/listPreferredItemHeightSmall"

            android:ellipsize="marquee" />

    <ImageView android:id="@+id/restricted_icon"

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

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

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

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

            android:baselineAlignBottom="true"

            android:layout_marginEnd="@dimen/restricted_icon_padding"

            android:gravity="end|center_vertical"

            android:visibility="gone" />

</LinearLayout>