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

Commit 14c20503 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Misc fix on network & internet screen for developer preview"

parents 249077a0 56199e94

res/layout/preference_master_switch.xml

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

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

-->



<!-- Based off preference_material_settings.xml except that ripple on only on the left side. -->

<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

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

    android:gravity="center_vertical"

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

    android:background="@android:color/transparent"

    android:clipToPadding="false">



    <LinearLayout

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

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

        android:gravity="start|center_vertical"

        android:paddingStart="?android:attr/listPreferredItemPaddingStart">



        <LinearLayout

            android:id="@+id/icon_container"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:minWidth="60dp"

            android:orientation="horizontal"

            android:paddingEnd="12dp"

            android:paddingTop="4dp"

            android:paddingBottom="4dp">

            <com.android.internal.widget.PreferenceImageView

                android:id="@android:id/icon"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:maxWidth="48dp"

                android:maxHeight="48dp"/>

        </LinearLayout>



        <RelativeLayout

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:paddingTop="16dp"

            android:paddingBottom="16dp">



            <TextView

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

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:singleLine="true"

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

                android:ellipsize="marquee"/>



            <TextView

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

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

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

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

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

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

                android:maxLines="10"/>



        </RelativeLayout>



    </LinearLayout>



    <!-- Preference should place its actual preference widget here. -->

    <LinearLayout

        android:id="@android:id/widget_frame"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:gravity="end|center_vertical"

        android:orientation="vertical"/>



</LinearLayout>

res/layout/preference_widget_master_switch.xml

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
      android:layout_height="match_parent"

      android:gravity="start|center_vertical"

      android:orientation="horizontal"

      android:paddingStart="20dp"

      android:paddingEnd="20dp"

      android:paddingTop="16dp"

      android:paddingBottom="16dp">

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -2943,7 +2943,7 @@ 
    <!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->

    <string name="tether_settings_title_usb_bluetooth">Tethering</string>

    <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]-->

    <string name="tether_settings_title_all">Tethering &amp; portable hotspot</string>

    <string name="tether_settings_title_all">Hotspot &amp; Tethering</string>

    <!-- Tethering controls, footer note displayed when tethering is disabled because Data Saver mode is on [CHAR LIMIT=none]-->

    <string name="tether_settings_disabled_on_data_saver">"Can\u2019t tether or use portable hotspots while Data Saver is on"</string>
































res/xml/network_and_internet.xml



+2
−17






























Original line number
Diff line number
Diff line







@@ -77,24 +77,9 @@







        settings:userRestriction="no_config_mobile_networks"









        settings:useAdminDisabledSummary="true"/>



















    <Preference









        android:key="wifi_calling_settings"









        android:title="@string/wifi_calling_settings_title"









        android:fragment="com.android.settings.WifiCallingSettings"









        settings:keywords="@string/keywords_wifi_calling"/>



















    <Preference









        android:fragment="com.android.settings.ProxySelector"









        android:key="proxy_settings"









        android:title="@string/proxy_settings_title"/>



















    <!-- Network reset -->









    <com.android.settingslib.RestrictedPreference









        android:key="network_reset"









        android:title="@string/reset_network_title"









        android:icon="@drawable/ic_settings_backup_restore"









        settings:keywords="@string/keywords_network_reset"









        android:fragment="com.android.settings.ResetNetwork"









        settings:userRestriction="no_network_reset"









        settings:useAdminDisabledSummary="true"/>









</PreferenceScreen>








 No newline at end of file
























res/xml/wifi_configure_settings.xml



+10
−2






























Original line number
Diff line number
Diff line







@@ -14,7 +14,9 @@







     limitations under the License.









-->



















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









<PreferenceScreen









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









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









    android:title="@string/wifi_configure_titlebar">



















    <SwitchPreference








@@ -53,6 +55,12 @@







        </intent>









    </Preference>



















    <Preference









        android:key="wifi_calling_settings"









        android:title="@string/wifi_calling_settings_title"









        android:fragment="com.android.settings.WifiCallingSettings"









        settings:keywords="@string/keywords_wifi_calling"/>



















    <Preference









            android:key="wifi_direct"









            android:title="@string/wifi_menu_p2p">